3285 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	7a44a223e9	lint fixes	2023-03-31 12:51:51 +02:00
Ulf Gebhardt	875c1f692b	lint fixes	2023-03-31 12:48:42 +02:00
Ulf Gebhardt	c57c259db8	merge	2023-03-31 12:48:14 +02:00
Ulf Gebhardt	ae8405e8f6	merge	2023-03-31 12:48:09 +02:00
Ulf Gebhardt	1fa6d3e469	lint fixes	2023-03-31 12:10:50 +02:00
Ulf Gebhardt	05fc48198e	merge conflicts	2023-03-31 12:08:55 +02:00
Ulf Gebhardt	959487c3bb	Merge branch 'master' into import-no-cycle-refactor-events	2023-03-31 12:08:15 +02:00
Moriz Wahl	695d037a2d	do not allow edit contribution for admin contributions in backend	2023-03-30 18:33:36 +02:00
Moriz Wahl	d3ac556885	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-30 18:26:02 +02:00
Moriz Wahl	6dff07a7ba	Revert "do not allow user to edit admin contributions" ... This reverts commit 43e2f5fbc839921b5b0fe3deadc85c15baeb104f.	2023-03-30 18:25:47 +02:00
Ulf Gebhardt	7d7eb34aeb	fix order	2023-03-30 18:04:43 +02:00
Ulf Gebhardt	9407386de7	fix alphabetical sort	2023-03-30 17:57:15 +02:00
Ulf Gebhardt	80ff97e72a	more lint fixes	2023-03-30 17:39:09 +02:00
Ulf Gebhardt	b0c19eda47	fix import order	2023-03-30 17:28:03 +02:00
Moriz Wahl	43e2f5fbc8	do not allow user to edit admin contributions	2023-03-30 16:40:07 +02:00
Moriz Wahl	10022c2247	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-30 15:11:18 +02:00
Ulf Gebhardt	d3290646bb	Merge branch 'master' into import-no-cycle-refactor-events	2023-03-30 14:20:49 +02:00
Ulf Gebhardt	5b451520d0	Merge branch 'master' into eslint-plugin-import-fixes	2023-03-30 14:06:21 +02:00
Ulf Gebhardt	28cbf13062	solution to enable import/no-cycle	2023-03-29 16:23:55 +02:00
Ulf Gebhardt	90c9802ece	disable import/no-cycle	2023-03-29 15:10:30 +02:00
Ulf Gebhardt	6a8e239ab0	merge	2023-03-29 15:06:26 +02:00
Ulf Gebhardt	e6aa6a5c98	Merge branch 'master' into event-tests-for-transactionLinks	2023-03-29 11:18:11 +02:00
Ulf Gebhardt	afd5703c80	missing event tests	2023-03-29 11:06:47 +02:00
Ulf Gebhardt	e08c156acf	merge conflict solved	2023-03-29 09:47:51 +02:00
Ulf Gebhardt	1f0b07b708	Merge branch 'master' into events-unify-names	2023-03-29 09:47:40 +02:00
Moriz Wahl	a4c82ae145	remove skipped tests as thay are depreciated	2023-03-28 13:06:37 +02:00
Ulf Gebhardt	3ae1ad7953	Merge branch 'master' into events-user	2023-03-28 12:02:10 +02:00
Moriz Wahl	f5f50e9353	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-28 11:52:01 +02:00
Ulf Gebhardt	d0d9be2d28	Merge branch 'master' into events-user	2023-03-28 01:54:34 +02:00
Hannes Heine	3c9dca5b46	Update backend/src/graphql/resolver/KlicktippResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-03-28 01:49:27 +02:00
Hannes Heine	d6536f275f	Update backend/src/graphql/resolver/KlicktippResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-03-28 01:49:08 +02:00
Ulf Gebhardt	69a29f0a31	fix linting	2023-03-28 01:36:52 +02:00
Ulf Gebhardt	00a2ba2387	lint fixes	2023-03-28 01:08:30 +02:00
Ulf Gebhardt	c874fb6ca1	Merge branch 'master' into eslint-plugin-import-fixes	2023-03-28 01:08:16 +02:00
Hannes Heine	8a4aa5630b	Merge branch 'master' into 2785-remove-email-from-subscribe-unsubscribe	2023-03-28 00:56:55 +02:00
Ulf Gebhardt	eefdf5ae58	Merge branch 'master' into eslint-plugin-jest-fixes	2023-03-28 00:39:18 +02:00
Ulf Gebhardt	f6071d6e07	fix linting	2023-03-28 00:25:14 +02:00
Ulf Gebhardt	caa0e5fe0f	Merge branch 'master' into events-user	2023-03-28 00:23:39 +02:00
Ulf Gebhardt	4c4da6e929	fixed linting	2023-03-27 23:59:46 +02:00
elweyn	1f13613049	remove language from mutation	2023-03-24 13:35:03 +01:00
Hannes Heine	2954c61892	Merge branch 'master' into 2785-remove-email-from-subscribe-unsubscribe	2023-03-24 12:41:16 +01:00
Ulf Gebhardt	980242012f	Merge branch 'master' into events-transaction-link	2023-03-24 12:02:39 +01:00
Ulf Gebhardt	b23030e612	Merge branch 'master' into events-contribution	2023-03-24 11:50:15 +01:00
Hannes Heine	754386e70f	Merge branch 'master' into events-contribution-message	2023-03-24 09:08:41 +01:00
elweyn	4081a9eecf	remove Args import	2023-03-24 08:34:33 +01:00
elweyn	d07d76298b	email is searched from user object	2023-03-24 08:14:12 +01:00
elweyn	0997d81ca9	Remove ununsed Args definition	2023-03-24 08:13:25 +01:00
elweyn	43d01cfbf8	Revert "Remove unnecessary eslint-disable" ... This reverts commit 783831b3de59eddaff219226cbea45732c6e829d.	2023-03-24 01:04:27 +01:00
elweyn	655e4e9895	Merge branch 'remove-klicktipp-override' into upgrade-backend-coverage	2023-03-24 01:02:26 +01:00
elweyn	783831b3de	Remove unnecessary eslint-disable	2023-03-24 00:57:43 +01:00