185 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	1fa6d3e469	lint fixes	2023-03-31 12:10:50 +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
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	28cbf13062	solution to enable import/no-cycle	2023-03-29 16:23:55 +02:00
Ulf Gebhardt	6a8e239ab0	merge	2023-03-29 15:06:26 +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
Moriz Wahl	f5f50e9353	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-28 11:52:01 +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
Ulf Gebhardt	eefdf5ae58	Merge branch 'master' into eslint-plugin-jest-fixes	2023-03-28 00:39:18 +02:00
Ulf Gebhardt	b23030e612	Merge branch 'master' into events-contribution	2023-03-24 11:50:15 +01:00
Moriz Wahl	b64c080447	changes requested	2023-03-23 13:27:47 +01:00
Moriz Wahl	2ac94e1b47	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-23 13:17:02 +01:00
Ulf Gebhardt	7e8b1ba6a3	Merge branch 'master' into seperate-events-in-own-files	2023-03-23 12:21:55 +01:00
Ulf Gebhardt	1577667c1a	Merge branch 'master' into rename-evenProtocolType-to-eventType	2023-03-23 12:00:39 +01:00
Moriz Wahl	8f56be790b	Merge branch 'master' into 2803-open-contribution-edit-button	2023-03-21 14:44:13 +01:00
Moriz Wahl	b27db4eeaf	Merge branch 'master' into refactor-find-contribtiions	2023-03-21 14:37:07 +01:00
Ulf Gebhardt	b3c48af3c4	Merge branch 'master' into event_refactor_database	2023-03-14 16:08:41 +01:00
Ulf Gebhardt	c54e6fb8ae	new rules + fixes	2023-03-12 02:19:10 +01:00
Ulf Gebhardt	721ccecd12	fixes	2023-03-12 02:19:10 +01:00
Ulf Gebhardt	6241119885	fix skip tests	2023-03-12 02:18:13 +01:00
Moriz Wahl	f8cc681e06	fix unit tests	2023-03-10 15:26:07 +01:00
Moriz Wahl	d4d38e29b6	Merge branch 'master' into refactor-find-contribtiions	2023-03-10 14:42:43 +01:00
Ulf Gebhardt	04a87be90d	fix eslint jest errors	2023-03-10 13:09:35 +01:00
Ulf Gebhardt	19adc53ed7	fix newly introduced errors	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	827c829306	fixes based on the unit tests	2023-03-09 14:37:25 +01:00
Ulf Gebhardt	3391b3a9ee	merge	2023-03-09 14:37:17 +01:00
Ulf Gebhardt	d989e5c489	rename events	2023-03-09 13:29:46 +01:00
elweyn	775d29fb68	Add messageCount value to the contributions that got messages, order the objects in the same order as they are found.	2023-03-08 14:29:25 +01:00
Moriz Wahl	e48bbd7b47	rename admin list all contributions query	2023-03-07 17:33:18 +01:00
Moriz Wahl	74138dbef3	Merge branch 'use-find-contributions-for-list-contributions'	2023-03-07 17:04:12 +01:00
Ulf Gebhardt	920f16aad5	corrected test name, some code style fixes	2023-03-07 13:33:08 +01:00
Ulf Gebhardt	630a37cc51	rename event CONTRIBUTION_CONFIRM to ADMIN_CONTRIBUTION_CONFIRM, clean Eventtypes enum	2023-03-07 12:29:59 +01:00
Ulf Gebhardt	17992d75ef	separate events into their own file, some nameing conventions	2023-03-07 12:29:59 +01:00
Ulf Gebhardt	d204e79cd5	rename eventProtocolType to eventType	2023-03-07 12:29:02 +01:00
Moriz Wahl	12f4e9fda1	Merge branch 'master' into use-find-contributions-for-list-contributions	2023-03-06 16:47:18 +01:00
Ulf Gebhardt	4379668268	Merge branch 'master' into event_refactor_database	2023-03-03 23:55:24 +01:00
Hannes Heine	d2afaad938	Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution	2023-03-01 17:06:09 +01:00
elweyn	9fc1e45ed0	Merge branch '2689-test-email-send-deny-deleted-contribution' of https://github.com/gradido/gradido into 2689-test-email-send-deny-deleted-contribution	2023-03-01 05:21:03 +01:00
elweyn	3a6b701d3b	Reduce mock of emails sendEmailVariant.	2023-03-01 05:16:37 +01:00
Hannes Heine	bfbf7954e3	Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution	2023-03-01 05:03:44 +01:00