48 Commits

Author	SHA1	Message	Date
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	8ac26275f5	piece view	2015-07-08 22:54:07 +02:00
Tim Daubenschütz	c61fd71108	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-07-08 10:35:58 +02:00
Tim Daubenschütz	c1e50cbe78	visual edits to fineuploader	2015-07-08 10:03:06 +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	4a2ad0ea9d	piece registration without editions	2015-07-07 15:48:09 +02:00
diminator	27c1b390ea	editions optional	2015-07-07 15:25:49 +02:00
diminator	fa2ae7cba8	styling changes for frontend	2015-07-07 10:28:39 +02:00
Tim Daubenschütz	216c63506e	important stuff	2015-07-02 18:42:24 +02:00
Tim Daubenschütz	29fdb1e0d7	fix csrf bug with fineuploaders props	2015-07-02 16:51:22 +02:00
Tim Daubenschütz	3ae94a2100	nail login transition	2015-07-02 15:40:54 +02:00
Tim Daubenschütz	85a1574d41	handle slide_num default for non-set queryParams	2015-07-02 14:53:49 +02:00
Tim Daubenschütz	cb996566c7	couple slides container to url state	2015-07-02 14:42:04 +02:00
Tim Daubenschütz	3adcbe0f8d	add slide functionality	2015-07-02 13:56:24 +02:00
Tim Daubenschütz	4b87d21259	add working slides container boilerplate	2015-07-02 13:31:35 +02:00
Tim Daubenschütz	1f6d20fb15	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user- ... Conflicts: js/components/register_piece.js	2015-07-02 11:50:39 +02:00
Tim Daubenschütz	e542d3b2a5	piece registration animation process	2015-07-02 11:49:17 +02:00
diminator	85347a8916	fineuploader session with cors	2015-07-02 11:35:06 +02:00
Tim Daubenschütz	d0b8610050	update piece list after piece registration	2015-07-01 16:21:49 +02:00
Tim Daubenschütz	740f506ced	fix bug in mergeOptions method	2015-07-01 16:19:02 +02:00
diminator	323a2472b4	Merge remote-tracking branch 'remotes/origin/master' into AD-368-harmonize-functionality-of-ascrib	2015-07-01 15:55:32 +02:00
Tim Daubenschütz	b5a5481285	add editable acl to react s3 fineuploader	2015-07-01 12:13:05 +02:00
diminator	ca3b058b4d	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib	2015-07-01 11:22:49 +02:00
diminator	3e71926b7d	register piece transitions	2015-07-01 11:21:43 +02:00
diminator	2436e198db	styling + licenses url	2015-07-01 09:15:36 +02:00
Tim Daubenschütz	a8120867b9	add call to action on empty piece list	2015-06-30 16:58:26 +02:00
Tim Daubenschütz	8c3dfc4b73	made download functionality optional	2015-06-30 13:53:02 +02:00
Tim Daubenschütz	e31b6f0108	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload ... Conflicts: js/components/register_piece.js	2015-06-30 10:45:07 +02:00
diminator	8fc400bb01	licenses in registration	2015-06-30 10:42:58 +02:00
Tim Daubenschütz	31e3c23302	rename upload status variable	2015-06-30 09:20:20 +02:00
Tim Daubenschütz	6c44333f1a	add file drag and drop toolbar	2015-06-29 16:00:26 +02:00
Tim Daubenschütz	a87f2eb272	refactor form validation	2015-06-29 11:44:16 +02:00
Tim Daubenschütz	1a9c82d683	finalize delete and cancel functionality	2015-06-29 11:01:45 +02:00
Tim Daubenschütz	66fff1c50a	implement cancel functionality	2015-06-29 10:01:54 +02:00
diminator	5916c27c45	uploader defaultprops	2015-06-29 10:00:26 +02:00
Tim Daubenschütz	b7e933c943	add delete buttons	2015-06-25 13:28:49 +02:00
Tim Daubenschütz	2f7bbd01b8	fix multiple attribute for fine uploader	2015-06-25 10:35:25 +02:00
Tim Daubenschütz	bf2a766e84	implement submission for autofill firefox and chrome	2015-06-24 15:52:43 +02:00
ddejongh	6dd3e582df	fineuploader + register	2015-06-23 13:55:05 +02:00
ddejongh	3f3e9a273f	git removed s3-fineuploader	2015-06-23 10:27:19 +02:00
ddejongh	9e1a76a08e	api settings complete	2015-06-22 17:33:25 +02:00
ddejongh	f836d4c2d4	register first cut	2015-06-22 10:50:22 +02:00
ddejongh	23190f6c48	signup/login	2015-06-20 16:43:18 +02:00
ddejongh	e1dbc0e183	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ... Conflicts: js/routes.js	2015-06-19 14:05:56 +02:00
ddejongh	efc7f6d46b	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ... Conflicts: js/routes.js	2015-06-19 13:13:37 +02:00
ddejongh	48d44c0a30	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar ... Conflicts: js/routes.js	2015-06-19 11:01:06 +02:00
Tim Daubenschütz	cd9c561ddf	boilerplate for piece registration	2015-06-17 17:48:52 +02:00