83 Commits

Author	SHA1	Message	Date
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
vrde	f50d28be98	Refactor fetch, WIP	2015-06-01 14:22:04 +02:00
ddejongh	d90a4f97db	loan	2015-06-01 13:02:53 +02:00
ddejongh	2c7535a73a	unconsign	2015-05-29 16:53:30 +02:00
ddejongh	961b8ee58d	errors for non-fields, 500 ... removed retry consign_form	2015-05-29 15:16:42 +02:00
vrde	3ac5cc5dde	Merge branch 'master' into piece-detail-mediaplayer ... Conflicts: js/components/ascribe_table/table_item_subtable.js js/components/edition.js	2015-05-29 11:22:19 +02:00
ddejongh	c3ea9aecbe	form framework ... - inputtext, area, btn - alertmixin - formmixin - 500 - transfer/share	2015-05-29 01:54:56 +02:00
vrde	df95e75025	WIP	2015-05-27 17:34:33 +02:00
ddejongh	3c3504d773	modal error	2015-05-27 17:33:15 +02:00
ddejongh	76317dcdca	modal + forms	2015-05-27 15:53:26 +02:00
ddejongh	8624eb26c7	sharemodal view	2015-05-27 09:34:49 +02:00
ddejongh	3a103c1d99	modal try 1	2015-05-26 16:52:53 +02:00
ddejongh	d685d68d15	modal try 1	2015-05-26 16:46:50 +02:00
ddejongh	230ecfb0e4	modal try 1	2015-05-26 16:46:02 +02:00
ddejongh	e3c115897f	refactored edition properties	2015-05-26 15:31:28 +02:00
ddejongh	dc33c74da6	edition loads in detail	2015-05-26 14:58:11 +02:00
ddejongh	bcf8756cd3	edition	2015-05-26 13:48:46 +02:00
ddejongh	497e43005e	Merge remote-tracking branch 'remotes/origin/master' into piece-detail-setup ... Conflicts: css/main.css js/components/ascribe_table/table_item_subtable.js	2015-05-26 13:48:00 +02:00