9980 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	d7fbeb4220	Merge branch 'master' into 2135-add-the-languages-french-and-dutch	2022-08-18 17:43:33 +02:00
Alexander Friedland	1e246ef6b2	Merge pull request #2124 from gradido/2044-Admin-Interface-Displays-Statistics ... feat: 🍰 Admin Interface Displays Statistics	2022-08-18 17:42:38 +02:00
Alexander Friedland	0e17951d1c	Update admin/src/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:29:17 +02:00
Alexander Friedland	3ab588416d	Update admin/src/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:21:20 +02:00
Alexander Friedland	7fdd061d77	Update admin/src/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:06:51 +02:00
Alexander Friedland	c62bb62b21	Update admin/src/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:06:45 +02:00
Alexander Friedland	16d4f762a4	Update admin/src/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:06:39 +02:00
Alexander Friedland	a71b551fa9	Update admin/src/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:06:33 +02:00
Alexander Friedland	81db56fd5e	Update admin/src/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:06:26 +02:00
Alexander Friedland	693e315cf3	Update admin/src/components/ContentFooter.spec.js ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:06:19 +02:00
Alexander Friedland	4da9b22eeb	Update admin/jest.config.js ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-08-18 17:06:10 +02:00
ogerly	c6a6c470d0	add computed for selected locale to avoide additional pipe	2022-08-18 16:36:56 +02:00
ogerly	0bbc22e803	remove COMMUNITY_NAME in config.js	2022-08-18 10:42:19 +02:00
ogerly	fed8701bda	thousand separator inserted	2022-08-18 08:37:38 +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	d788c88636	simplify import of locales	2022-08-17 17:39:05 +02:00
Moriz Wahl	cd13071441	add to mocks	2022-08-17 17:02:03 +02:00
Moriz Wahl	4e240992a5	test the API calls	2022-08-17 17:00:23 +02:00
Moriz Wahl	9d3d70c103	Merge branch 'master' into 2044-Admin-Interface-Displays-Statistics	2022-08-17 16:29: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	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	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
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
ogerly	09c5a64f24	tests check	2022-08-17 09:41:19 +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
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