Tim Daubenschütz ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra ... Clear some merge conflicts and also some wrong merges. BAD GIT!!! Conflicts: js/components/ascribe_forms/property.js js/components/ascribe_uploader/react_s3_fine_uploader_utils.js sass/ascribe_uploader.scss		2015-09-15 13:30:24 +02:00
..
ascribe_accordion_list	refactored notifications per detail	2015-09-03 17:25:22 +02:00
ascribe_buttons	git ignore removed	2015-09-07 16:33:21 +02:00
ascribe_collapsible	nested collapsible paragraphs	2015-09-01 14:00:06 +02:00
ascribe_detail	Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-10 17:45:51 +02:00
ascribe_forms	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-15 13:30:24 +02:00
ascribe_media	Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading	2015-09-14 11:14:02 +02:00
ascribe_modal	remove close button from modals	2015-08-05 18:00:44 +02:00
ascribe_pagination	Fix pagination on search bug	2015-06-16 09:27:04 +02:00
ascribe_panel	finalize contract styles	2015-09-08 10:15:26 +02:00
ascribe_piece_list_bulk_modal	Filter open edition tables correctly	2015-08-07 13:05:50 +02:00
ascribe_piece_list_toolbar	sorting acl and styling	2015-08-14 15:38:30 +02:00
ascribe_settings	contract list make public	2015-09-09 11:11:16 +02:00
ascribe_slides_container	minor fix	2015-09-10 16:20:14 +02:00
ascribe_table	refactored notifications per detail	2015-09-03 17:25:22 +02:00
ascribe_uploader	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-15 13:30:24 +02:00
whitelabel	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-15 13:30:24 +02:00
acl_proxy.js	Filter open edition tables correctly	2015-08-07 13:05:50 +02:00
ascribe_app.js	add router/navigation integration into whole project	2015-08-27 14:34:15 +02:00
coa_verify_container.js	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00
contract_notification.js	contract agreement notifications	2015-09-04 11:49:55 +02:00
footer.js	Fix trailing slash on footer	2015-07-21 17:57:11 +02:00
global_action.js	notifications unoptimized	2015-09-01 14:45:14 +02:00
global_notification.js	better error messages for API failures	2015-07-17 16:12:24 +02:00
header_notification_debug.js	add desktop version for notifications	2015-07-08 17:06:53 +02:00
header_notification.js	refactored notifications per detail	2015-09-03 17:25:22 +02:00
header.js	notification app	2015-09-03 14:15:00 +02:00
login_container.js	slide container works now with browser history	2015-07-21 15:05:42 +02:00
logout_container.js	patch logout behavior	2015-07-17 18:53:04 +02:00
nav_routes_links.js	add router/navigation integration into whole project	2015-08-27 14:34:15 +02:00
password_reset_container.js	loan contract form	2015-08-18 16:24:36 +02:00
piece_list.js	notification app	2015-09-03 14:15:00 +02:00
register_piece.js	fix scroll overflow	2015-08-12 16:26:24 +02:00
signup_container.js	add licences for cc	2015-07-15 11:28:53 +02:00