6 Commits

Author	SHA1	Message	Date
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