1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Commit Graph

105 Commits

Author SHA1 Message Date
TimDaubenschuetz
e025de878b Merged in AD-917-show-progress-when-uploading (pull request #54)
Ad 917 show progress when uploading
2015-09-15 13:15:52 +02:00
Tim Daubenschütz
e087e9f332 PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js 2015-09-14 11:36:24 +02:00
Tim Daubenschütz
f42f4a02f8 Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading
Resolve merge conflicts with master for easier PR.

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-14 11:14:02 +02:00
Tim Daubenschütz
82b9b68338 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-09-10 16:14:02 +02:00
Tim Daubenschütz
1d184973f4 reset method for react s3 fineuploader 2015-09-10 11:22:42 +02:00
Tim Daubenschütz
b4756be60a replace anonymous filter functions with util functions 2015-09-10 09:54:02 +02:00
Tim Daubenschütz
2ba27d3847 add documentation for exception 2015-09-09 17:21:55 +02:00
Tim Daubenschütz
2cc4284118 minor cleanup 2015-09-09 16:22:20 +02:00
Tim Daubenschütz
801227cfee remove react-progress-bar for react-bootstrap progressbar 2015-09-09 14:11:52 +02:00
Tim Daubenschütz
1c4bf9915c refactor setState actions to fix overriding values bug 2015-09-07 12:02:01 +02:00
Tim Daubenschütz
bb6deb3f68 refactor setStatus method of fineuploader 2015-09-04 15:13:38 +02:00
Tim Daubenschütz
8e98a7bff7 show overall progress 2015-09-04 14:54:39 +02:00
Tim Daubenschütz
ac28ef4ee0 remove raven 2015-09-04 18:15:42 +02:00
Tim Daubenschütz
4374235c1b use log global again 2015-09-03 17:55:15 +02:00
Tim Daubenschütz
3b61ac5c6a remove mangle and fix bug in react-fineuploader 2015-09-04 17:31:58 +02:00
Tim Daubenschütz
a4a0e9d149 catch error in onComplete for fineuploader 2015-09-04 15:54:49 +02:00
Tim Daubenschütz
18634ffe50 fix additional files button bug 2015-08-24 14:16:13 +02:00
Tim Daubenschütz
f54d7bb85c fix validation method 2015-08-24 13:57:02 +02:00
Tim Daubenschütz
07ae8cc9bb Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-24 13:13:08 +02:00
Tim Daubenschütz
c14ab4dcd4 fix fineuploader notification bug 2015-08-24 13:12:59 +02:00
diminator
b76c752966 Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an
Conflicts:
	ownership/test/test_api.py
	piece/models.py
2015-08-24 12:20:54 +02:00
Tim Daubenschütz
3b46dbb9f5 add upload busy function to fineuploader 2015-08-21 11:11:31 +02:00
Tim Daubenschütz
ad8be7e34a separate pre-sending form submission functionality 2015-08-18 13:15:22 +02:00
Tim Daubenschütz
0cf63fa6c8 fix synchronization of files of fineuploader 2015-08-11 11:39:58 +02:00
Tim Daubenschütz
58c0ce4c3f fix wording for multiple uploads 2015-08-11 10:03:12 +02:00
Tim Daubenschütz
ae8bc674d2 add logging for complete as well 2015-08-03 18:50:14 +02:00
Tim Daubenschütz
92d699a831 add chunk logging 2015-08-03 18:35:56 +02:00
Tim Daubenschütz
30d84af7fb add more logs 2015-08-03 18:02:21 +02:00
Tim Daubenschütz
6bf33f541a remove raven 2015-08-03 11:26:30 +02:00
Tim Daubenschütz
765969c5b3 log file list to sentry on error 2015-08-03 11:09:31 +02:00
Tim Daubenschütz
63b763dd25 remove onComplete call if there has been an error with fineuploader 2015-08-03 10:54:34 +02:00
Tim Daubenschütz
c9042a0934 delete password of user when submitting to sentry 2015-08-03 10:41:51 +02:00
Tim Daubenschütz
76cf9fd74d Merge branch 'AD-435-hash-locally-for-when-a-artist-do'
Conflicts:
	js/components/ascribe_forms/form_register_piece.js
	js/components/ascribe_slides_container/slides_container.js
	js/components/ascribe_uploader/file_drag_and_drop.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-07-29 09:35:14 +02:00
TimDaubenschuetz
78049b448e Merged in AD-598-register-action-switches (pull request #14)
Ad 598 register action switches
2015-07-28 16:36:57 +02:00
Tim Daubenschütz
0f658b9a71 add error reason to fineuploader raven 2015-07-28 16:24:18 +02:00
diminator
3142e00ea5 Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do 2015-07-28 12:13:40 +02:00
Tim Daubenschütz
332366ec15 Integrate dropzone inactivity into user flow 2015-07-27 16:00:54 +02:00
Tim Daubenschütz
d52a89cd3e only display hashing toggle on user permissions 2015-07-27 15:34:45 +02:00
Tim Daubenschütz
2274efaed7 implement hashing toggle 2015-07-27 14:21:26 +02:00
Tim Daubenschütz
8f6b858f0a make form submittable after the files blob was successfully created 2015-07-27 09:33:31 +02:00
Tim Daubenschütz
5da577caca use standard promises instead of fineuploaders' 2015-07-27 09:28:50 +02:00
Tim Daubenschütz
d71111b6f1 fix wording for file drag and drop dialog 2015-07-27 09:23:01 +02:00
Tim Daubenschütz
e53a45822b simplified error handling in progress routine 2015-07-24 16:29:57 +02:00
Tim Daubenschütz
a7a36589a7 Add abort hashing functionality 2015-07-24 16:17:27 +02:00
Tim Daubenschütz
38751ae612 add user interface feedback 2015-07-24 15:13:20 +02:00
Tim Daubenschütz
494ab209ca implement hashing progress functionality 2015-07-24 14:39:04 +02:00
Tim Daubenschütz
9dc811febb forgot one Q import 2015-07-24 13:49:16 +02:00
Tim Daubenschütz
a199fd08c1 replace es6-promise with Q 2015-07-24 13:44:28 +02:00
diminator
861f633476 concurrent upload of chunks
fixed spool tests for bitcoin and blobs
2015-07-23 18:14:17 +02:00
Tim Daubenschütz
01b34ec1fb add getLangText for reactfineuploader 2015-07-23 17:17:48 +02:00