Tim Daubenschütz
|
f0d8e32ecf
|
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_piece.js
js/components/ascribe_app.js
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
js/components/logout_container.js
js/components/whitelabel/wallet/wallet_app.js
|
2015-10-19 10:30:14 +02:00 |
|
diminator
|
8d970a65c4
|
spinners in forms
button wide
|
2015-10-12 17:55:02 +02:00 |
|
diminator
|
aaa1a9a000
|
replaced fonts
replaced spinners WIP
renamed settings-property to property
|
2015-10-12 15:25:21 +02:00 |
|
Tim Daubenschütz
|
299007baab
|
Refactor redirect and redirectAuthenticated
|
2015-10-09 13:51:21 +02:00 |
|
Tim Daubenschütz
|
f066971ccc
|
Finalize ProxyRoute and RedirectProxyRoute
|
2015-10-06 18:28:15 +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 |
|
diminator
|
5f201ad76a
|
fix redirect
|
2015-10-01 15:38:37 +02:00 |
|
Tim Daubenschütz
|
83c652a4f0
|
Rename pieces routes back to collection
|
2015-10-01 14:30:11 +02:00 |
|
Tim Daubenschütz
|
829f2c592b
|
Switch all usages of Router.Navigation and Router.State
|
2015-10-01 11:16:38 +02:00 |
|
diminator
|
dfa01a0dde
|
signup fix
consign redirect
|
2015-10-01 09:45:12 +02:00 |
|
diminator
|
bbae33a40f
|
avoid dispatcherror when switching to signup
|
2015-09-30 17:07:18 +02:00 |
|
diminator
|
0d6e82a45d
|
WIP signup/login redirect and redirectAuthenticated
|
2015-09-30 17:05:40 +02:00 |
|
Tim Daubenschütz
|
4302da2f81
|
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-23 14:22:09 +02:00 |
|
Tim Daubenschütz
|
31ffc4262a
|
change text in signup form
|
2015-09-22 11:41:10 +02:00 |
|
diminator
|
ff163df61e
|
PR update
|
2015-09-17 14:20:46 +02:00 |
|
diminator
|
5c2ec3ffb0
|
bug fix signup query
landing page redirect
ikono: user acl proxy on submit button
ikono: further details + slides
|
2015-09-16 23:27:38 +02:00 |
|
diminator
|
a85447e94c
|
bug fix user token on signup/login
|
2015-09-16 19:00:59 +02:00 |
|
Tim Daubenschütz
|
3ff401904b
|
fix submit to prize button
|
2015-08-10 10:10:43 +02:00 |
|
Tim Daubenschütz
|
3afb036f24
|
rename apiUrls to ApiUrls
|
2015-08-07 15:08:02 +02:00 |
|
Tim Daubenschütz
|
8f9c699b69
|
Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r
Conflicts:
js/components/ascribe_buttons/submit_to_prize_button.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
|
2015-08-07 14:10:05 +02:00 |
|
diminator
|
99ea0e1af8
|
action-panel WIP
|
2015-08-06 13:56:37 +02:00 |
|
Tim Daubenschütz
|
68f4decaad
|
remove FormPropertyHeader
|
2015-08-06 10:23:01 +02:00 |
|
diminator
|
18c7e2bc93
|
invite user with token and signup without email validation
|
2015-08-05 19:22:58 +02:00 |
|
Tim Daubenschütz
|
bd28450619
|
add documentation for input checkbox
|
2015-07-28 15:46:55 +02:00 |
|
Tim Daubenschütz
|
bb11bbc6e4
|
Fix all instances of input checkbox
|
2015-07-28 15:33:47 +02:00 |
|
diminator
|
232991b566
|
removed signup terms default false
|
2015-07-28 12:13:19 +02:00 |
|
Tim Daubenschütz
|
09ce4de29d
|
refactor input checkbox
|
2015-07-28 12:03:45 +02:00 |
|
vrde
|
d4bb23467e
|
Fix link to terms
|
2015-07-15 16:57:41 +02:00 |
|
Tim Daubenschütz
|
e3e8f088c7
|
add licences for cc
|
2015-07-15 11:28:53 +02:00 |
|
vrde
|
45a49cafe9
|
Fix bug with getLangText
|
2015-07-15 00:37:45 +02:00 |
|
Tim Daubenschütz
|
aa5934cd25
|
made inputcheckbox component generic
|
2015-07-14 19:53:49 +02:00 |
|
vrde
|
7aea6669c9
|
Refactor login and signup
|
2015-07-13 20:47:43 +02:00 |
|
vrde
|
3f0cdbad06
|
Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice
|
2015-07-13 20:02:42 +02:00 |
|
vrde
|
4af174dffb
|
Work on signup/login
|
2015-07-13 19:53:16 +02:00 |
|
diminator
|
1f73811950
|
register form separate
spinner => spans
|
2015-07-13 18:13:47 +02:00 |
|
vrde
|
db1c6a530a
|
Refactor login/signup containers
|
2015-07-13 16:57:25 +02:00 |
|
Sylvain Bellemare
|
f066008ce9
|
translated english text to french
|
2015-07-08 09:57:50 +02:00 |
|
ddejongh
|
56d32efcc0
|
password reset
modal switch problems
|
2015-06-15 15:28:53 +02:00 |
|
ddejongh
|
0f1108b14e
|
form password + signup
|
2015-06-11 17:22:11 +02:00 |
|