6459 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	08a7e2d00b	Duplicate entry 'delete user' removed	2022-02-23 11:14:51 +01:00
ogerly	4d04731569	Code review by moriz, changes made	2022-02-23 10:12:31 +01:00
Alexander Friedland	8279c7b932	Merge branch 'master' into test-softdeleted	2022-02-23 10:06:18 +01:00
Alexander Friedland	ab5118d210	Merge pull request #1467 from gradido/1459-List-Data-again-on-Confirm-Creation ... 1459 list data again on confirm creation	2022-02-23 09:56:11 +01:00
Moriz Wahl	6aeb174532	fix tests	2022-02-23 09:40:30 +01:00
Alexander Friedland	67cd731b01	Update admin/src/locales/de.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-23 09:31:45 +01:00
Alexander Friedland	6ebaae53bc	Update admin/src/components/Tables/SearchUserTable.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-23 09:31:19 +01:00
Alexander Friedland	dda0c9b113	Update admin/src/components/Tables/SearchUserTable.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-23 09:30:49 +01:00
Alexander Friedland	937ccfbb9d	Update backend/src/graphql/resolver/AdminResolver.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-23 09:24:58 +01:00
Moriz Wahl	e67427f8f1	linting	2022-02-23 09:24:46 +01:00
Alexander Friedland	8cbe2507ef	Update admin/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-23 09:23:38 +01:00
Alexander Friedland	d5a630f343	Update admin/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-23 09:23:24 +01:00
Alexander Friedland	c9cf12ae8b	Update admin/src/components/DeletedUserFormular.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-23 09:22:37 +01:00
Moriz Wahl	555a689fef	Merge branch 'master' into 1459-List-Data-again-on-Confirm-Creation	2022-02-23 09:17:46 +01:00
Moriz Wahl	1b35da31ac	fix tests	2022-02-23 09:14:10 +01:00
Moriz Wahl	9c4d418384	fix merging problems	2022-02-23 08:34:59 +01:00
Alexander Friedland	947cbb659b	Merge branch 'master' into test-softdeleted	2022-02-22 20:31:47 +01:00
ogerly	2c320e3113	yarn locales --fix	2022-02-22 20:25:43 +01:00
ogerly	c5ea5a8b40	yarn lint --fix	2022-02-22 20:24:15 +01:00
ogerly	510ee8a8df	yarn lint --fix	2022-02-22 20:23:57 +01:00
ogerly	2d1dedf5ec	change in database, no idea how this was changed	2022-02-22 20:11:55 +01:00
ogerly	1b4f0d4b60	change Mutation in Date, nullable: true in DELETE_USER, UNDELETE_USER	2022-02-22 20:09:27 +01:00
ogerly	9cbaaa7302	Dynamic switching when user is deleted or restored	2022-02-22 20:00:51 +01:00
Moriz Wahl	b425124721	Merge pull request #1526 from gradido/fix-empty-ids-for-get-creations ... fix: Return Empty Array When No Pending Creations Are Present	2022-02-22 19:04:38 +01:00
Moriz Wahl	b8c3deac3e	fix: Return Empty Array When No Pending Creations Are Present	2022-02-22 18:49:24 +01:00
Ulf Gebhardt	9cccdd97c7	Merge pull request #1525 from gradido/corrected_start_command ... Fix: Correct path of index.js in production	2022-02-22 18:29:59 +01:00
Ulf Gebhardt	a4b33a8c13	fix path of index.js when starting in production	2022-02-22 18:22:44 +01:00
Moriz Wahl	ffb0eb8788	Merge pull request #1524 from gradido/refactor-get-open-creations ... refactor: Get Open Creations by One Query	2022-02-22 17:57:12 +01:00
Moriz Wahl	2ce19c9c80	improve error messages, test for valid creation on confirmation	2022-02-22 17:45:25 +01:00
Moriz Wahl	dcf2e1a19e	fix wrong id in find statement	2022-02-22 16:38:57 +01:00
Moriz Wahl	03e67604ba	remove moment	2022-02-22 15:50:42 +01:00
Moriz Wahl	cd7a9bf361	do not use moment anymore	2022-02-22 15:49:58 +01:00
ogerly	3b656898e1	add isDeleted in backend, delete and undelete is activ by return	2022-02-22 14:45:43 +01:00
Moriz Wahl	55211f0940	use enum as creation type, date criteria as variable	2022-02-22 14:43:03 +01:00
Moriz Wahl	c0c5510903	less db calls for get pending creations	2022-02-22 14:24:07 +01:00
Moriz Wahl	99f641f1f9	replace any	2022-02-22 13:49:42 +01:00
Moriz Wahl	2bdcea15f0	use only one query to get the open creations	2022-02-22 13:25:26 +01:00
Ulf Gebhardt	99c2636772	fixed missing deletedAt field in search query	2022-02-22 13:05:05 +01:00
ogerly	ea91e75c93	yarn lint fix && locales fix	2022-02-22 12:48:04 +01:00
ogerly	0c9f522dc0	clean error message when sending to a deleted user account	2022-02-22 12:48:04 +01:00
Moriz Wahl	7be2fb68b4	refactor: Get User Creations	2022-02-22 12:27:47 +01:00
ogerly	0c1dabde31	yarn lint --fix	2022-02-22 12:18:07 +01:00
ogerly	539752b7ec	all admin functions disabled for a deleted user. creation not possible for deleted users. viewing of creations not possible. sending email not possible.	2022-02-22 12:18:07 +01:00
ogerly	f23b9431e8	add avatar icon for deleted user, all other icons are hidden	2022-02-22 12:18:07 +01:00
ogerly	f19aaa5806	change elopage img in greyscale, remove unused code	2022-02-22 12:18:07 +01:00
ogerly	047b990c9c	change status danger icon to avatars, add elopage icon as img	2022-02-22 12:18:07 +01:00
ogerly	d7b3e94343	change icon managment in adminarea nutzersuche	2022-02-22 12:18:07 +01:00
ogerly	fc3d7e2cbb	add in backend function unDeleteUser()	2022-02-22 12:18:07 +01:00
ogerly	fed3562e4d	add in backend function deleteUser()	2022-02-22 12:18:06 +01:00
ogerly	09258eb57a	rename disabled to deleted	2022-02-22 12:18:06 +01:00