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 |
|
Tim Daubenschütz
|
713eea03cc
|
Better robustness for slides container and register form for cyland
|
2015-10-14 16:20:51 +02:00 |
|
Alberto Granzotto
|
27010aa2b0
|
Merged in AD-xxx-fix-property-name-propagation (pull request #101)
Property component now propagate its name to its input child
|
2015-10-14 16:14:57 +02:00 |
|
vrde
|
2869cbc125
|
Disable eslint check on specific proptype
|
2015-10-14 15:49:04 +02:00 |
|
vrde
|
01cea9ad3d
|
Property component now propagate its name to its input child
|
2015-10-14 15:30:10 +02:00 |
|
Tim Daubenschütz
|
dab7503601
|
Refactor SlidesContainer to only use queryParams to keep slidepage state
|
2015-10-14 14:22:53 +02:00 |
|
TimDaubenschuetz
|
7af4e0912e
|
Merged in AD-972-remove-50mb-limit-in-additional-f (pull request #98)
Ad 972 remove 50mb limit in additional f
|
2015-10-13 16:42:04 +02:00 |
|
Tim Daubenschütz
|
4627381c16
|
add getLangText
|
2015-10-13 16:41:35 +02:00 |
|
TimDaubenschuetz
|
f92ea2bf95
|
Merged in AD-977-prefixing-of-whitelabel-folders-i (pull request #99)
Ad 977 prefixing of whitelabel folders i
|
2015-10-13 16:39:04 +02:00 |
|
vrde
|
d6b7060f39
|
Unify code to single quotes
|
2015-10-13 15:29:41 +02:00 |
|
vrde
|
d8e2d0e216
|
Remove useless vars and imports
|
2015-10-13 15:21:29 +02:00 |
|
vrde
|
7c231a4c5e
|
Restore baseUrl in router
|
2015-10-13 14:19:08 +02:00 |
|
Tim Daubenschütz
|
2121c6af3d
|
Rename whitelabel component director to ikonotv specific prefix
|
2015-10-13 11:39:33 +02:00 |
|
Tim Daubenschütz
|
e4c7f9e071
|
Rename whitelabel component director to cyland specific prefix
|
2015-10-13 11:23:21 +02:00 |
|
Tim Daubenschütz
|
8ac69bab5d
|
Change additional files label
|
2015-10-13 10:20:23 +02:00 |
|
Tim Daubenschütz
|
002bab8e79
|
Increase additional data file size
|
2015-10-13 10:13:53 +02:00 |
|
vrde
|
dc97517d65
|
Refactor AuthProxyHandler
|
2015-10-12 17:57:23 +02:00 |
|
vrde
|
12d3fb289e
|
Rename RedirectProxyHandler to AuthProxyHandler
|
2015-10-12 17:00:53 +02:00 |
|
vrde
|
04abf31354
|
Remove ProxyRoute
|
2015-10-12 16:51:18 +02:00 |
|
Tim Daubenschütz
|
356e0e368a
|
Fix some spelling errors in documentation
|
2015-10-12 14:29:31 +02:00 |
|
Tim Daubenschütz
|
a7683a44be
|
fix wrong redirect in header_notification
|
2015-10-12 14:24:21 +02:00 |
|
Tim Daubenschütz
|
d760fe13d0
|
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
|
2015-10-12 14:18:53 +02:00 |
|
diminator
|
bb93a052b7
|
Merged in AD-1089-problem-occurred-message-when-tr (pull request #96)
Fix share button on ikonotv
|
2015-10-12 13:44:12 +02:00 |
|
Tim Daubenschütz
|
f38ce126b7
|
Correct handleSuccess of AclButtonList
|
2015-10-12 10:37:08 +02:00 |
|
Tim Daubenschütz
|
6c34cb0377
|
Add last bit of documentation
|
2015-10-12 09:24:18 +02:00 |
|
Tim Daubenschütz
|
d86668e759
|
Document RedirectProxyHandler
|
2015-10-09 15:51:03 +02:00 |
|
Tim Daubenschütz
|
211e253fb8
|
Add documentation for ProxyRoute
|
2015-10-09 15:39:00 +02:00 |
|
Tim Daubenschütz
|
69afc6165a
|
Incorporate new RedirectProxyRoute into whitelabel pages
|
2015-10-09 15:19:24 +02:00 |
|
Tim Daubenschütz
|
cee8d7cae7
|
fix bug in FileDragAndDropDialog
|
2015-10-09 14:22:48 +02:00 |
|
Tim Daubenschütz
|
ddf3eb18fc
|
update package.json
|
2015-10-09 14:08:47 +02:00 |
|
Tim Daubenschütz
|
299007baab
|
Refactor redirect and redirectAuthenticated
|
2015-10-09 13:51:21 +02:00 |
|
Tim Daubenschütz
|
5e2240dbd3
|
remove TransactionManager boilerplate code again
|
2015-10-09 11:20:22 +02:00 |
|
TimDaubenschuetz
|
3d998b354f
|
Merged in AD-1105-separate-third-party-storesactio (pull request #93)
Move third party actions/stores to separate dispatcher
|
2015-10-07 09:45:49 +02:00 |
|
Tim Daubenschütz
|
b4f9c11c16
|
Implement loggedOut routings
|
2015-10-07 09:39:30 +02:00 |
|
Tim Daubenschütz
|
471d95977e
|
Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page
|
2015-10-07 09:31:49 +02:00 |
|
Tim Daubenschütz
|
f5c06e070c
|
Separate dispatcher logic of whitelabel and user stores
|
2015-10-07 09:31:38 +02:00 |
|
Tim Daubenschütz
|
f066971ccc
|
Finalize ProxyRoute and RedirectProxyRoute
|
2015-10-06 18:28:15 +02:00 |
|
Tim Daubenschütz
|
fbc9ae1fe7
|
Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page
Conflicts:
js/third_party/notifications.js
|
2015-10-06 16:50:51 +02:00 |
|
Tim Daubenschütz
|
000719e14d
|
Move third party actions/stores to separate dispatcher
|
2015-10-06 16:47:59 +02:00 |
|
Tim Daubenschütz
|
28dfcfa75a
|
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
js/components/ascribe_detail/edition.js
js/components/ascribe_forms/form_login.js
js/components/ascribe_forms/form_signup.js
|
2015-10-06 16:40:02 +02:00 |
|
Tim Daubenschütz
|
0c6538df2f
|
add redirect to auth_component
|
2015-10-06 15:38:39 +02:00 |
|
Tim Daubenschütz
|
6877f2c8a7
|
Minor renaming of ProxyHandler
|
2015-10-06 15:29:01 +02:00 |
|
Tim Daubenschütz
|
97fd639c30
|
Implement ProxyRoute
|
2015-10-06 10:20:36 +02:00 |
|
diminator
|
43a5d8291f
|
Merged in AD-535-when-non-member-gets-work-transfe (pull request #91)
Ad 535 when non member gets work transfe
|
2015-10-06 09:53:29 +02:00 |
|
Tim Daubenschütz
|
c174b8b56c
|
Tighten lib-dependencies, move history into its own module
|
2015-10-05 11:52:23 +02:00 |
|
Tim Daubenschütz
|
31a83a1d61
|
Add TransactionManager boilerplate code
|
2015-10-02 11:03:42 +02:00 |
|
Tim Daubenschütz
|
49f8178f38
|
Remove IndexRoute from main app
|
2015-10-02 09:48:51 +02:00 |
|
Tim Daubenschütz
|
dc6d9160fe
|
Fix error in AppGateway logic
|
2015-10-01 16:59:44 +02:00 |
|
Tim Daubenschütz
|
b95906d83e
|
Fix whitelabel styling
|
2015-10-01 16:11:29 +02:00 |
|
Tim Daubenschütz
|
9a17e44df1
|
Refactor of wallet app routing
|
2015-10-01 15:57:46 +02:00 |
|