6562 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	6b78161182	fixed seeds	2022-02-20 04:02:05 +01:00
Ulf Gebhardt	bfde22b261	updated entities	2022-02-20 03:10:54 +01:00
Ulf Gebhardt	0bdd52989a	down migration	2022-02-20 02:51:04 +01:00
Ulf Gebhardt	9d362a6c03	combine transaction tables	2022-02-20 02:21:55 +01:00
Ulf Gebhardt	0605f7dcb0	Merge pull request #1522 from gradido/refactor_user_resolver ... Refactor: User resolver	2022-02-18 17:31:54 +01:00
Ulf Gebhardt	e27dcb27c6	Merge branch 'master' into refactor_user_resolver	2022-02-18 17:23:50 +01:00
Ulf Gebhardt	a45a6961cb	Merge pull request #1521 from gradido/user_soft_delete_backend ... feature: Soft-Delete for users (backend)	2022-02-18 17:22:56 +01:00
Ulf Gebhardt	09d15a2359	Merge branch 'master' into refactor_user_resolver	2022-02-18 17:17:57 +01:00
Ulf Gebhardt	9e31334f19	Merge branch 'master' into user_soft_delete_backend	2022-02-18 16:04:10 +01:00
Ulf Gebhardt	c81baf2722	Merge pull request #1516 from gradido/users_soft_delete ... feature: Soft-Delete for users (database only)	2022-02-18 16:01:01 +01:00
Moriz Wahl	9582710a03	Merge branch 'master' into users_soft_delete	2022-02-18 15:54:05 +01:00
Moriz Wahl	d00e7cef1f	Merge pull request #1517 from gradido/improve-decay-display ... refactor: Improve Decay Display	2022-02-18 15:42:49 +01:00
Ulf Gebhardt	264270524b	some small refactors for the user resolver: ... - stop using repositories where its not needed - removed unused function	2022-02-18 13:26:57 +01:00
Ulf Gebhardt	fc9829bc84	lint fixes	2022-02-18 13:06:28 +01:00
Ulf Gebhardt	ed09e998b9	admin: have a specific error message when trying to add a pending creation on a deleted user	2022-02-18 12:59:55 +01:00
ogerly	a1a9b77a5d	yarn test fixed	2022-02-18 12:51:47 +01:00
Ulf Gebhardt	18b7fd73d0	Admin: search for users include deleted ... remove unnecessary function	2022-02-18 12:49:56 +01:00
Ulf Gebhardt	90bdca04a6	UserResolver ... - on login have a specific message for deleted users - when trying to register also check for deleted users and prevent registration	2022-02-18 12:49:05 +01:00
Ulf Gebhardt	8eaed23af4	transactionResolver ... - remove unnecessary function - use of the enity model directly - corrected spelling - show specific error when sending to a deleted user	2022-02-18 12:47:33 +01:00
Ulf Gebhardt	4a51231bf9	admin resolver ... - use entity instead of repository - include deleted users in our query for pending transactions - throw an error when trying to add or confirm a pending transaction for a deleted user	2022-02-18 12:44:35 +01:00
ogerly	3bd9e66079	add in backend deletedAt in UserAdmin.ts and AdminResolver.ts and in AdminFrontend add deletedAt in searchUser.js	2022-02-18 12:06:18 +01:00
ogerly	9e6c8e9e76	Merge branch 'users_soft_delete' into test-softdeleted	2022-02-18 11:09:00 +01:00
Ulf Gebhardt	185c38c12a	updated database version	2022-02-18 11:02:22 +01:00
ogerly	5c8bc402f0	Merge branch '1508-En-and-disable-an-account-in-the-admin-interface' into test-softdeleted	2022-02-18 09:47:08 +01:00
ogerly	903effb164	Merge branch 'users_soft_delete' into test-softdeleted	2022-02-18 09:46:46 +01:00
ogerly	19930eec45	yarn locales fix	2022-02-18 09:33:39 +01:00
ogerly	e654b75147	change wording, deactivated to deleted	2022-02-18 09:32:41 +01:00
ogerly	671dacef53	remove unused code and icon, refactor button for filter deleted user	2022-02-18 09:27:01 +01:00
Alexander Friedland	dbebc4ba0b	Merge branch 'master' into 1459-List-Data-again-on-Confirm-Creation	2022-02-18 00:54:10 +01:00
ogerly	40bcc3ff8c	prepared the deletion of a user in the admin area.	2022-02-17 20:17:16 +01:00
Moriz Wahl	8f8c9ab534	fix tests (check for minus signs)	2022-02-17 15:58:20 +01:00
Moriz Wahl	ab33b953fb	use vue-moment again	2022-02-17 15:08:43 +01:00
Moriz Wahl	804f9837f4	linting	2022-02-17 14:07:10 +01:00
Moriz Wahl	10090756a1	avoid moment, use minus signs	2022-02-17 13:55:45 +01:00
Moriz Wahl	48435f0d8b	Merge branch 'backend-tests-running-again' of github.com:gradido/gradido into backend-tests-running-again	2022-02-17 12:33:10 +01:00
Moriz Wahl	4a5d1980a5	afterAll at top	2022-02-17 12:32:51 +01:00
Alexander Friedland	d63f93149c	Merge pull request #1515 from gradido/1466-404-Page-needs-Back-to-Login-Button ... 404 page needs back to login button	2022-02-17 10:58:18 +01:00
Ulf Gebhardt	0683ff1999	fixed backend deletedAt instead of disabled	2022-02-17 10:53:49 +01:00
ogerly	62efedeecb	make a function goback() from router go-1 in adminarea	2022-02-17 10:43:28 +01:00
ogerly	62260857c5	make a function goback() from router go-1 in frontend wallet	2022-02-17 10:43:28 +01:00
Ulf Gebhardt	864f1b085d	missing change	2022-02-17 10:42:31 +01:00
Alexander Friedland	e64ab0c4f7	Merge branch 'master' into 1466-404-Page-needs-Back-to-Login-Button	2022-02-17 10:31:31 +01:00
Alexander Friedland	9e16e66704	Merge pull request #1514 from gradido/1461-Admin-Interface-Version-Commit ... feature: show current version in admin footer	2022-02-17 10:27:11 +01:00
Ulf Gebhardt	d76798e02f	fixed factories	2022-02-17 10:08:33 +01:00
ogerly	a0b8d8266f	yarn test fixed frontend walet	2022-02-17 10:01:46 +01:00
ogerly	f677657628	yarn test fixed adminarea	2022-02-17 10:01:19 +01:00
Ulf Gebhardt	bc43c495ad	replace disabled (flag) with deletedAt (date) on users	2022-02-17 10:00:02 +01:00
ogerly	f7fa134346	yarn test fixed	2022-02-17 09:57:52 +01:00
ogerly	ed6ee0f823	add locales on back button in PageNotFound	2022-02-17 09:39:06 +01:00
ogerly	e5c9822fbe	yarn lint --fix and yarn locales fix in adminarea	2022-02-17 09:37:50 +01:00