452 Commits

Author	SHA1	Message	Date
Tim Daubenschütz	d5fad09b60	loading animation for show more	2015-07-06 18:29:27 +02:00
Tim Daubenschütz	5ec54f4324	add icons	2015-07-06 17:07:41 +02:00
Tim Daubenschütz	7863431727	add toggle for show more	2015-07-06 15:56:14 +02:00
Tim Daubenschütz	f12a57c3cf	fix merging on ACL action	2015-07-06 15:42:04 +02:00
Tim Daubenschütz	e10b56cfc7	first cut pagination for editions	2015-07-03 16:31:09 +02:00
diminator	37759582ce	cc-staging	2015-07-03 15:52:42 +02:00
vrde	1d6e3cd26c	Add progressbar for encoding	2015-07-03 15:05:14 +02:00
diminator	9d30b9e3b2	embed	2015-07-03 12:35:45 +02:00
diminator	ecef14b4df	fix comma bug	2015-07-03 10:45:37 +02:00
diminator	b760d23813	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-07-03 10:41:32 +02:00
Tim Daubenschütz	643a50a242	Merge branch 'master' of bitbucket.org:ascribe/onion	2015-07-03 10:40:24 +02:00
Tim Daubenschütz	909e9db0b8	add polyfill	2015-07-03 10:40:04 +02:00
diminator	e9c8ab6bf7	Merge remote-tracking branch 'remotes/origin/AD-523-french-translation-of-whole-front'	2015-07-03 10:29:38 +02:00
diminator	3220cfcd5a	Merge remote-tracking branch 'origin/master'	2015-07-02 19:23:23 +02:00
diminator	59cc9cbbce	coa button	2015-07-02 19:22:32 +02:00
Sylvain Bellemare	3eedda7724	[WIP] adding localisation support for French	2015-07-02 19:13:40 +02:00
diminator	fbba3f4670	staging with cors without uglify and lang error	2015-07-02 18:54:47 +02:00
Tim Daubenschütz	ce5b9231af	Merge branch 'AD-527-transition-to-login-form-if-user-'	2015-07-02 18:43:04 +02:00
Tim Daubenschütz	216c63506e	important stuff	2015-07-02 18:42:24 +02:00
diminator	a26e8f7813	test without cors	2015-07-02 18:40:54 +02:00
diminator	531505c0d1	Merge remote-tracking branch 'remotes/origin/AD-506-add-audio-player'	2015-07-02 18:35:04 +02:00
vrde	c2c0fd3ab8	Add audio player	2015-07-02 18:27:09 +02:00
Tim Daubenschütz	dd039b88e8	fix contract fineuploader bugs	2015-07-02 17:57:33 +02:00
vrde	7f8a36b99a	Add videojs and styles	2015-07-02 17:10:32 +02:00
Tim Daubenschütz	24af321669	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user-	2015-07-02 16:51:43 +02:00
Tim Daubenschütz	29fdb1e0d7	fix csrf bug with fineuploaders props	2015-07-02 16:51:22 +02:00
diminator	41da3b2029	footer + social icons	2015-07-02 15:41:17 +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
diminator	3556e8c3c2	ellipsis	2015-07-02 14:40: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
diminator	18f3b51153	fineuploader session with cors	2015-07-02 11:54:33 +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
diminator	4ca2144c0c	request actions in frontend	2015-07-01 19:05:47 +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
diminator	5f372eedda	edition_index + default license	2015-07-01 15:28:48 +02:00
Tim Daubenschütz	787f25ddde	fix old edition data bug	2015-07-01 15:23:50 +02:00
diminator	eb947e68aa	licenses in header and on piece level	2015-07-01 13:54:58 +02:00
diminator	1ec47338a1	deleted editions cannot be retrieved	2015-07-01 12:17:50 +02:00
Tim Daubenschütz	b5a5481285	add editable acl to react s3 fineuploader	2015-07-01 12:13:05 +02:00
diminator	f58a65eb0c	s3 views dont accept anonymous	2015-07-01 11:43:33 +02:00
Tim Daubenschütz	2bf7d2cbb3	fix collapse bug concerning accordion table	2015-07-01 11:36:36 +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
Tim Daubenschütz	75ea9e1da6	piece list toolbar responsive	2015-07-01 11:13:45 +02:00
Tim Daubenschütz	a4fd7fc837	rename bitcoin address to id	2015-07-01 10:59:06 +02:00
Tim Daubenschütz	d67bbe7770	made accordion table responsive	2015-07-01 10:53:40 +02:00
Tim Daubenschütz	1db9921dd8	use safe urls for thumbnails and links	2015-07-01 10:00:53 +02:00
diminator	2436e198db	styling + licenses url	2015-07-01 09:15:36 +02:00
Tim Daubenschütz	929c694ad7	finalized delete functionality	2015-06-30 17:57:20 +02:00
Tim Daubenschütz	bb73416a8c	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload	2015-06-30 17:14:53 +02:00
diminator	c6528d8999	other_data : delete without cascade and show acl	2015-06-30 17:12:51 +02:00
diminator	5ecd1368f0	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib ... Conflicts: js/components/ascribe_uploader/react_s3_fine_uploader.js	2015-06-30 17:12:21 +02:00
Tim Daubenschütz	26442c9230	add margins to button lists	2015-06-30 17:12:13 +02:00
Tim Daubenschütz	a8120867b9	add call to action on empty piece list	2015-06-30 16:58:26 +02:00
diminator	5008ade408	otherdata delete	2015-06-30 16:54:45 +02:00
Tim Daubenschütz	2a5bd9173e	fix image scaling	2015-06-30 16:53:22 +02:00
Tim Daubenschütz	e6ac475ad5	add download functionality to s3 fine uploader	2015-06-30 16:15:50 +02:00
diminator	fe4d4c6a72	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib	2015-06-30 15:43:48 +02:00
Tim Daubenschütz	9ce6c45690	add sessions for already uploaded files and implement manual deletion	2015-06-30 15:41:39 +02:00
diminator	ce13da4b49	password reset complete + subdomain	2015-06-30 15:26:39 +02:00
diminator	6660065cad	signup process complete + subdomained	2015-06-30 14:46:28 +02:00
Tim Daubenschütz	8c3dfc4b73	made download functionality optional	2015-06-30 13:53:02 +02:00
Tim Daubenschütz	ea47f7a371	add place holder for empty piece list	2015-06-30 13:32:41 +02:00
Tim Daubenschütz	1976dee57a	fix firefox simulate click issue	2015-06-30 11:56:38 +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	e7f29cd973	fix bug in edition detail	2015-06-30 09:23:26 +02:00
Tim Daubenschütz	31e3c23302	rename upload status variable	2015-06-30 09:20:20 +02:00
Tim Daubenschütz	52db729a4d	readd delete functionality	2015-06-29 17:59:35 +02:00
Tim Daubenschütz	f1d3b3968f	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload	2015-06-29 17:37:51 +02:00
Tim Daubenschütz	a66a4e1c9f	add pause and play functionality	2015-06-29 17:37:14 +02:00
diminator	c6bc34c2f7	otherdata POST and fineuploader_session OK	2015-06-29 17:21:14 +02:00
Tim Daubenschütz	dbbf9fd233	debug	2015-06-29 16:57:31 +02:00
Tim Daubenschütz	e44ae60b75	first cut pause	2015-06-29 16:46:12 +02:00
Tim Daubenschütz	8064fdb39d	Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload	2015-06-29 16:19:04 +02:00
Tim Daubenschütz	90e8278504	integrate file sessions for edition detail	2015-06-29 16:17:57 +02:00
diminator	ea770943f2	editions and api_urls	2015-06-29 16:15:41 +02:00
diminator	e36681ad4d	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib ... Conflicts: js/components/ascribe_uploader/react_s3_fine_uploader.js	2015-06-29 16:15:08 +02:00
Tim Daubenschütz	6c44333f1a	add file drag and drop toolbar	2015-06-29 16:00:26 +02:00
diminator	f3677501c1	whitelabel subdomains	2015-06-29 15:58:47 +02:00
Tim Daubenschütz	dcb3e00e3a	styling for mobile	2015-06-29 14:36:55 +02:00
Tim Daubenschütz	867ebec134	fix styling for fineuploader	2015-06-29 13:41:37 +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
diminator	2c2ccd7891	Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-504-revive-coa-for-new-frontend	2015-06-26 11:52:59 +02:00
diminator	eff25a9801	withdraw transfer with delete of transfer record	2015-06-26 11:44:35 +02:00
diminator	99d6dd278c	withdraw fix	2015-06-26 01:05:20 +02:00
diminator	7e115e26ad	withdraw transfer part one	2015-06-26 00:38:40 +02:00
diminator	930982873a	Merge remote-tracking branch 'remotes/origin/master' into AD-504-revive-coa-for-new-frontend	2015-06-26 00:04:25 +02:00
diminator	b1ad4cc36f	withdraw transfer part one	2015-06-25 23:25:03 +02:00
diminator	64017f604c	login location with baseurl	2015-06-25 15:30:47 +02:00