2206 Commits

Author	SHA1	Message	Date
elweyn	5d4d7dfa05	Merge master in here.	2023-05-03 14:09:04 +02:00
elweyn	7536898a0c	Merge branch '2595-visualize-the-federation' into fix-community-url	2023-04-11 10:28:25 +02:00
elweyn	4cea48aeb8	Fix order of the communities	2023-04-11 09:44:21 +02:00
mahula	3e277bcb79	adapt community resolver unit tests to changes	2023-04-07 15:59:50 +02:00
elweyn	0bb00a3af4	fix(federation): correct exported of community url.'	2023-04-06 23:35:30 +02:00
Hannes Heine	1d547736a4	Merge branch 'master' into 2595-visualize-the-federation	2023-04-06 17:02:09 +02:00
Ulf Gebhardt	e4fc4438fb	removed obsolete comment	2023-04-06 14:20:41 +02:00
Ulf Gebhardt	f2ad6cc24a	fix merge problem	2023-04-06 14:10:46 +02:00
Ulf Gebhardt	657c171898	merge	2023-04-06 14:05:50 +02:00
Ulf Gebhardt	e438502d46	Merge branch 'master' into import-no-cycle-refactor-events	2023-04-05 19:02:12 +02:00
Moriz Wahl	bb887be74c	refactor(backend): get transaction list	2023-04-05 13:22:21 +02:00
Moriz Wahl	248737c446	Merge branch 'master' into feat-previous-balance	2023-04-05 12:16:18 +02:00
elweyn	a9147d3062	Merge branch '2876-add-fields-to-subscriber' into 2878-trigger-export-klicktipp	2023-04-05 10:45:39 +02:00
elweyn	1505d9abf0	Change ACTION_NEWSLETTER to NEWSLETTER_ACTION	2023-04-05 10:43:42 +02:00
elweyn	d09aa6c43d	Fix linting rules	2023-04-04 19:38:17 +02:00
elweyn	05e0ab1f7b	Query email to last createdAt for given event type	2023-04-04 19:09:09 +02:00
Ulf Gebhardt	642aa0369f	Merge branch 'master' into eslint-update-packages	2023-04-04 17:08:44 +02:00
Moriz Wahl	ee90928782	remove middleware	2023-04-04 17:06:29 +02:00
Moriz Wahl	c3ebc33ae5	Merge branch 'master' into feat-previous-balance	2023-04-04 16:55:22 +02:00
Ulf Gebhardt	6696f9be26	lint fixes	2023-04-03 21:35:57 +02:00
Ulf Gebhardt	e656a848fd	Merge branch 'master' into eslint-update-packages	2023-04-03 21:32:26 +02:00
Moriz Wahl	1fdd2e1014	get previuos transaction from database	2023-04-03 18:42:17 +02:00
Moriz Wahl	466b755a3d	middleware to ensure best possible decay displayed	2023-04-03 15:55:15 +02:00
Moriz Wahl	adbd8b1e5d	add previous balance to virtual transaction link transaction	2023-04-03 14:50:22 +02:00
Moriz Wahl	d578273589	correct calculation of previuos balance	2023-04-03 14:17:42 +02:00
Moriz Wahl	60ccdc5beb	feat(backend): previuos balance in transaction	2023-04-03 12:54:11 +02:00
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
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