1861 Commits

Author SHA1 Message Date
Claus-Peter Hübner
eedaf9e6e3 unit tests of AdminResolver now with Users and UserContacts 2022-08-31 23:04:55 +02:00
Claus-Peter Hübner
faa0500f10 adapt seeding using User and UserContact 2022-08-31 15:44:41 +02:00
Claus-Peter Hübner
852c4e6499 change seeding now with UserContacts entry 2022-08-31 01:12:12 +02:00
Claus-Peter Hübner
7269b4b67b solve problems reading user with emailcontact 2022-08-30 00:57:57 +02:00
Claus-Peter Hübner
1d1de2011a failed try to load OneToOne relation of user to userConmtact as
emailConact-attribut...  grrrrrr...
2022-08-26 20:00:29 +02:00
Claus-Peter Hübner
1184666fe2 try to solve problem of dbUser-entity with emailContact in context 2022-08-26 14:42:37 +02:00
Claus-Peter Hübner
0f90f960ce remove unused code 2022-08-26 02:40:44 +02:00
Claus-Peter Hübner
228451574d adapt backend on database migration of UserContacts 2022-08-26 02:28:04 +02:00
Claus-Peter Hübner
fde236aa43 add migration of users, user_contacts and email_opt_in 2022-08-25 01:06:25 +02:00
Claus-Peter Hübner
ab1dd4a2c8 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-08-25 00:20:20 +02:00
Hannes Heine
eb29df38ee
Merge branch 'master' into create-message-table 2022-08-22 09:49:33 +02:00
Claus-Peter Hübner
14bd9aae81 linting 2022-08-18 19:09:20 +02:00
Claus-Peter Hübner
e946d96efe Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-08-18 19:07:33 +02:00
Hannes Heine
fb22bdbe63
Merge branch 'master' into create-message-table 2022-08-18 12:07:57 +02:00
Alexander Friedland
46626441d4
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-18 08:09:56 +02:00
Moriz Wahl
69f4b98473 Merge branch 'master' into statistics-resolver 2022-08-17 15:22:57 +02:00
Moriz Wahl
194d4a6ad2 move right COMMUNITY_STATISTICS to user rights 2022-08-17 15:15:35 +02:00
elweyn
b1a17c52ec Add community_statistics to user ROLES. 2022-08-17 12:46:29 +02:00
Alexander Friedland
632141ffca
Merge branch 'master' into statistics-resolver 2022-08-17 12:44:31 +02:00
elweyn
e4ec7a1d59 Change Message to ContributionMessage, change 0046 to 0047. 2022-08-17 12:04:03 +02:00
elweyn
1c301d34a2 Test for searchAdminUsers. 2022-08-17 11:37:13 +02:00
elweyn
6c707eae59 Start tests for searchAdminUsers. 2022-08-17 10:22:08 +02:00
elweyn
f96fb5aa63 Add searchAdminUsers query to mocks. 2022-08-17 10:21:40 +02:00
elweyn
a44bcc00e2 Remove unused code. 2022-08-17 10:09:12 +02:00
elweyn
beb563ac5c Fix changes. 2022-08-17 10:05:56 +02:00
Hannes Heine
3e7973b513
Merge branch 'master' into 2116-retrieve-admin-and-moderators 2022-08-17 10:01:41 +02:00
Hannes Heine
4382224c18
Merge branch 'master' into create-message-table 2022-08-17 09:29:40 +02:00
Alexander Friedland
5d4670083f
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-17 09:14:21 +02:00
Claus-Peter Hübner
72e1de9f78 Merge remote-tracking branch 'origin/master' into
2125-feature-gradido-id-new-column-gradidoid-in-users-table
2022-08-16 17:10:15 +02:00
Claus-Peter Hübner
e876f32ad5 initialize gradidoID of fakedUser per uuidv4() instead of constant 2022-08-16 17:05:31 +02:00
ogerly
d54a04f825 remove statistics files 2022-08-16 13:54:05 +02:00
Alexander Friedland
63f57a53ee
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-16 13:33:50 +02:00
ogerly
73cf9bc8cc add dutch and frence 2022-08-16 11:54:11 +02:00
elweyn
dd381f3de1 Merge master changes. 2022-08-16 11:37:26 +02:00
elweyn
d86f502fe7 Set new database version in backend config. 2022-08-16 08:25:21 +02:00
Moriz Wahl
f2f8989746 save contribution when setting status DELETED before softDelete 2022-08-15 19:06:59 +02:00
Moriz Wahl
c417bc7a10 add contribution status enum and set it 2022-08-15 19:02:06 +02:00
Moriz Wahl
daa8d48ca6 add contribution type enum and set contribution type on creation 2022-08-15 18:50:25 +02:00
Moriz Wahl
d4150f123c update db version 2022-08-15 18:32:50 +02:00
elweyn
d3238fd486 Fix linting. 2022-08-15 11:05:11 +02:00
elweyn
b41f34a3dd Merge master into this branch. 2022-08-15 11:03:58 +02:00
Moriz Wahl
f4b34da415 get basic statistics from database 2022-08-14 10:21:00 +02:00
Moriz Wahl
c0892842d1 setup community statistics 2022-08-14 10:21:00 +02:00
Hannes Heine
d4cd6c2b30
Update klicktippMiddleware.ts
Change log level from info to error
2022-08-11 15:07:48 +02:00
Hannes Heine
ad9202efed
Update backend/src/middleware/klicktippMiddleware.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-11 14:57:17 +02:00
Hannes Heine
24ce920ecc
Merge branch 'master' into 2105-add-emailChecked-to-opt-in-check 2022-08-11 14:56:36 +02:00
Hannes Heine
186eaf238a
Merge branch 'master' into 2117-list-contribution-links-for-all-users 2022-08-11 11:17:29 +02:00
elweyn
c46f2f241e Create resolver method to query admin and moderator users. 2022-08-10 11:28:21 +02:00
elweyn
304732bdad Add model for AdminUser 2022-08-10 11:27:27 +02:00
elweyn
d0d4b151dc Add rights and roles to query admins and moderators. 2022-08-10 11:27:05 +02:00