3179 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	959487c3bb	Merge branch 'master' into import-no-cycle-refactor-events	2023-03-31 12:08:15 +02:00
elweyn	9da7ae6ff4	Merge branch '2785-add-events-for-subscribe-unsubscribe' into 2876-add-fields-to-subscriber	2023-03-31 07:42:41 +02:00
elweyn	d326f00c0b	Fix linting	2023-03-31 07:28:52 +02:00
elweyn	0345e8420d	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-03-31 07:27:58 +02:00
elweyn	71266dcc2d	Fix linting rules	2023-03-31 07:16:21 +02:00
elweyn	989a3e30f2	Import order fixed by lint	2023-03-31 07:16:04 +02:00
Moriz Wahl	c0141c1801	no doubled imports	2023-03-30 19:18:51 +02:00
Moriz Wahl	976940047e	Merge branch 'master' into feat-send-coins-via-gradido-ID	2023-03-30 19:14:09 +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
elweyn	c07582d5a1	Merge & linting	2023-03-30 16:44:17 +02:00
Moriz Wahl	43e2f5fbc8	do not allow user to edit admin contributions	2023-03-30 16:40:07 +02:00
Hannes Heine	b67baf665b	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-03-30 16:37:03 +02:00
elweyn	8c3a847af6	Linting	2023-03-30 16:31:02 +02:00
elweyn	54e912f028	Add unit tests for KlicktippResolver	2023-03-30 16:30:44 +02:00
elweyn	e1c6764978	Remove unused queries	2023-03-30 16:30:11 +02:00
elweyn	ff7a73048c	Correct mutations in testing	2023-03-30 16:29:35 +02:00
elweyn	04c6756ef4	Remove check on CONFIG.KLICKTIPP	2023-03-30 16:29:05 +02:00
elweyn	ada9f9a056	Remove not used function rights.	2023-03-30 16:28:38 +02:00
elweyn	b2f0bf37d2	Refactor klicktippcontroller to not call function	2023-03-30 16:28:18 +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
Alexander Friedland	c2f3f58121	Merge branch 'master' into 2595-visualize-the-federation	2023-03-29 12:32:23 +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
ogerly	bc4af26667	change sort, add lastAnnouncedAt and createdAt by DESC	2023-03-29 10:58:12 +02:00
Hannes Heine	8be1278770	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-03-29 10:00:14 +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
Hannes Heine	cecfc346cc	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-03-29 07:54:19 +02:00
Moriz Wahl	d7919ea10f	changes requested	2023-03-28 13:32:47 +02:00
Moriz Wahl	ed8549bfb5	Merge branch 'master' into feat-send-coins-via-gradido-ID	2023-03-28 13:23:58 +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