Tim Daubenschütz 49421e1fa1 Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form ... Conflicts: js/components/ascribe_detail/further_details_fileuploader.js js/components/ascribe_forms/form.js js/components/ascribe_forms/form_loan.js js/components/ascribe_forms/form_register_piece.js js/components/ascribe_forms/input_fineuploader.js js/components/ascribe_forms/property.js js/components/ascribe_forms/property_collapsible.js js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js js/components/ascribe_uploader/react_s3_fine_uploader.js js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js sass/ascribe-fonts/ascribe-fonts.scss sass/whitelabel/wallet/cyland/cyland_custom_style.scss		2015-12-07 13:39:30 +01:00
..
ascribe_accordion_list	Fix comments in PR	2015-12-04 16:34:25 +01:00
ascribe_buttons	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
ascribe_collapsible	Fix render bug for personal piece note	2015-12-02 16:51:56 +01:00
ascribe_detail	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
ascribe_forms	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
ascribe_media	Merge branch 'master' into AD-56-add-social-share-functionality	2015-11-16 15:54:49 +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	Fix comments in PR	2015-12-04 16:34:25 +01:00
ascribe_piece_list_toolbar	Fix default filter on piece list	2015-11-24 19:26:45 +01:00
ascribe_routes/proxy_routes	Add pageExitWarning for SlidesContainer	2015-11-25 15:01:23 +01:00
ascribe_settings	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
ascribe_slides_container	Add pageExitWarning for SlidesContainer	2015-11-25 15:01:23 +01:00
ascribe_social_share	Fix bug in FB button component & simplify injectHead util	2015-11-23 19:02:28 +01:00
ascribe_table	Switch all usages of Router.Navigation and Router.State	2015-10-01 11:16:38 +02:00
ascribe_uploader	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
whitelabel	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +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	Fix ListItemEditionWidget spinner's colour	2015-12-04 14:34:59 +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
error_not_found_page.js	Finalize ReactError component	2015-12-07 11:48:28 +01:00
footer.js	change impressum to imprint	2015-11-19 17:35:25 +01:00
global_action.js
global_notification.js
header_notification_debug.js
header_notification.js	fix wrong redirect in header_notification	2015-10-12 14:24:21 +02:00
header.js	Add note for navBar state hack	2015-11-27 14:13:30 +01:00
login_container.js	Add document title management for the ascribe app	2015-10-13 16:42:40 +02:00
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	Upgrade react-router-bootstrap	2015-10-01 14:00:56 +02:00
nav_routes_links.js	Fix dynamic routing for react-router-bootstrap	2015-10-01 14:16:20 +02:00
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	Fix bug that threw an error when passing nullish prop to PieceListFilterDisplay	2015-12-02 12:23:38 +01:00
piece_list.js	Fix customThumbnailPlacholder propType	2015-12-04 13:52:17 +01:00
register_piece.js	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +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	Add document title management for the ascribe app	2015-10-13 16:42:40 +02:00