Tim Daubenschütz 8bb971d9df Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page ... Conflicts: js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js js/components/whitelabel/wallet/components/cyland/cyland_landing.js		2015-10-15 11:55:44 +02:00
..
actions	Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page	2015-10-07 09:31:49 +02:00
components	Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page	2015-10-15 11:55:44 +02:00
constants	Increase additional data file size	2015-10-13 10:13:53 +02:00
fetchers	Write generic function for extracting subdomain and implement troughout whole app	2015-09-29 14:58:56 +02: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	Separate dispatcher logic of whitelabel and user stores	2015-10-07 09:31:38 +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	Fix error in AppGateway logic	2015-10-01 16:59:44 +02: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	Unify code to single quotes	2015-10-13 15:29:41 +02:00