Tim Daubenschütz ac07107210 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark ...

Conflicts:
	js/constants/application_constants.js
	js/utils/requests.js

2015-11-16 16:38:35 +01:00

..

ascribe_accordion_list

Replace all occurrences of with momentjs

2015-11-03 10:57:41 +01:00

ascribe_buttons

Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark

2015-11-16 16:38:35 +01:00

ascribe_collapsible

…

ascribe_detail

Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark

2015-11-16 16:38:35 +01:00

ascribe_forms

Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark

2015-11-16 16:38:35 +01:00

ascribe_media

Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality

2015-11-11 10:51:45 +01:00

ascribe_modal

Merge with master

2015-11-03 10:39:01 +01:00

ascribe_pagination

Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity

2015-10-19 10:30:14 +02:00

ascribe_panel

…

ascribe_piece_list_bulk_modal

Filter the collection to only show the consignable items by default

2015-11-06 14:10:54 +01:00

ascribe_piece_list_toolbar

Filter the collection to only show the consignable items by default

2015-11-06 14:10:54 +01:00

ascribe_routes/proxy_routes

Improve DRYness of acl buttons

2015-11-06 15:10:29 +01:00

ascribe_settings

Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-

2015-11-16 15:27:00 +01:00

ascribe_slides_container

Better robustness for slides container and register form for cyland

2015-10-14 16:20:51 +02:00

ascribe_table

…

ascribe_uploader

Merge branch 'master' into AD-1340-add-details-video-upload-errors

2015-11-16 16:33:39 +01:00

whitelabel

Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark

2015-11-16 16:38:35 +01:00

acl_proxy.js

…

ascribe_app.js

Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity

2015-10-19 10:30:14 +02:00

ascribe_spinner.js

Merge with master

2015-11-03 10:39:01 +01:00

coa_verify_container.js

Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity

2015-10-21 09:47:14 +02:00

contract_notification.js

…

error_not_found_page.js

…

footer.js

Merged in AD-1080-restyle-webapp-with-new-corporate-identity (pull request #104)

2015-10-22 11:55:34 +02:00

global_action.js

…

global_notification.js

…

header_notification_debug.js

…

header_notification.js

…

header.js

Merge with master

2015-11-03 10:39:01 +01:00

login_container.js

…

logout_container.js

Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity

2015-10-21 09:47:14 +02:00

nav_routes_links_link.js

…

nav_routes_links.js

…

password_reset_container.js

Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity

2015-10-21 09:47:14 +02:00

piece_list_filter_display.js

…

piece_list.js

Filter the collection to only show the consignable items by default

2015-11-06 14:10:54 +01:00

register_piece.js

Fix minor bugs for simple_prize app

2015-11-06 15:47:55 +01:00

search_bar.js

Replace ascribe-green-color with new ascribe-blue-color

2015-10-21 11:34:12 +02:00

signup_container.js

…