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

..

ascribe_forms

form framework

2015-05-29 01:54:56 +02:00

ascribe_media

WIP

2015-05-27 17:34:33 +02:00

ascribe_modal

form framework

2015-05-29 01:54:56 +02:00

ascribe_pagination

Add more logic to pagination

2015-05-22 17:11:17 +02:00

ascribe_piece_list_toolbar

add acl buttons for selection

2015-05-27 14:35:33 +02:00

ascribe_table

Merge branch 'piece-detail-setup'

2015-05-29 10:50:49 +02:00

acl_button.js

add acl buttons for selection

2015-05-27 14:35:33 +02:00

ascribe_app.js

put link in header

2015-05-21 15:16:56 +02:00

edition_container.js

sharemodal view

2015-05-27 09:34:49 +02:00

edition.js

Merge branch 'master' into piece-detail-mediaplayer

2015-05-29 11:22:19 +02:00

header.js

format header html

2015-05-21 15:20:02 +02:00

piece_list.js

Merge branch 'piece-detail-setup'

2015-05-29 10:50:49 +02:00