IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,569 Commits 1 Branch 0 Tags
Commit Graph

5569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
elweyn
51168b9ab0 Merge changes on the UserResolver with the changes in master. 2021-12-21 12:32:46 +01:00
Hannes Heine
ee6ef4f869
Merge pull request #1185 from gradido/1165-refactor-admin-interface 
Moved reverse of the getPendingCreations to the AdminResolver instead…
 2021-12-21 12:14:25 +01:00
Moriz Wahl
82fd10d489 remove unused if clauses 2021-12-21 11:51:47 +01:00
Hannes Heine
7716863f90
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-21 11:51:34 +01:00
Moriz Wahl
34ce6fb333 better test for server error 2021-12-21 11:33:39 +01:00
Moriz Wahl
1890475d59 test ConfirmRegisterMailFormular API calls 2021-12-21 11:20:40 +01:00
Moriz Wahl
d96e458356 test email checked filter 2021-12-21 11:11:13 +01:00
Moriz Wahl
3c5d7f2ced refactor show details 2021-12-21 10:56:46 +01:00
Hannes Heine
2736414ae4
Merge branch 'master' into wrong_login_is_not_password_reset 2021-12-21 09:16:14 +01:00
Hannes Heine
2574b2c661
Merge branch 'master' into adminCreateMultiplePendingCreations 2021-12-21 09:15:34 +01:00
Ulf Gebhardt
6ae330da51
update required database version 2021-12-21 07:08:17 +01:00
Ulf Gebhardt
1f8d7b8230
fixed two old User Entity definitions. This is legit since this never changed and just was a missing definition. (Normally it would be forbidden to change old entity models or migrations) 2021-12-21 02:58:11 +01:00
Ulf Gebhardt
cdd7d25024
description migration: 0002-add_settings 2021-12-21 02:46:23 +01:00
Ulf Gebhardt
e6ae25cd90
description migration: 0003-login_server_tables 2021-12-21 02:45:09 +01:00
Ulf Gebhardt
f7459b73ed
description migration: 0004-login_server_data 2021-12-21 02:42:32 +01:00
Ulf Gebhardt
c42e6f5e96
typo 2021-12-21 02:42:15 +01:00
Ulf Gebhardt
e90744e1f9
description migration: 0005-admin_tables 2021-12-21 02:37:05 +01:00
Ulf Gebhardt
a467c8d945
updated model accordingly 2021-12-21 02:34:52 +01:00
Ulf Gebhardt
0b0af7ae76
added migration 0006-login_users_collation 2021-12-21 02:33:54 +01:00
Hannes Heine
e7b2184a95
Merge pull request #1206 from gradido/1205-create-user-withdrew-password 
Withdrew password argument of createUser.
 2021-12-20 20:15:31 +01:00
elweyn
1688ded788 Withdrew password argument of createUser. 2021-12-20 15:26:51 +01:00
elweyn
75cbea2321 Change the transactionList query so we can get only creation and get the list for specific users. 2021-12-20 15:15:51 +01:00
Moriz Wahl
53b4e32e53 Merge branch 'catch-no-cookies' of github.com:gradido/gradido into catch-no-cookies 2021-12-20 15:06:19 +01:00
Moriz Wahl
e61d5a0bdb Log error message to console, test is not working 2021-12-20 15:05:49 +01:00
Moriz Wahl
905e280463 Merge branch 'master' into catch-no-cookies 2021-12-20 14:27:33 +01:00
Hannes Heine
3860822058
Merge branch 'master' into adminCreateMultiplePendingCreations 2021-12-20 13:40:59 +01:00
Ulf Gebhardt
e669a9eedf
Merge branch 'master' into wrong_login_is_not_password_reset 2021-12-20 13:15:39 +01:00
Ulf Gebhardt
7d31e5b154
Merge pull request #1195 from gradido/fix_optin_code_regeneration 
fix_optin_code_regeneration
 2021-12-20 13:11:35 +01:00
Ulf Gebhardt
ce973d1e78
Merge branch 'master' into fix_optin_code_regeneration 2021-12-20 12:36:48 +01:00
Hannes Heine
0a4af110d3
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-20 11:24:07 +01:00
elweyn
9bc13c39a6 Merge branch '1200-editing-a-creation-is-not-displayed-in-formular' into 1197-admin-interface-created-transactions-list 2021-12-20 10:47:11 +01:00
ogerly
021e5d3151 removed unused import. 2021-12-20 10:35:02 +01:00
ogerly
198657b795 Fix lint. 2021-12-20 10:32:51 +01:00
ogerly
bc00ddfdc7 UserSearch implement the filter on every user that has not activate his account yet. 2021-12-20 10:32:17 +01:00
ogerly
8e974bbc22 Check for emailChecked in the user search and giving the value to the UserTable 2021-12-20 10:01:53 +01:00
ogerly
39a4705ef4 remove unused lines 2021-12-20 09:40:17 +01:00
ogerly
16f373c120 add details_edit_true on editCreationUserTable 2021-12-20 09:38:55 +01:00
ogerly
0e896ef7d2 SendActivationEmail mutation added to the admin and linked to the resendEmailFunction. 2021-12-20 09:31:40 +01:00
elweyn
d3105bbbad Merge branch '1197-admin-interface-created-transactions-list' into 1196-send-registration-link 2021-12-20 09:15:29 +01:00
Hannes Heine
04bea42261
Merge branch 'master' into adminCreateMultiplePendingCreations 2021-12-20 09:11:47 +01:00
ogerly
9f6106d4ae remove unused imported files 2021-12-20 08:37:33 +01:00
ogerly
5f2537b08d add CreationsTransaction List Icon und Component and function, example list data 2021-12-19 20:51:21 +01:00
ogerly
659d966a68 add function sendRegisterMail in ConfirmRegisterMailFormular.vue button 2021-12-19 19:12:26 +01:00
ogerly
af39826ce5 remove unused function in ConfirmRegisterMailFormular.vue button 2021-12-19 19:04:35 +01:00
ogerly
578f4835b1 add test ConfirmRegisterMailFormular.spec.js 2021-12-19 18:50:31 +01:00
ogerly
ea4b74e051 function unconfirmedRegisterMail added 2021-12-19 14:24:29 +01:00
ogerly
d8440a5956 yarn lint --fix 2021-12-19 13:52:05 +01:00
ogerly
531bba0391 change text 2021-12-19 13:51:46 +01:00
ogerly
1ceff2311f yarn lint --fix 2021-12-19 13:48:34 +01:00
ogerly
9bc71d1af0 register mail send style and function added 2021-12-19 13:47:30 +01:00