4769 Commits

Author SHA1 Message Date
elweyn
b54b96feca Merge branch 'master' into login_call_resetPassword 2021-12-07 12:29:17 +01:00
elweyn
202ab2863c Fixing ResetPassword. 2021-12-07 12:28:12 +01:00
Moriz Wahl
66c8a68e59
Merge pull request #1146 from gradido/seed-transactions
feat: Seed Transaction Creations
2021-12-07 12:10:32 +01:00
einhornimmond
28e4fa1bda fix message 2021-12-07 11:41:01 +01:00
elweyn
cee7c66a45 ForgotPassword logic change implemented in tests. 2021-12-07 10:59:00 +01:00
Moriz Wahl
911e0cdf2a Merge branch 'master' into seed-transactions 2021-12-07 10:54:06 +01:00
elweyn
4b49d85d1a Router got a new route test had to be fixed. 2021-12-07 10:44:24 +01:00
elweyn
ca6f8076d6 Logic change on error message included in test. 2021-12-07 10:41:43 +01:00
elweyn
c7fbb9b0bf Changed the Login error handling so that we get the no-account message in case of a specific error, else we send the user to /reset/login 2021-12-07 10:19:29 +01:00
Hannes Heine
963d7de628
Merge branch 'master' into login_call_resetPassword 2021-12-07 10:15:21 +01:00
elweyn
03faac6ecb Case where a user has not activated his email he gets redirected to /thx/login with a message to check his eamils. 2021-12-07 10:14:52 +01:00
elweyn
00f08ff2db Added a comingFrom parameter to ForgotPassword so we can have different texte in case of optin code expired. 2021-12-07 09:48:22 +01:00
Alexander Friedland
8bc1d6188a
Merge branch 'master' into 1009-Tab-not-properly-working-on-Password-Component 2021-12-07 08:41:00 +01:00
ogerly
67787fb926 register add tabindex-1 on password show 2021-12-07 08:25:08 +01:00
Hannes Heine
098cb64379
Merge pull request #1153 from gradido/adminConfirmPendingCreation
Admin confirm pending creation
2021-12-07 07:59:30 +01:00
Alexander Friedland
9714b0de5d
Merge branch 'master' into 1029-Change-text-for-expired-session 2021-12-07 07:29:42 +01:00
elweyn
8a2df2f899 Fixe tests of EditCreationFormular. 2021-12-07 07:28:20 +01:00
6cbedc55f2
reduced coverage to 84% on frontend 2021-12-07 00:37:53 +01:00
452beec07c
Merge branch 'master' into login_call_resetPassword 2021-12-07 00:26:23 +01:00
einhornimmond
a5ed8580fe allow only 2 month in the past for creation transactions 2021-12-06 17:16:22 +01:00
Moriz Wahl
a76287c0b0 add toasted error mock 2021-12-06 16:10:07 +01:00
Moriz Wahl
32def1575e Merge branch 'master' into adminConfirmPendingCreation 2021-12-06 16:07:13 +01:00
Moriz Wahl
d96f0849f8
Merge pull request #1141 from gradido/adminDeletePendingCreationQuery
Admin delete pending creation query
2021-12-06 16:03:01 +01:00
Moriz Wahl
35ae189cce Merge branch 'master' into adminDeletePendingCreationQuery 2021-12-06 15:47:53 +01:00
Moriz Wahl
d5867a4a8c
Merge pull request #1151 from gradido/catch-verify-login
fix: Catch Expired Session when Coming from Admin Interface
2021-12-06 15:47:09 +01:00
Moriz Wahl
8660ed7350 Merge branch 'master' into catch-verify-login 2021-12-06 15:37:02 +01:00
Moriz Wahl
009fc78c29 coverage tests admin interface to 55% 2021-12-06 15:27:10 +01:00
Moriz Wahl
3de0e67ea2 fix and finish test for creation confirm delete 2021-12-06 15:26:12 +01:00
elweyn
e84f30c1fc Merge changes to deletePendingCreation branch. 2021-12-06 14:11:13 +01:00
elweyn
48b7c9a0af Delete button sends call to Adminresolver deletePendingCreation. 2021-12-06 13:45:50 +01:00
bbd54ef607
Merge branch 'master' into login_call_resetPassword 2021-12-06 13:42:48 +01:00
dd4fadbf1c
Merge pull request #1138 from gradido/docu_release
docu_release
2021-12-06 13:18:05 +01:00
02c50ae0f3
Merge branch 'master' into docu_release 2021-12-06 13:05:56 +01:00
Moriz Wahl
b47bf3d41d
Update admin/src/components/CreationFormular.vue 2021-12-06 13:01:36 +01:00
Moriz Wahl
eb5b892938 Merge branch 'adminDeletePendingCreationQuery' of github.com:gradido/gradido into adminDeletePendingCreationQuery 2021-12-06 12:52:10 +01:00
Moriz Wahl
72a45285e6 setup test ApolloLink 2021-12-06 12:51:38 +01:00
elweyn
feefbb3262 Merge master into the admin branches. 2021-12-06 12:39:45 +01:00
elweyn
665e855c23 Merge branch 'adminEditPendingCreationQueries' into adminDeletePendingCreationQuery 2021-12-06 12:37:03 +01:00
elweyn
1ab4fa6583 Merge branch 'adminPendingCreationQueries' into adminEditPendingCreationQueries 2021-12-06 12:36:43 +01:00
Moriz Wahl
32c2c21086 Merge branch 'master' into adminDeletePendingCreationQuery 2021-12-06 11:30:35 +01:00
Moriz Wahl
b1dd60eb32
Merge pull request #1150 from gradido/verify-login-admin
feat: Verify Login in Admin Interface
2021-12-06 11:29:32 +01:00
Moriz Wahl
9c7497d7c3 import moderator 2021-12-06 11:19:41 +01:00
Moriz Wahl
a8c293d1a8 test Overview 2021-12-06 10:59:50 +01:00
Moriz Wahl
19e2436452 remove verify login call 2021-12-06 10:59:38 +01:00
Hannes Heine
bc0d8d1f32
Merge branch 'master' into verify-login-admin 2021-12-06 10:36:02 +01:00
Alexander Friedland
cb0c9c115b
Merge branch 'master' into adminDeletePendingCreationQuery 2021-12-06 10:01:30 +01:00
Alexander Friedland
0a4d87d257
Merge branch 'master' into adminEditPendingCreationQueries 2021-12-06 10:01:11 +01:00
Alexander Friedland
6740136e87
Merge branch 'master' into 1029-Change-text-for-expired-session 2021-12-06 10:00:33 +01:00
Alexander Friedland
7d75c0560e
Merge branch 'master' into adminConfirmPendingCreation 2021-12-06 09:58:54 +01:00
Alexander Friedland
964c8d632c
Merge pull request #1140 from gradido/adminPendingCreationQueries
Admin pending creation queries
2021-12-06 09:57:35 +01:00