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
..
actions	Merge branch 'AD-435-hash-locally-for-when-a-artist-do'	2015-07-29 09:35:14 +02:00
components	Merge branch 'AD-435-hash-locally-for-when-a-artist-do'	2015-07-29 09:35:14 +02:00
constants	Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do	2015-07-28 12:13:40 +02:00
fetchers	replace console logs with global logging	2015-07-17 15:52:53 +02:00
mixins	replace es6-promise with Q	2015-07-24 13:44:28 +02:00
models	delete function for multi editions	2015-06-10 15:49:46 +02:00
stores	Flush store after unmounting coa component to force refresh on new user request	2015-07-22 15:16:56 +02:00
third_party	Fix code after review	2015-07-27 18:21:20 +02:00
utils	Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do	2015-07-28 12:13:40 +02:00
alt.js	add es6lint to build process and fix most (not really) errors and warnings	2015-06-05 11:06:36 +02:00
app.js	Fix code after review	2015-07-27 18:21:20 +02:00
routes.js	Logout is now a route	2015-07-17 15:02:44 +02:00