Tim Daubenschütz c100a3b307 Merge branch 'master' into AD-1340-add-details-video-upload-errors ...

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js

2015-11-16 16:33:39 +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-1340-add-details-video-upload-errors

2015-11-16 16:33:39 +01:00

constants

Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio

2015-11-16 13:50:13 +01:00

fetchers

Remove ReactS3FineUploader's dependency on react-router's location

2015-10-30 17:43:20 +01:00

mixins

remove alert mixin

2015-08-10 14:22:25 +02: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

Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page

2015-10-06 16:50:51 +02:00

utils

Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-

2015-11-16 15:27:00 +01:00

alt.js

Separate dispatcher logic of whitelabel and user stores

2015-10-07 09:31:38 +02:00

app.js

Add last bit of documentation

2015-10-12 09:24:18 +02: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