Resolved conflict

CHANGELOG.md

@@ -21,9 +21,10 @@ Work not started yet
 
 ## 0.0.2 (Unreleased, work in progress)
 
+- [ ] meta: Create an Uppy logo (@vvolfy)
 - [ ] core: Decide on good names for `cdn` vs `npm` builds and rename all-the-things
 - [ ] server: Add a deploy target for uppy-server so we can use it in demos (#39, @kvz)
-- [ ] server: Create a (barely) working uppy-server (#39, @hedgerh)
+- [x] server: Create a (barely) working uppy-server (#39, @hedgerh)
 - [x] core: implement a non-blocking `install` method (for Progressbar, for example)  (@arturi, @kvz)
 - [x] dragdrop: Use templates, autoProceed setting, show progress (#50, #18, @arturi)
 - [x] meta: Implement playground to test things in, templates in this case
@@ -34,7 +35,6 @@ Work not started yet
 - [x] core: Integrate eslint in our build procedure and make Travis fail on errors found in our examples, Core and Plugins, such as `> 100` char lines (@kvz)
 - [x] core: Add basic i18n support via `core.translate()` and locale loading (#47, @arturi)
 - [x] website: Fix Uppy deploys (postcss-svg problem) (@arturi, @kvz)
-- [ ] meta: Create an Uppy logo (@vvolfy)
 
 ## 0.0.1 (December 20, 2015)
 

src/locale/ru.js

@@ -4,6 +4,7 @@ ru.strings = {
   chooseFile: 'Выберите файл',
   orDragDrop: 'или перенесите его сюда',
   youHaveChosen: 'Вы выбрали: %{file_name}',
+  orDragDrop: 'Вы выбрали: %{file_name}',
   filesChosen: {
     0: 'Выбран %{smart_count} файл',
     1: 'Выбрано %{smart_count} файла',

src/plugins/DragDrop.js

@@ -129,10 +129,6 @@ export default class DragDrop extends Plugin {
     return Promise.race([onDrop, onInput]).then(handler => handler())
   }
 
-  displayStatus (status) {
-    this.status.innerHTML = status
-  }
-
   handleDrop (e) {
     console.log('all right, someone dropped something...')
 

src/plugins/Plugin.js

@@ -32,11 +32,6 @@ export default class Plugin {
   //   this.core.setProgress(this, finalPercentage)
   // }
 
-  setProgress (percentage, el) {
-    const progress = document.querySelector('.UppyDragDrop-progressInner')
-    progress.setAttribute('style', `width: ${percentage}%`)
-  }
-
   extractFiles (results) {
     console.log({
       class: 'Plugin',
@@ -56,16 +51,14 @@ export default class Plugin {
       } catch (e) {
         console.log(e)
       }
-      // result.forEach(item => {
-      //   files.push(item)
-      //   console.log(item)
-      // })
     })
 
     // const files = [];
     // for (let i in results) {
     //   for (let j in results[i].files) {
     //     files.push(results[i].files.item(j));
+    //   for (let j in results[i].files) {
+    //     // files.push(results[i].files.item(j));
     //   }
     // }
 

src/plugins/Tus10.js

@@ -72,6 +72,8 @@ export default class Tus10 extends Plugin {
     this.core.log('tus got this: ')
     this.core.log(results)
 
+    // this.setProgress(0)
+
     // var uploaded  = [];
     const uploaders = []
     for (let i in files) {

website/src/_posts/hello-world.md

@@ -10,4 +10,4 @@ It's nowhere near finished yet, but that also means it's not to late to get invo
 
 into a direction of your liking!
 
-Shoot us a [tweet](https://twitter.com/uppyjs) if you're interested!
+Shoot us a [tweet](https://twitter.com/uppy_io) if you're interested!

website/themes/uppy/layout/index.ejs

@@ -8,7 +8,7 @@
 
     <p class="IndexHero-descPrimary"><%- config.description_primary %></p>
     <ul class="IndexSocial">
-      <li><a href="https://twitter.com/uppyjs" class="twitter-follow-button" data-show-count="false" data-dnt="true">Follow @uppyjs</a></li>
+      <li><a href="https://twitter.com/uppy_io" class="twitter-follow-button" data-show-count="false" data-dnt="true">Follow @uppy_io</a></li>
       <li><iframe src="http://ghbtns.com/github-btn.html?user=transloadit&repo=uppy&type=watch&count=true"
     allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe></li>
      </li>

website/themes/uppy/layout/partials/community_dropdown.ejs

@@ -3,6 +3,6 @@
   <ul class="nav-dropdown">
     <li><a href="https://github.com/transloadit/uppy" class="nav-link" target="_blank">GitHub</a></li>
     <li><a href="https://gitter.im/transloadit/uppy" class="nav-link" target="_blank">Chat</a></li>
-    <li><a href="https://twitter.com/uppyjs" class="nav-link" target="_blank">Twitter</a></li>
+    <li><a href="https://twitter.com/uppy_io" class="nav-link" target="_blank">Twitter</a></li>
   </ul>
 </li>

website/themes/uppy/source/css/_index.scss

@@ -144,7 +144,6 @@
 .IndexExample-block {
   padding: 7px;
   text-align: left;
-
   background-color: $color-codebg;
   border-radius: $size-radius;
   overflow-x: scroll;
@@ -189,18 +188,6 @@
     padding-left: 40px;
     margin-bottom: 0.5em;
   }
-
-  // li:before {
-  //   content: '';
-  //   display: inline-block;
-  //   width: 24px;
-  //   height: 24px;
-  //   background: svg('check.svg', '[fill]: #{$color-white}') center center no-repeat;
-  //   background-size: 24px 24px;
-  //   margin-right: 10px;
-  //   position: relative;
-  //   top: 4px;
-  // }
 }
 
 .IndexFooter {
@@ -220,85 +207,3 @@
 
   p { margin: .3em 0; }
 }
-
-// @media screen and (max-width: 480px) {
-//
-//   #hero {
-//     .inner h1 {
-//       font-size: 2em;
-//       font-weight: 400;
-//     }
-//
-//     .buttons {
-//       max-width: 300px;
-//       margin: 1em auto;
-//     }
-//
-//     a.button {
-//       width: 260px;
-//       font-size: .8em;
-//       margin: .5em 0;
-//     }
-//
-//     .desc {
-//       max-width: 300px;
-//     }
-//
-//     .warning, .desc {
-//       font-size: .85em;
-//       margin: 1em auto;
-//       br { display: none; }
-//     }
-//
-//     // .down { display: none; }
-//   }
-//
-//   #social {
-//     max-width: 340px;
-//     margin: 1.2em auto;
-//   }
-//
-//   .cool { margin-top: 0; }
-//
-//   #features .feat {
-//     font-size: 14px;
-//     margin: .8em 0;
-//     width: 250px;
-//   }
-//
-//   #design_goals {
-//     ul {
-//       width: 280px;
-//       font-size: 1.1em;
-//     }
-//
-//     h2 {
-//       font-size: 1.4em;
-//     }
-//   }
-// }
-//
-// @media screen and (max-width: 860px) {
-//   #features, #hero {
-//     font-size: 16px;
-//   }
-//
-//   #example {
-//     .block {
-//       display: block;
-//       width: auto;
-//       height: auto;
-//     }
-//   }
-//
-//   #demo {
-//     padding: 5px 20px 20px;
-//   }
-//
-//   .sign {
-//     display: block;
-//     height: 1em;
-//     line-height: 1em;
-//     padding: .5em 0;
-//   }
-// }

website/themes/uppy/source/css/test.css

@@ -1,4 +0,0 @@
-body {
-  background-image: svg('uppy.svg', '[fill]: black');
-  display: flex;
-}