Tim Daubenschütz 76cf9fd74d Merge branch 'AD-435-hash-locally-for-when-a-artist-do' ...

Conflicts:
	js/components/ascribe_forms/form_register_piece.js
	js/components/ascribe_slides_container/slides_container.js
	js/components/ascribe_uploader/file_drag_and_drop.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js

2015-07-29 09:35:14 +02:00

..

ascribe_accordion_list

updated thumbnails:

2015-07-21 15:52:58 +02:00

ascribe_buttons

add logging and responsive user navigation

2015-07-16 19:12:18 +02:00

ascribe_collapsible

…

ascribe_detail

fix app crashing bug when transferring an edition

2015-07-27 14:59:49 +02:00

ascribe_forms

Merge branch 'AD-435-hash-locally-for-when-a-artist-do'

2015-07-29 09:35:14 +02:00

ascribe_media

replace es6-promise with Q

2015-07-24 13:44:28 +02:00

ascribe_modal

…

ascribe_pagination

…

ascribe_piece_list_bulk_modal

…

ascribe_piece_list_toolbar

…

ascribe_slides_container

Merge branch 'AD-435-hash-locally-for-when-a-artist-do'

2015-07-29 09:35:14 +02:00

ascribe_table

…

ascribe_uploader

Merge branch 'AD-435-hash-locally-for-when-a-artist-do'

2015-07-29 09:35:14 +02:00

whitelabel/prize

Logout is now a route

2015-07-17 15:02:44 +02:00

acl_proxy.js

…

ascribe_app.js

…

coa_verify_container.js

…

footer.js

Fix trailing slash on footer

2015-07-21 17:57:11 +02:00

global_notification.js

better error messages for API failures

2015-07-17 16:12:24 +02:00

header_notification_debug.js

…

header.js

Add third party modules to handle tracking without polluting the code

2015-07-27 18:06:02 +02:00

login_container.js

slide container works now with browser history

2015-07-21 15:05:42 +02:00

login_modal_handler.js

…

logout_container.js

patch logout behavior

2015-07-17 18:53:04 +02:00

password_reset_container.js

width styling of forms

2015-07-15 13:20:34 +02:00

piece_list.js

…

register_piece.js

small fix and more comments

2015-07-21 15:30:00 +02:00

routes.js

…

settings_container.js

refactor input checkbox

2015-07-28 12:03:45 +02:00

signup_container.js

…