ddejongh 41d70a9a15 Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar ...

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/settings_container.js
	sass/ascribe_settings.scss

2015-06-23 16:07:17 +02:00

..

actions

api settings complete

2015-06-22 17:33:25 +02:00

components

Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar

2015-06-23 16:07:17 +02:00

constants

fineuploader + register

2015-06-23 13:55:05 +02:00

fetchers

api settings complete

2015-06-22 17:33:25 +02:00

mixins

Rename fetch to requests to avoid name clashing

2015-06-16 13:48:48 +02:00

models

delete function for multi editions

2015-06-10 15:49:46 +02:00

stores

api settings complete

2015-06-22 17:33:25 +02:00

utils

signup/login

2015-06-20 16:43:18 +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

Rename fetch to requests to avoid name clashing

2015-06-16 13:48:48 +02:00

routes.js

Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar

2015-06-23 16:07:17 +02:00