67 Commits

Author	SHA1	Message	Date
diminator	c6528d8999	other_data : delete without cascade and show acl	2015-06-30 17:12:51 +02:00
diminator	5008ade408	otherdata delete	2015-06-30 16:54:45 +02:00
Tim Daubenschütz	8c3dfc4b73	made download functionality optional	2015-06-30 13:53:02 +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
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
Tim Daubenschütz	6c44333f1a	add file drag and drop toolbar	2015-06-29 16:00:26 +02:00
diminator	5916c27c45	uploader defaultprops	2015-06-29 10:00:26 +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	b1ad4cc36f	withdraw transfer part one	2015-06-25 23:25:03 +02:00
diminator	d980ef7949	verify button link	2015-06-25 15:23:10 +02:00
diminator	fba30a565b	coa renders per page ... verify	2015-06-25 14:39:39 +02:00
ddejongh	89884ced1f	edition detail updated with forms	2015-06-22 23:32:41 +02:00
ddejongh	fabff2922c	account settings	2015-06-17 17:48:23 +02:00
ddejongh	d50b3ca14d	fixed logout	2015-06-16 20:35:19 +02:00
ddejongh	ff12048c10	edition note	2015-06-16 16:38:22 +02:00
ddejongh	9cf060fdc4	csrf subdomain	2015-06-16 14:49:00 +02:00
ddejongh	8d73e4a77b	edit acl ... editionnote	2015-06-16 14:01:53 +02:00
ddejongh	bf0a2aeefb	consign unconsign requests ... async emails	2015-06-11 15:03:55 +02:00
ddejongh	af71196dfd	delete function for multi editions	2015-06-10 15:49:46 +02:00
ddejongh	9241d3e38f	further details functional / unstyled	2015-06-09 17:24:06 +02:00
ddejongh	509aa111ab	Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- ... Conflicts: gulpfile.js added notifications cleaned up proptypes	2015-06-09 16:10:38 +02:00
ddejongh	6563bf97b0	toggable textarea	2015-06-09 13:29:22 +02:00
Tim Daubenschütz	443829320f	add personal note to piece detail page	2015-06-05 16:20:28 +02:00
Tim Daubenschütz	7f82d49278	resolve merge	2015-06-05 14:29:37 +02:00
Tim Daubenschütz	76a41a23b9	add details to piece detail page	2015-06-05 14:22:02 +02:00
vrde	e8627cd0a3	Merge branch 'master' into AD-412-mediaplayer ... Conflicts: js/components/ascribe_media/resource_viewer.js js/components/edition_container.js js/mixins/inject_in_head_mixin.js package.json	2015-06-05 13:18:16 +02:00
Tim Daubenschütz	a7478cdcb5	resolve merge conflicts	2015-06-05 11:40:49 +02:00
Tim Daubenschütz	18a2806fb1	minor fixes	2015-06-05 11:32:10 +02:00
Tim Daubenschütz	f987bce7cc	add es6lint to build process and fix most (not really) errors and warnings	2015-06-05 11:06:36 +02:00
vrde	13caad7794	Refactor and restyle	2015-06-04 16:15:59 +02:00
vrde	641e8ac82d	Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer ... Conflicts: js/components/edition.js js/mixins/inject_in_head_mixin.js	2015-06-03 17:44:13 +02:00
vrde	34cf9e6871	Add support for videos and images	2015-06-03 16:53:27 +02:00
ddejongh	876ade5f12	collapse part 1	2015-06-03 11:56:49 +02:00
ddejongh	265a7573ce	aclbuttonlist willmount	2015-06-03 10:43:59 +02:00
ddejongh	6078410240	refactored buttons	2015-06-03 10:27:11 +02:00
Tim Daubenschütz	95c199bed6	resolve cluster-merge-fuck	2015-06-02 17:32:38 +02:00
vrde	3e7a670509	Merge branch 'master' into piece-detail-mediaplayer ... Conflicts: js/components/edition.js	2015-06-02 14:00:47 +02:00
ddejongh	dc3d024f8d	bulk transfer part 1	2015-06-02 11:38:18 +02:00
ddejongh	cbecbf44ad	bind modals to actionbuttons	2015-06-01 18:59:47 +02:00
ddejongh	1c76c5ef48	merge fix	2015-06-01 16:04:34 +02:00
ddejongh	420516a2fe	merge fix	2015-06-01 16:03:41 +02:00
ddejongh	3f9f133224	Merge remote-tracking branches 'remotes/origin/AD-51-refactor-table-to-mockup' and 'remotes/origin/piece-detail-mediaplayer' into piece-detail-setup	2015-06-01 15:58:37 +02:00