271 Commits

Author SHA1 Message Date
Wolfgang Huß
50f5667288 Merge branch 'master' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
2022-06-20 13:56:25 +02:00
Moriz Wahl
8ce97391e1
Update frontend/src/pages/TransactionLink.spec.js 2022-06-17 14:11:52 +02:00
Moriz Wahl
4475da0fbe fix tests 2022-06-17 13:58:46 +02:00
ogerly
1d66b9511c remove alert 2022-06-16 23:55:57 +02:00
ogerly
6210ff8597 fix test for LanguageSwitch2 2022-06-16 23:31:07 +02:00
ogerly
b1b74f5c1b fix test 2022-06-16 16:45:23 +02:00
ogerly
3ed8d71aef check contribution link valid 2022-06-16 16:03:01 +02:00
Moriz Wahl
845e3d3e61 get QueryLinkResult working 2022-06-16 15:11:13 +02:00
ogerly
ef881d94cd load contribution link and transaction link 2022-06-16 14:34:30 +02:00
ogerly
1ba7e86173 changed redeem for contribution link and transaction link 2022-06-16 10:21:59 +02:00
Wolfgang Huß
37149b40fa Remove method 'commitStorePublisherId' from Register.Vue 2022-06-02 16:15:11 +02:00
Wolfgang Huß
ffd11cb755 Remove error 'User already exists.' from Register.Vue 2022-06-02 16:12:52 +02:00
ogerly
de7a41516a refactor register button position 2022-06-02 08:04:21 +02:00
Alexander Friedland
117a13c3d8
Merge branch 'master' into 1956-redemption-link-is-not-displayed-in-the-mobile-version 2022-06-01 10:40:56 +02:00
ogerly
8c81d2fe49 add button variant from primary to gradido 2022-06-01 09:46:26 +02:00
ogerly
4fd13f8e32 fixed test, fixed lint 2022-06-01 08:17:20 +02:00
ogerly
922e44adcd remove gray box and back link 2022-06-01 08:15:13 +02:00
ogerly
d1d2ce9565 fixed redeem link is mobile start false 2022-06-01 07:49:57 +02:00
ogerly
0fea0a092b remove save login checkbox from login page 2022-05-31 15:38:53 +02:00
Wolfgang Huß
5ea093a613 Remove comment 2022-05-30 15:25:22 +02:00
Wolfgang Huß
58e61fa140 Cleanup 2022-05-30 15:10:57 +02:00
Wolfgang Huß
ac7fe1172f Change locale identifiers from 'site.thx.*' to 'message.*' 2022-05-30 15:04:52 +02:00
Wolfgang Huß
4091413847 Remove thx page 2022-05-30 13:50:31 +02:00
Wolfgang Huß
eb34a9f6df Refactor test for ResetPassword.vue, fix 'only' 2022-05-30 13:25:22 +02:00
Wolfgang Huß
44d695d0a5 Refactor test for ResetPassword.vue 2022-05-30 12:44:45 +02:00
Wolfgang Huß
2b715fe338 Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page-#2 2022-05-30 12:06:35 +02:00
Alexander Friedland
a863ba8fca
Merge branch 'master' into 1883-remove-the-animated-coins-in-the-profile-settings 2022-05-30 08:23:19 +02:00
Alexander Friedland
03fcb6f450
Merge branch 'master' into 1929-styling-new-template-for-password-component 2022-05-30 07:39:44 +02:00
Alexander Friedland
95a65b0b21
Merge branch 'master' into 1883-remove-the-animated-coins-in-the-profile-settings 2022-05-30 07:37:16 +02:00
ogerly
32f8e43c90 remove files and code from coinanimation settings 2022-05-29 12:08:28 +02:00
Wolfgang Huß
cd398cce9f Refactor ResetPassword page to message component instead of thx page 2022-05-25 15:43:30 +02:00
Wolfgang Huß
8052fea91a Remove code from Message component, because it's not needed anymore as on thx page 2022-05-25 13:41:15 +02:00
ogerly
a49949d6ff change buton variant from primary to gradido 2022-05-25 13:01:43 +02:00
Wolfgang Huß
7f0d322064 Merge branch '1929-styling-new-template-for-password-component' of github.com:gradido/gradido into 1697-refactor-thx-page-#2
# Conflicts:
#	frontend/src/pages/ResetPassword.vue
2022-05-25 12:58:24 +02:00
Wolfgang Huß
88b4cb3fd0 Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page-#2
# Conflicts:
#	frontend/src/pages/ForgotPassword.spec.js
#	frontend/src/pages/ResetPassword.vue
2022-05-25 12:51:28 +02:00
ogerly
79d0eb5d03 chenage event name from is-mobile-start to set-mobile-start 2022-05-25 10:33:45 +02:00
ogerly
cf9f7a4294 remove old textFields for login, because is unused 2022-05-25 10:33:45 +02:00
ogerly
0c928ceeb0 fixed tests 2022-05-25 08:59:25 +02:00
ogerly
2cf4cc4a18 refactor set and reset passwort component for new style 2022-05-25 08:51:03 +02:00
ogerly
ff867523ab fixed test for Register.spec.js 2022-05-24 13:22:32 +02:00
ogerly
57c4c6ad06 Merge branch '1926-button-concept' into 1916-remove-select-language-from-register-form 2022-05-24 12:00:37 +02:00
ogerly
c7b727e984 add button disable 2022-05-24 11:47:48 +02:00
ogerly
bfb64d0618 remove language input from register 2022-05-24 10:44:32 +02:00
ogerly
8e08886642 change review from hardi, remove welcome community name, refactor code 2022-05-23 10:59:12 +02:00
Wolfgang Huß
13c44bec01 Add some additional comments as reminders 2022-05-19 12:22:33 +02:00
Wolfgang Huß
e1cd2e9758 Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page-#2 2022-05-19 12:13:36 +02:00
ogerly
84cec0f405 change new image size for carusel, remove unused alerts code for register 2022-05-19 11:08:34 +02:00
ogerly
bc9e21ba14 remove scss from review from harti 2022-05-18 13:29:26 +02:00
ogerly
274365fb88 rename files DashboardLayout, AuthLayout 2022-05-18 13:14:36 +02:00
ogerly
8ec0d68dcd layout scss refactor 2022-05-18 08:15:05 +02:00