Commit graph

4 commits

Author SHA1 Message Date
DJ Mountney
1d1363e2bb Bring in security changes from the 9.2.5 release
Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue
2017-06-07 21:16:20 -07:00
Oswaldo Ferreira
2338785ec9 Use wait_for_requests to wait all JS request 2017-05-22 20:39:49 -03:00
blackst0ne
5b0e086946 Add an ability to cancel attaching file and redesign attaching files UI 2017-05-16 19:52:17 +11:00
Robert Speicher
2858bc2037 Add feature specs for three types of user uploads 2017-02-24 16:41:27 -05:00