Tim Daubenschütz 339421a4b7 Merge branch 'master' into AD-56-add-social-share-functionality ... Conflicts: js/components/ascribe_detail/media_container.js js/components/ascribe_media/media_player.js		2015-11-16 15:54:49 +01:00
..
actions	Merged in AD-727-missing-redirects-to-login-page (pull request #95)	2015-10-19 10:13:54 +02:00
components	Merge branch 'master' into AD-56-add-social-share-functionality	2015-11-16 15:54:49 +01:00
constants	Merge branch 'master' into AD-56-add-social-share-functionality	2015-11-16 15:54:49 +01:00
fetchers	Remove ReactS3FineUploader's dependency on react-router's location	2015-10-30 17:43:20 +01:00
models	delete function for multi editions	2015-06-10 15:49:46 +02:00
stores	Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity	2015-10-14 17:25:53 +02:00
third_party	Add Facebook Share button	2015-11-09 17:46:49 +01:00
utils	Merge branch 'master' into AD-56-add-social-share-functionality	2015-11-16 15:54:49 +01:00
alt.js	Separate dispatcher logic of whitelabel and user stores	2015-10-07 09:31:38 +02:00
app.js	Add Facebook Share button	2015-11-09 17:46:49 +01:00
history.js	Restore baseUrl in router	2015-10-13 14:19:08 +02:00
routes.js	Redirect directly to /login on loggout	2015-10-16 13:01:54 +02:00