1844 Commits

Author	SHA1	Message	Date
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
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
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
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	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	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