浏览代码

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	CHANGELOG.md
Artur Paikin 7 年之前
父节点
当前提交
b042bb9f93
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      CHANGELOG.md

+ 2 - 1
CHANGELOG.md

@@ -40,7 +40,6 @@ Ideas that will be planned and find their way into a release at one point
 - [ ] uppy/uppy-server: review websocket connection and throttling progress events (@arturi, @ifedapoolarewaju)
 - [ ] uppy/uppy-server: review websocket connection and throttling progress events (@arturi, @ifedapoolarewaju)
 - [ ] uploaders: consider not showing progress updates from the server after an upload’s been paused (@arturi, @ifedapoolarewaju)
 - [ ] uploaders: consider not showing progress updates from the server after an upload’s been paused (@arturi, @ifedapoolarewaju)
 - [ ] image cropping on the client (#151)
 - [ ] image cropping on the client (#151)
-- [ ] transloadit: function option for file-dependent `params` (@goto-bus-stop)
 
 
 ## 1.0.0 Goals
 ## 1.0.0 Goals
 
 
@@ -90,6 +89,8 @@ To be released: 2017-07-28.
 - [ ] transloadit: emit an event when an assembly is created (@goto-bus-stop)
 - [ ] transloadit: emit an event when an assembly is created (@goto-bus-stop)
 - [ ] dashboard: flag to hide the upload button, for cases when you want to manually stat the upload (@arturi)
 - [ ] dashboard: flag to hide the upload button, for cases when you want to manually stat the upload (@arturi)
 - [ ] webcam: add 1, 2, 3, smile! to webcam (@arturi #187)
 - [ ] webcam: add 1, 2, 3, smile! to webcam (@arturi #187)
+- [ ] transloadit: function option for file-dependent `params` (@goto-bus-stop)
+- [ ] dashboard: flag to hide the upload button, for cases when you want to manually stat the upload (@arturi)
 
 
 ## 0.17.0 - 2017-07-02
 ## 0.17.0 - 2017-07-02