ddejongh 41d70a9a15 Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar ...

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/settings_container.js
	sass/ascribe_settings.scss

2015-06-23 16:07:17 +02:00

..

ascribe-fonts

Add ENV variable to handle BASE_URL

2015-06-09 17:53:44 +02:00

ascribe_accordion_list.scss

Dimi and Tim styling action

2015-06-17 19:50:52 +02:00

ascribe_edition.scss

edition detail updated with forms

2015-06-22 23:32:41 +02:00

ascribe_login.scss

register first cut

2015-06-22 10:50:22 +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_piece_register.scss

fineuploader + register

2015-06-23 13:55:05 +02:00

ascribe_settings.scss

localization

2015-06-23 16:02:48 +02:00

ascribe_table.scss

separat ascribe-table css

2015-06-12 15:42:43 +02:00

ascribe_textarea.scss

edition detail updated with forms

2015-06-22 23:32:41 +02:00

ascribe_uploader.scss

Removed submodule react-s3

2015-06-23 10:16:53 +02:00

ascribe_variables.scss

add first working prototype

2015-06-08 18:14:25 +02:00

ascribe-global-notification.scss

add first working prototype

2015-06-08 18:14:25 +02:00

main.scss

fineuploader + register

2015-06-23 13:55:05 +02:00

offset_right.scss

implement search functionality

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

variables.scss

Dimi and Tim styling action

2015-06-17 19:50:52 +02:00