vrde d44cf295f0 Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer ... Conflicts: js/components/ascribe_media/resource_viewer.js		2015-06-04 14:12:29 +02:00
..
ascribe_accordion_list	add link functionality	2015-06-04 11:41:56 +02:00
ascribe_forms	resolve cluster-merge-fuck	2015-06-02 17:32:38 +02:00
ascribe_media	add link functionality	2015-06-04 11:41:56 +02:00
ascribe_modal	loan/share forms multiedition	2015-06-02 14:00:05 +02:00
ascribe_pagination	add german language file and integrated translation method	2015-06-02 14:25:26 +02:00
ascribe_piece_list_bulk_modal	code styling	2015-06-03 10:45:23 +02:00
ascribe_piece_list_toolbar	comment out filter widget	2015-06-02 15:36:06 +02:00
ascribe_table	add link functionality	2015-06-04 11:41:56 +02:00
acl_button.js	bulk transfer part 1	2015-06-02 11:38:18 +02:00
ascribe_app.js	put link in header	2015-05-21 15:16:56 +02:00
edition_container.js	Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer	2015-06-03 17:44:13 +02:00
edition.js	Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer	2015-06-03 17:44:13 +02:00
fatal_error.js	multiloan	2015-06-02 16:47:25 +02:00
header.js	add german language file and integrated translation method	2015-06-02 14:25:26 +02:00
piece_list.js	put show state of item list in store to fix bug	2015-06-02 15:33:48 +02:00