10233 Commits

Author SHA1 Message Date
Moriz Wahl
d64895bcef improve test message texts 2022-08-17 15:42:08 +02:00
Moriz Wahl
61dfb1f881 Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet 2022-08-17 15:32:39 +02:00
Moriz Wahl
e5f7bec965
Merge pull request #2041 from gradido/statistics-resolver
feat: Statistics Resolver
2022-08-17 15:31:09 +02:00
Moriz Wahl
69f4b98473 Merge branch 'master' into statistics-resolver 2022-08-17 15:22:57 +02:00
Moriz Wahl
d058b7033b
Merge pull request #2127 from gradido/2116-retrieve-admin-and-moderators
2116 retrieve admin and moderators
2022-08-17 15:20:28 +02:00
Moriz Wahl
194d4a6ad2 move right COMMUNITY_STATISTICS to user rights 2022-08-17 15:15:35 +02:00
elweyn
3977f1cb38 Test for searchAdminUsers. 2022-08-17 14:10:54 +02:00
elweyn
e49689af77 Start tests for searchAdminUsers. 2022-08-17 14:10:54 +02:00
elweyn
c703117e60 Add searchAdminUsers query to mocks. 2022-08-17 14:10:54 +02:00
ogerly
924bbe52c3 Merge branch 'statistics-resolver' into 1973-List-open-contribution-links-in-the-wallet 2022-08-17 13:55:18 +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
ogerly
0a361e1ab9 change style 2022-08-17 12:43:00 +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
ogerly
a9b7ca67a7 fix test for sidebar 2022-08-17 11:09:59 +02:00
ogerly
ead9f5be7d fix test for router and navbar 2022-08-17 11:05:40 +02:00
ogerly
0be22fcc27 fix test 2022-08-17 10:51:36 +02:00
ogerly
212ad3aae9 add query searchAdminUsers 2022-08-17 10:51:36 +02:00
elweyn
c48ce63a14 Remove unused code. 2022-08-17 10:51:36 +02:00
elweyn
c6e08dd72d Fix changes. 2022-08-17 10:51:36 +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
Alexander Friedland
f21b5f49ab
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet 2022-08-17 10:17:04 +02:00
elweyn
a44bcc00e2 Remove unused code. 2022-08-17 10:09:12 +02:00
Alexander Friedland
a464f08622
Update frontend/src/locales/nl.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-17 10:08:10 +02:00
Alexander Friedland
21f79ece59
Update frontend/src/locales/nl.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-17 10:07:54 +02:00
Alexander Friedland
f648420f08
Update frontend/src/locales/fr.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-17 10:07:41 +02:00
Alexander Friedland
f63c84fdb2
Update frontend/src/locales/nl.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-17 10:07:21 +02:00
Alexander Friedland
799b03e373
Update frontend/src/locales/nl.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-17 10:07:12 +02:00
Alexander Friedland
4f079ee2ca
Update frontend/src/locales/nl.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-17 10:07:00 +02:00
Alexander Friedland
b592add9e7
Update frontend/src/locales/nl.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-17 10:06:53 +02:00
Alexander Friedland
ec6b35e09e
Update frontend/src/locales/nl.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-17 10:06:46 +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
ogerly
7e047ff36f fix tests for locales 2022-08-17 10:01:03 +02:00
elweyn
6bb2ae34b1 Fix typo. 2022-08-17 09:51:23 +02:00
ogerly
09c5a64f24 tests check 2022-08-17 09:41:19 +02:00
Hannes Heine
4382224c18
Merge branch 'master' into create-message-table 2022-08-17 09:29:40 +02:00
Alexander Friedland
fe3787440c
Merge branch 'master' into 2044-Admin-Interface-Displays-Statistics 2022-08-17 09:20:58 +02:00
Alexander Friedland
5d4670083f
Merge branch 'master' into 2135-add-the-languages-french-and-dutch 2022-08-17 09:14:21 +02:00
clauspeterhuebner
1e0922e311
Merge pull request #2126 from gradido/2125-feature-gradido-id-new-column-gradidoid-in-users-table
2125 feature gradido id: new column gradidoid in users table
2022-08-17 04:17:42 +02:00
clauspeterhuebner
76f3e7b849
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-17 04:03:58 +02:00
Claus-Peter Hübner
a487f51b55 rework additional and new remarks from review and meeting 2022-08-17 04:03:20 +02:00
Claus-Peter Hübner
7102bdb88e rework additional and new remarks from review and meeting 2022-08-17 04:02:10 +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
Alexander Friedland
83590be51b
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-16 16:01:28 +02:00
Alexander Friedland
d61e18220c
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-16 16:01:18 +02:00
Alexander Friedland
0edc3dfdc7
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-08-16 16:01:03 +02:00