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

4395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
75ec2a6e8c Add PublisherID locales in DOM and english 2021-11-30 13:54:33 +01:00
ogerly
57e8be75a6 Add PublisherID locales in DOM and german 2021-11-30 13:52:57 +01:00
ogerly
5206e27a7a Add PublisherID input box per collaps 2021-11-30 13:44:42 +01:00
Moriz Wahl
cf3260b21e
Merge pull request #1121 from gradido/setup-seeding 
feat: Setup Data Seeding
 2021-11-30 09:29:15 +01:00
Moriz Wahl
6eedde23af recover reset to get CI running again 2021-11-30 09:18:57 +01:00
Moriz Wahl
50e98bdc46 disbale create admin user 2021-11-30 08:51:40 +01:00
Moriz Wahl
0d2cf7da48 Merge branch 'master' into setup-seeding 2021-11-30 08:46:24 +01:00
Ulf Gebhardt
a8a1f9cff4
Merge pull request #1139 from gradido/fix_admin_token_renewal 
fix_admin_token_renewal
 2021-11-29 16:38:50 +01:00
Ulf Gebhardt
fa14d165e9
reduced coverage - this functionality is too existential not to merge and too complex to test at the given moment 2021-11-29 16:28:41 +01:00
Ulf Gebhardt
1b8e132190
redirect to logout, since we have that page actually 2021-11-29 14:40:56 +01:00
Moriz Wahl
1a22520429 Merge branch 'setup-seeding' of github.com:gradido/gradido into setup-seeding 2021-11-26 20:11:29 +01:00
Moriz Wahl
556debe984 change yarn reset to yarn dev_reset in database up 2021-11-26 20:08:44 +01:00
Moriz Wahl
ff704bd9f4
Update database/src/factories/login-user-backup.factory.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-11-26 19:31:16 +01:00
Moriz Wahl
0f22a2fe1c remove run reset on production 2021-11-26 19:29:17 +01:00
Moriz Wahl
0909a3a99a add README 2021-11-26 13:15:58 +01:00
Moriz Wahl
ac0c0c8449 seed Bob der Baumeister 2021-11-26 13:09:00 +01:00
Moriz Wahl
a6f36cd305 seed Räuber Hotzenplotz 2021-11-26 12:56:48 +01:00
Moriz Wahl
2fe18e851c seed Bibi Bloxberg 2021-11-26 12:48:33 +01:00
Moriz Wahl
3824920c47 get things working 2021-11-26 12:31:02 +01:00
Moriz Wahl
89cfd1259b Merge branch 'setup-seeding' of github.com:gradido/gradido into setup-seeding 2021-11-26 12:25:04 +01:00
Moriz Wahl
ae8fc914fb further refactoring 2021-11-26 12:24:56 +01:00
Moriz Wahl
c8720673fd
Update database/entity/0002-add_settings/User.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-11-26 12:23:00 +01:00
Moriz Wahl
aacfaa67c4
Update database/entity/0002-add_settings/User.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-11-26 12:22:51 +01:00
Moriz Wahl
8ad35aa5f3
Update database/entity/0001-init_db/User.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-11-26 12:22:35 +01:00
Moriz Wahl
62c4552535
Update database/entity/0001-init_db/User.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-11-26 12:22:24 +01:00
Moriz Wahl
e2f8de0acb refactor seed function 2021-11-26 12:08:18 +01:00
Ulf Gebhardt
6a404841ed
renew token 2021-11-26 11:48:10 +01:00
Moriz Wahl
56e95718e1 seed peter lustig as admin 2021-11-26 09:47:13 +01:00
Moriz Wahl
2ca75ba8fc Merge branch 'master' into setup-seeding 2021-11-26 08:48:25 +01:00
Moriz Wahl
a14f37a5f4 Peter Lustig Seed as User (not admin yet) 2021-11-26 08:46:06 +01:00
Ulf Gebhardt
d894358426
Merge pull request #1126 from gradido/backend_rights 
backend_rights
 2021-11-25 18:53:25 +01:00
Moriz Wahl
4d57487f8f get things working again 2021-11-25 11:56:15 +01:00
Ulf Gebhardt
897ff2ec6c
comment 2021-11-25 10:02:17 +01:00
Ulf Gebhardt
fddc39efe5
compare with jwt assigne drole on verifyLogin instead of database query again 2021-11-25 09:57:27 +01:00
Ulf Gebhardt
ffc45d5cde
implemented JWT Admin role assignment 2021-11-25 09:52:01 +01:00
Ulf Gebhardt
08f7952ad7
implemened isAdmin 2021-11-25 09:51:38 +01:00
Ulf Gebhardt
39f1b9cf9f
ServerUser Repository 2021-11-25 09:51:17 +01:00
Ulf Gebhardt
f8570c2693
fixed ServerUser entity definition 2021-11-25 09:51:03 +01:00
Ulf Gebhardt
4e762a12fc
removed duplicate admin link (merge error) 2021-11-25 09:25:01 +01:00
Ulf Gebhardt
e838af8d4b
elopage hook problem 2021-11-25 09:23:23 +01:00
Ulf Gebhardt
0565ff4d85
reverted createUser process - this is done in another PR 2021-11-25 09:18:37 +01:00
Ulf Gebhardt
31a3837fa5
right check for searchUsers & verifyLogin 2021-11-25 09:01:23 +01:00
Ulf Gebhardt
754bd89723
lint 2021-11-25 08:49:47 +01:00
Ulf Gebhardt
77dc54155a
Merge branch 'master' into backend_rights 
# Conflicts:
#	admin/src/router/guards.js
#	admin/src/store/store.js
#	backend/src/graphql/resolver/UserResolver.ts
#	frontend/src/components/SidebarPlugin/SideBar.vue
#	frontend/src/graphql/queries.js
#	frontend/src/routes/guards.js
 2021-11-25 08:49:06 +01:00
Moriz Wahl
67594ce6ee
Merge pull request #1125 from gradido/login_admin_interface 
Login admin interface
 2021-11-24 21:23:23 +01:00
Moriz Wahl
62b3600ac7 coverage unit tests admin interface 51% 2021-11-24 21:12:59 +01:00
Moriz Wahl
e0e707e680 test router navigation guards 2021-11-24 21:11:33 +01:00
Ulf Gebhardt
fcd475f80d
fixed footer merge error 2021-11-24 19:49:33 +01:00
Moriz Wahl
fd9f6f6d55 fix error caused by merging 2021-11-24 19:49:17 +01:00
Moriz Wahl
7c49600df6 test logout action in store 2021-11-24 19:43:31 +01:00