From a48d8937e236bcbfe0d543a69200d20b7d497b6d Mon Sep 17 00:00:00 2001
From: shanmengm <mengm.shan@gmail.com>
Date: Tue, 27 Nov 2018 15:37:22 +0800
Subject: [PATCH] merge fetch

---
 .gitignore            | 1 +
 davinci-ui/index.html | 6 +++++-
 davinci-ui/share.html | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index e19b51753..c26fbe8ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ tempFiles/
 userfiles/
 .vscode
 *yarn.lock
+davinci-ui/
diff --git a/davinci-ui/index.html b/davinci-ui/index.html
index 9aa0b9125..eac863a09 100644
--- a/davinci-ui/index.html
+++ b/davinci-ui/index.html
@@ -1 +1,5 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.da2fb94aafc1b46bc3d4.js"></script></body></html>
\ No newline at end of file
+<<<<<<< Updated upstream
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.fdd41776fce2c51d85a6.js"></script></body></html>
+=======
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.d4fcbdb1e28c30340c4b.js"></script></body></html>
+>>>>>>> Stashed changes
diff --git a/davinci-ui/share.html b/davinci-ui/share.html
index 065634a63..3023ec4c5 100644
--- a/davinci-ui/share.html
+++ b/davinci-ui/share.html
@@ -1 +1,5 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/share.e4edf93310c2b3581364.js"></script></body></html>
\ No newline at end of file
+<<<<<<< Updated upstream
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/share.ca91bd4cd1dda6355b55.js"></script></body></html>
+=======
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body><noscript>如果你看到这条信息，说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/share.cca7935a82047c55d177.js"></script></body></html>
+>>>>>>> Stashed changes
