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
4,229 Commits 1 Branch 0 Tags
Commit Graph

4229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
elweyn
d79a40cbb0 Export of the new entity. 2021-11-24 09:21:38 +01:00
elweyn
b3d69bae0d Moved new entity to folder 0005 since it needs to correspond to migrations scripts. 2021-11-24 09:21:06 +01:00
elweyn
89529149ae Create new table for admin interface so that we can store the pending creations. 2021-11-24 09:17:15 +01:00
ogerly
8f99a971ae add usersearch in usertable und masscreation 2021-11-24 09:02:00 +01:00
Ulf Gebhardt
dc1715eea0
Merge branch 'master' into ADMINBEREICH-first-step 2021-11-24 08:50:54 +01:00
Hannes Heine
cd7c70ee9b
Merge pull request #1131 from gradido/bugfix_register_with_not_activ_account 
Since we don't make a request to the login_server we need to catch if…
 2021-11-24 05:56:13 +01:00
ogerly
9873ac6eee add user search in creation.vue 2021-11-23 16:14:24 +01:00
Hannes Heine
d72eea7a87
Merge branch 'master' into bugfix_register_with_not_activ_account 2021-11-23 13:47:00 +01:00
ogerly
d6e8d0cc6b unused import KlickTip and Int in type-graphql remove 2021-11-23 13:27:39 +01:00
ogerly
35f297ece8 Vue uses VueApollo to main. 2021-11-23 13:24:09 +01:00
ogerly
52aa7e437e Added creation to useradmin model, adding call to apollo in backend. 2021-11-23 13:12:11 +01:00
Moriz Wahl
091c5aafc2
Merge pull request #1127 from gradido/add-model-entities 
feat: Add Server Users Entity
 2021-11-23 13:08:53 +01:00
ogerly
435489223f First steps apollo getUsers query. 2021-11-23 12:25:54 +01:00
ogerly
05c9449e0e yarn lint fix 2021-11-23 12:16:46 +01:00
ogerly
dc1cf1fbcb Implemented the graphql AdminResolver method getUsers. 2021-11-23 12:15:24 +01:00
ogerly
c9d6b88dd0 Created a UserAdmin model that represents the Users for the Admin area. 2021-11-23 12:14:20 +01:00
ogerly
2e7c35aab6 Implemented a search LoginUser like on firstName, lastName and email. 2021-11-23 12:13:29 +01:00
Moriz Wahl
5e3e139a23 Merge branch 'master' into add-model-entities 2021-11-23 11:50:08 +01:00
ogerly
1697c69e8c WiP getUsers for Admin. 2021-11-23 11:20:50 +01:00
ogerly
2443973891 app.vue reinstate 2021-11-23 10:33:57 +01:00
Alexander Friedland
d2bfb213a2
Merge branch 'master' into ADMINBEREICH-first-step 2021-11-23 10:24:04 +01:00
ogerly
fd068bcd0f update creation data 2021-11-23 10:10:06 +01:00
elweyn
8479975425 Since we don't make a request to the login_server we need to catch if user email has been activated. 2021-11-23 08:05:52 +01:00
Hannes Heine
6fcce8bf57
Merge pull request #1113 from gradido/1002-language-selection-register-store 
Stale: 1002-language-selection-register
 2021-11-23 00:38:07 +01:00
Hannes Heine
3c69ab15c7
Merge branch 'master' into 1002-language-selection-register-store 2021-11-23 00:10:02 +01:00
Hannes Heine
13022a9097
Merge pull request #1120 from gradido/bugfix_coinanimation_update_only_send_for_true 
Error for removing coin animation
 2021-11-23 00:09:45 +01:00
Hannes Heine
ab0d29bc31
Update frontend/src/views/Pages/Register.vue 2021-11-22 23:50:44 +01:00
Hannes Heine
ed3d9ca422
Merge branch 'master' into 1002-language-selection-register-store 2021-11-22 23:49:52 +01:00
Ulf Gebhardt
635c7b6e51
Merge branch 'master' into bugfix_coinanimation_update_only_send_for_true 2021-11-22 23:48:53 +01:00
Hannes Heine
9297dc9f5a
Merge pull request #1099 from gradido/bugfix_registration 
Adding a check that the user is activated before letting them login.
 2021-11-22 23:47:21 +01:00
Hannes Heine
ed01bca12b
Update backend/src/graphql/resolver/UserResolver.ts 2021-11-22 23:35:02 +01:00
Hannes Heine
49db3d37fc
Update backend/src/typeorm/repository/UserSettingRepository.ts 2021-11-22 23:33:04 +01:00
Ulf Gebhardt
73c9f7c2ab
Merge branch 'master' into bugfix_registration 2021-11-22 23:27:58 +01:00
Hannes Heine
e922a4895c
Merge pull request #1128 from gradido/bugfix_transactions_alterAutoIncrAfterRollback 
Changed the Auto increment so that it is done after the rollback and …
 2021-11-22 23:27:46 +01:00
Hannes Heine
6bf0c032e9
Update frontend/src/views/Pages/thx.vue 2021-11-22 23:27:17 +01:00
Hannes Heine
57e01cba27
Update frontend/src/locales/en.json 2021-11-22 23:27:09 +01:00
Hannes Heine
38ee1d46b8
Update frontend/src/locales/de.json 2021-11-22 23:27:02 +01:00
elweyn
fccc7b4434 Changed the Auto increment so that it is done after the rollback and not in the finally block. 2021-11-22 23:17:11 +01:00
Hannes Heine
c863501029
Merge pull request #1095 from gradido/login_call_unsecureLogin 
Login call unsecure login
 2021-11-22 22:40:28 +01:00
Ulf Gebhardt
6dab777005
use correct pubKey, use hex instead of buffer 2021-11-22 22:00:57 +01:00
Hannes Heine
1d9042ca4b
Update backend/src/graphql/resolver/UserResolver.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-11-22 21:42:09 +01:00
Moriz Wahl
885a01a1c2 fix data type of activated field 2021-11-22 19:09:38 +01:00
Moriz Wahl
f2523abecc add server users entity 2021-11-22 19:05:09 +01:00
Ulf Gebhardt
82ea3dc11a
Merge branch 'master' into login_call_unsecureLogin 2021-11-22 16:26:08 +01:00
Moriz Wahl
4fc0af06c0
Merge pull request #1045 from gradido/setup-admin-interface 
feat: Setup Admin Interface
 2021-11-22 16:25:51 +01:00
Ulf Gebhardt
0fd2110fa1
removed duplicate import 2021-11-22 16:06:48 +01:00
Ulf Gebhardt
8eb5c74ba8
encode buffer to hex when decoding the jwt, not everytime we use it 2021-11-22 15:55:57 +01:00
Ulf Gebhardt
0341ae0d13
Merge branch 'master' into login_call_unsecureLogin 2021-11-22 15:54:37 +01:00
ogerly
5089152be7 adminbereich, übersicht, usersuche, schöpfen, schöpfung bestätigen 2021-11-22 14:56:30 +01:00
Moriz Wahl
9c02869ea0 fix test CreationFormular 2021-11-19 15:51:29 +01:00