12 Commits

Author	SHA1	Message	Date
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	f987bce7cc	add es6lint to build process and fix most (not really) errors and warnings	2015-06-05 11:06:36 +02:00
Tim Daubenschütz	6da18e9a85	rename mergeOptions	2015-06-04 15:38:15 +02:00
Tim Daubenschütz	8a3ff445ef	use mergeOptionsList on all react components	2015-06-04 15:33:59 +02:00
Tim Daubenschütz	c19a05ca50	fix setState bug by renaming componentDidUnmount to componentWillUnmount	2015-06-04 13:17:59 +02:00
Tim Daubenschütz	ccbf411168	fixed store bindings	2015-06-04 13:16:19 +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	cbecbf44ad	bind modals to actionbuttons	2015-06-01 18:59:47 +02:00
ddejongh	8624eb26c7	sharemodal view	2015-05-27 09:34:49 +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