9843 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	1ce2aec998	Merge branch '2116-retrieve-admin-and-moderators' into 1973-List-open-contribution-links-in-the-wallet	2022-08-16 09:58:00 +02:00
ogerly	3f30252cf5	fix test, fix lint	2022-08-16 09:55:19 +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
ogerly	c0486d7f72	add locales for es	2022-08-14 15:32:33 +02:00
Alexander Friedland	220a6544f9	Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet	2022-08-12 14:46:31 +02:00
Hannes Heine	eed210dc9e	Merge pull request #2107 from gradido/2105-add-emailChecked-to-opt-in-check ... fix: 🍰 Add `emailChecked` Before Changing `optIn` State & Log Error On klicktipp Middleware	2022-08-12 12:25:53 +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
Alexander Friedland	425c800de4	Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet	2022-08-11 14:36:15 +02:00
Hannes Heine	10ad232a47	Merge pull request #2123 from gradido/2117-list-contribution-links-for-all-users ... Add RIGHTS.LIST_CONTRIBUTION_LINKS to ROLE_USER	2022-08-11 11:35:41 +02:00
Hannes Heine	186eaf238a	Merge branch 'master' into 2117-list-contribution-links-for-all-users	2022-08-11 11:17:29 +02:00
Alexander Friedland	8ea4427117	Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet	2022-08-11 11:00:13 +02:00
Alexander Friedland	cd28695844	Merge pull request #2122 from gradido/2121-Translate-locales-to-Spanish ... 2121 translate locales to spanish	2022-08-11 10:58:52 +02:00
Moriz Wahl	f98f38773d	fix missing translations	2022-08-10 15:57:30 +02:00
Moriz Wahl	6d2cbfbab1	add number and date formats for locale es	2022-08-10 15:57:13 +02:00
Hannes Heine	e7c989da60	Merge branch 'master' into 2116-retrieve-admin-and-moderators	2022-08-10 11:31:09 +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
Alexander Friedland	6ee5734499	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:26:10 +02:00
Alexander Friedland	a72c6cc827	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:25:38 +02:00
Alexander Friedland	dce0038169	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:25:29 +02:00
Alexander Friedland	200af0ebd7	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:25:09 +02:00
Alexander Friedland	81fd9910aa	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:24:56 +02:00
Alexander Friedland	99d23990dd	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:24:07 +02:00
Alexander Friedland	36e86438b1	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:57 +02:00
Alexander Friedland	05fb34fc80	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:45 +02:00
Alexander Friedland	262bde615c	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:35 +02:00
Alexander Friedland	a1a103bb6d	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:14 +02:00
Alexander Friedland	7e94822d94	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:23:01 +02:00
Alexander Friedland	08b439a53d	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:22:47 +02:00
Alexander Friedland	506ba5b625	Update frontend/src/locales/es.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-09 14:22:36 +02:00
ogerly	0284ecb926	add missing values	2022-08-09 08:54:04 +02:00
Alexander Friedland	2818b37ef6	Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet	2022-08-08 20:04:15 +02:00
Alexander Friedland	1b012365f1	Merge branch 'master' into 2121-Translate-locales-to-Spanish	2022-08-08 20:02:55 +02:00
Alexander Friedland	eed27a82d5	Merge pull request #2115 from gradido/2112-Thousand-separator-problem ... add formatter on input amount replace point and comma	2022-08-08 17:08:16 +02:00
ogerly	3a2f27f519	refactor amount to string in ContributionForm, fix thousand error	2022-08-08 16:57:14 +02:00
ogerly	1fbea40c4d	remove regex	2022-08-08 15:27:42 +02:00
Alexander Friedland	adef450bd0	Update ContributionForm.vue	2022-08-08 15:24:50 +02:00
Alexander Friedland	dbbec33f73	Merge branch 'master' into 2112-Thousand-separator-problem	2022-08-08 15:11:58 +02:00
Alexander Friedland	5273edace6	Merge branch 'master' into 2121-Translate-locales-to-Spanish	2022-08-08 15:11:48 +02:00
Alexander Friedland	2548a4f38f	Merge pull request #2114 from gradido/2113-Delete-textarea-info-message ... remove required from form.memo	2022-08-08 15:11:02 +02:00
elweyn	9a7073415c	Add TODO for listContributionLinks test of user without admin rights.	2022-08-08 11:14:11 +02:00
elweyn	5fb491572d	Change test for listCOntributionLinks to get empty object as user without admin rights.	2022-08-08 11:04:24 +02:00
elweyn	7201fb6fc3	A User has now the right to get listContributionLinks.	2022-08-08 10:57:56 +02:00
elweyn	aa91e2b410	Add RIGHTS.LIST_CONTRIBUTION_LINKS to ROLE_USER	2022-08-08 10:48:09 +02:00
ogerly	56bd17a265	fix test for backend	2022-08-07 23:08:44 +02:00
ogerly	9f9395c7ab	fix test for frontend	2022-08-07 23:05:34 +02:00