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

..

ascribe-fonts

separat fonts and images

2015-05-29 11:57:24 +02:00

ascribe_accordion_list.scss

refactor table to bootstrap table

2015-06-04 17:21:38 +02:00

ascribe_media_player.scss

Add "other" type display

2015-06-04 17:37:46 +02:00

ascribe_piece_list_bulk_modal.scss

fixing AD-393

2015-06-04 16:13:10 +02:00

ascribe_piece_list_toolbar.scss

add unfinished filtering widget

2015-06-02 11:40:55 +02:00

ascribe_variables.scss

rename piece_list_toolbar to a more fitting name: piece_list_bulk_modal

2015-06-02 09:10:26 +02:00

main.scss

Merge branch 'master' into AD-412-mediaplayer

2015-06-05 13:18:16 +02:00

offset_right.scss

implement search functionality

2015-06-02 10:10:09 +02:00

variables.scss

style and prepare boilerplate components

2015-05-29 16:28:05 +02:00