14105 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
elweyn	9da7ae6ff4	Merge branch '2785-add-events-for-subscribe-unsubscribe' into 2876-add-fields-to-subscriber	2023-03-31 07:42:41 +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
Claus-Peter Hübner	2435afcd7c	3rd draft of database modell	2023-03-31 00:31:55 +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
elweyn	c07582d5a1	Merge & linting	2023-03-30 16:44:17 +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
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
elweyn	54e912f028	Add unit tests for KlicktippResolver	2023-03-30 16:30:44 +02:00
elweyn	e1c6764978	Remove unused queries	2023-03-30 16:30:11 +02:00
elweyn	ff7a73048c	Correct mutations in testing	2023-03-30 16:29:35 +02:00
elweyn	04c6756ef4	Remove check on CONFIG.KLICKTIPP	2023-03-30 16:29:05 +02:00
elweyn	ada9f9a056	Remove not used function rights.	2023-03-30 16:28:38 +02:00
elweyn	b2f0bf37d2	Refactor klicktippcontroller to not call function	2023-03-30 16:28:18 +02:00
Ulf Gebhardt	381b96a812	removed obsolete yarn cron docu	2023-03-30 16:24:24 +02:00