83 Commits

Author	SHA1	Message	Date
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	21fc2cee28	convert cancel hashing action to anchor	2015-07-27 16:37:54 +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	d6968b40b5	Fix wording and add localization	2015-07-24 17:29:30 +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
Tim Daubenschütz	2f24ad8352	implement feedback for hashing functionalitxy	2015-07-23 17:05:52 +02:00
Tim Daubenschütz	4ec8f6b718	add file hashing functionality to react fine uploader	2015-07-23 16:47:32 +02:00
Tim Daubenschütz	80861813e9	documente and implement routine in react fine uploader	2015-07-23 15:57:25 +02:00
Tim Daubenschütz	71fcdff874	made react fine uploader error message more generic	2015-07-23 15:27:14 +02:00
diminator	0cc48a73e4	moved hashing to file_utils	2015-07-23 13:03:30 +02:00
diminator	1a1f14e04c	add JS file hashing to fineuploader ... didnt instantiate it because needs UX	2015-07-23 11:45:25 +02:00
Tim Daubenschütz	23e6cc17b2	make dropzone inactive when user is logged out	2015-07-21 11:09:21 +02:00
diminator	11fb512763	s3 urls anonymous and refactored ... zencoder with multiple thumbnail sizes	2015-07-20 18:59:32 +02:00
Tim Daubenschütz	2ff47ede89	replace console logs with global logging	2015-07-17 15:52:53 +02:00
Tim Daubenschütz	af42bb8e67	error handling first cut	2015-07-17 15:41:09 +02:00
Tim Daubenschütz	13e151e83b	add logging and responsive user navigation	2015-07-16 19:12:18 +02:00
Tim Daubenschütz	ee6d2789ed	set csrftokens as constants	2015-07-16 18:17:45 +02:00
Tim Daubenschütz	cbfbde262f	fix fineuploader bug when clicking the add files button in a form	2015-07-15 16:50:32 +02:00
Tim Daubenschütz	6a04a1a053	fix fineuploader issue after unmounting react-s3-fineuploader	2015-07-14 20:10:41 +02:00
Tim Daubenschütz	27c4e588ef	fix minification bug	2015-07-14 10:52:44 +02:00
Tim Daubenschütz	acbfd8c840	remove wrong imports from fineuploader	2015-07-14 10:39:36 +02:00
Tim Daubenschütz	8fc812e574	converting fineuploader promises	2015-07-14 10:36:37 +02:00
Tim Daubenschütz	bfb052f8c0	better error handling for fineuploader	2015-07-14 10:33:15 +02:00
Tim Daubenschütz	62ae8fd08b	fix warnings	2015-07-10 14:15:22 +02:00
diminator	8f78de3fb4	editions styling ... fix otherdata collapsible styling	2015-07-09 18:46:53 +01:00
diminator	fd8859fd22	Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- ... Conflicts: js/components/ascribe_detail/edition.js	2015-07-09 14:54:11 +01:00
diminator	9fd4c1a6fd	otherdata and extradata on a piece level and templated in frontend	2015-07-09 13:37:33 +01:00
Tim Daubenschütz	6d72352580	some minor corrections	2015-07-08 10:15:58 +02:00
Sylvain Bellemare	f066008ce9	translated english text to french	2015-07-08 09:57:50 +02:00
Tim Daubenschütz	22629ac09d	adjust register piece form	2015-07-07 18:07:12 +02:00
diminator	fbba3f4670	staging with cors without uglify and lang error	2015-07-02 18:54:47 +02:00
diminator	a26e8f7813	test without cors	2015-07-02 18:40:54 +02:00
Tim Daubenschütz	dd039b88e8	fix contract fineuploader bugs	2015-07-02 17:57:33 +02:00
Tim Daubenschütz	29fdb1e0d7	fix csrf bug with fineuploaders props	2015-07-02 16:51:22 +02:00
Tim Daubenschütz	b5a5481285	add editable acl to react s3 fineuploader	2015-07-01 12:13:05 +02:00