14002 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	95303c30e0	add previous transaction relation	2023-04-03 18:38:09 +02:00
Moriz Wahl	466b755a3d	middleware to ensure best possible decay displayed	2023-04-03 15:55:15 +02:00
Moriz Wahl	166debcc7d	add previous balance to unit tests	2023-04-03 15:10:01 +02:00
Moriz Wahl	545e556599	previuos balance from server, displayed in decay details	2023-04-03 14:55:22 +02:00
Moriz Wahl	0a62c87dd9	locales for new and old balance	2023-04-03 14:54:48 +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	9a04c4a5d4	Merge remote-tracking branch 'origin/1006-Numbers-Transaction-List-always-aligned-by-the-comma' into feat-previous-balance	2023-04-03 12:56:33 +02:00
Moriz Wahl	60ccdc5beb	feat(backend): previuos balance in transaction	2023-04-03 12:54:11 +02:00
Ulf Gebhardt	03f1cc3206	implement Hannes suggestion regarding export style	2023-04-03 12:52:49 +02:00
Ulf Gebhardt	f623cbaee0	Merge branch 'master' into cleanup-database	2023-04-03 12:50:52 +02:00
Ulf Gebhardt	1daa7e2ef4	Merge branch 'master' into import-no-cycle-refactor-events	2023-04-03 12:48:21 +02:00
Ulf Gebhardt	5d0d194e2e	Merge pull request #2828 from gradido/exlint-plugin-n ... refactor(backend): eslint plugin n + fixes	2023-04-03 12:45:44 +02:00
Ulf Gebhardt	947e48fb85	Merge branch 'master' into exlint-plugin-n	2023-04-03 12:33:08 +02:00
Hannes Heine	8eff38e9aa	Merge branch 'master' into 2818-pagination-is-not-reset-when-switching-tabs	2023-04-01 10:16:06 +02:00
Hannes Heine	f617c8d766	Merge pull request #2889 from gradido/2825-add-download-link-to-qr-code ... feat(frontend): add link to download QR-Code	2023-04-01 10:15:25 +02:00
elweyn	386b451dd6	Call toDataUrl on canvasEl and expect data on href	2023-03-31 16:09:50 +02:00
elweyn	06523f38fa	Unit tests for FigureQrCode	2023-03-31 16:02:05 +02:00
elweyn	bd29624c79	Refactor downloadImg to refs	2023-03-31 16:01:43 +02:00
Ulf Gebhardt	35855f80ed	remove fileextension import rule from n, its covered in import	2023-03-31 13:14:21 +02:00
Ulf Gebhardt	89d775324f	Merge branch 'master' into exlint-plugin-n	2023-03-31 13:00:03 +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
Hannes Heine	e5e18288bc	Merge branch 'master' into 2825-add-download-link-to-qr-code	2023-03-31 12:46:34 +02:00
Hannes Heine	25b0aeb3bf	Merge branch 'master' into 2818-pagination-is-not-reset-when-switching-tabs	2023-03-31 12:45:49 +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
Ulf Gebhardt	1ace87c540	Merge pull request #2904 from gradido/delete-node-modules-delete-tmp-on-start ... fix(other): delete node_modules and /tmp/yarn--* on start.sh	2023-03-31 11:49:29 +02:00
Ulf Gebhardt	510a8d7755	Merge branch 'master' into delete-node-modules-delete-tmp-on-start	2023-03-31 11:37:25 +02:00
mahula	4a8420bfc6	Merge pull request #2880 from gradido/2481-fix-admin-no-confirmation-when-changing-user-role ... fix(admin): add confirmation modal for user role change and user (un)deletion	2023-03-31 11:35:41 +02:00
mahula	8a505bb1ba	fix linting	2023-03-31 11:16:58 +02:00
mahula	01afe6a068	update admin/src/components/DeletedUserFormular.vue ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-03-31 10:32:45 +02:00
mahula	2f67f0634c	update admin/src/components/DeletedUserFormular.vue ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-03-31 10:27:49 +02:00
elweyn	594fb8fe60	Merge branch 'master' into 2481-fix-admin-no-confirmation-when-changing-user-role	2023-03-31 10:00:58 +02:00
elweyn	c25a9f936a	Center the canvas and remove bottom gap	2023-03-31 09:40:28 +02:00
mahula	cc91cd32dc	fix linting	2023-03-31 09:35:14 +02:00
mahula	e70552b3fb	add user recovery tests to user search page	2023-03-31 09:31:18 +02:00
mahula	f238a3ddb1	adapt change user formular unit tests to changes	2023-03-31 09:30:15 +02:00
elweyn	2a37358fe1	Merge branch 'master' into 2825-add-download-link-to-qr-code	2023-03-31 09:13:23 +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	042f13fce7	Merge pull request #2811 from gradido/2803-open-contribution-edit-button ... fix(admin): admin open contribution edit button	2023-03-30 18:57:17 +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	b6a9bd3dec	Merge branch 'master' into delete-node-modules-delete-tmp-on-start	2023-03-30 18:21:58 +02:00
Ulf Gebhardt	a43c58e5b7	Merge pull request #2911 from gradido/fix-import-order ... fix(backend): import order	2023-03-30 18:18:13 +02:00