13964 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
mahula	941663af36	adapt delete user formular unit tests to changes	2023-03-30 17:35:55 +02:00
mahula	d685a01742	remove check data from delete user formular	2023-03-30 17:34:00 +02:00
Ulf Gebhardt	b0c19eda47	fix import order	2023-03-30 17:28:03 +02:00
Ulf Gebhardt	36b7c74e5e	Merge pull request #2910 from gradido/federation-fix-env-template ... fix(other): use default values for undefined .env database values	2023-03-30 16:56:38 +02:00
Moriz Wahl	769e36bea5	no Float in query	2023-03-30 16:55:00 +02:00
Ulf Gebhardt	cc98227de0	use default values for undefined .env database values	2023-03-30 16:40:56 +02:00
Moriz Wahl	43e2f5fbc8	do not allow user to edit admin contributions	2023-03-30 16:40:07 +02:00
Moriz Wahl	64d896f973	do not allow user to edit admin contributions	2023-03-30 16:14:36 +02:00
Ulf Gebhardt	9e07f7ae9a	Merge branch 'master' into delete-node-modules-delete-tmp-on-start	2023-03-30 16:10:29 +02:00
Moriz Wahl	cdfcaefa84	show moderator id	2023-03-30 15:50:20 +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	002dfe5a73	Merge pull request #2827 from gradido/eslint-plugin-import-fixes ... refactor(backend): eslint plugin import + fixes	2023-03-30 14:20:32 +02:00
Ulf Gebhardt	5b451520d0	Merge branch 'master' into eslint-plugin-import-fixes	2023-03-30 14:06:21 +02:00
Ulf Gebhardt	fee1a49295	Merge pull request #2900 from gradido/event-tests-for-transactionLinks ... refactor(backend): missing event tests	2023-03-30 10:13:54 +02:00
ogerly	c0680d332d	Transaction info, right-justified, so that the commas	2023-03-29 16:43:03 +02:00
Ulf Gebhardt	28cbf13062	solution to enable import/no-cycle	2023-03-29 16:23:55 +02:00
Ulf Gebhardt	c274b85bb3	fix find	2023-03-29 16:04:02 +02:00
Ulf Gebhardt	8b15eba252	replace delete command by find	2023-03-29 16:01:35 +02:00
Ulf Gebhardt	c96ed73996	force delete node_modules	2023-03-29 15:58:53 +02:00
Ulf Gebhardt	d801a8957f	delete nodemoduels folders to prevent corruption, delete yarn tmp files	2023-03-29 15:50:12 +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
ogerly	5ca2a571f4	restore code	2023-03-29 14:26:27 +02:00
ogerly	5fded941b9	add watch tabIndex, when > currentPage = 1	2023-03-29 14:20:19 +02:00
ogerly	145a60bcdd	yarn installAll	2023-03-29 14:12:28 +02:00
ogerly	73b2a55064	fix locales	2023-03-29 14:02:46 +02:00
Alexander Friedland	c2f3f58121	Merge branch 'master' into 2595-visualize-the-federation	2023-03-29 12:32:23 +02:00
Ulf Gebhardt	a1bcf7515a	removed more obsolete data	2023-03-29 11:22:50 +02:00
Ulf Gebhardt	f2d53dfea6	Merge branch 'master' into cleanup-database	2023-03-29 11:22:20 +02:00