6840 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	2f9cb42428	Update frontend/src/i18n.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-02-21 11:52:59 +01:00
Ulf Gebhardt	d715fd9c2f	also set user.id as involved User on a creation	2022-02-21 01:49:53 +01:00
Ulf Gebhardt	3040992c51	fix query to use proper field	2022-02-21 01:46:01 +01:00
Ulf Gebhardt	270ccbf1cf	removed unused symbol	2022-02-21 01:23:58 +01:00
Ulf Gebhardt	acc49581cb	more refactors, fixed some todos and simplified things	2022-02-21 01:16:15 +01:00
Ulf Gebhardt	2d0d02c7f6	lots of refacoting in TransactionResolver	2022-02-21 01:01:57 +01:00
Ulf Gebhardt	9574af9278	removed balance & transaction repository since its no longer needed	2022-02-21 00:38:39 +01:00
Ulf Gebhardt	e1034cb1fd	fixed data conversion error on sendCoins	2022-02-21 00:18:08 +01:00
Ulf Gebhardt	70a0a2664b	properly use js array operators (find)	2022-02-20 13:21:12 +01:00
Ulf Gebhardt	c9424361a6	simplified query and also include withDeleted to show the name of an user marked as deleted	2022-02-20 13:20:13 +01:00
Ulf Gebhardt	ecfcde8dd4	simplified query	2022-02-20 12:56:10 +01:00
Ulf Gebhardt	babe2b4930	wtf, this stopped working for me? Why?	2022-02-20 12:54:20 +01:00
Ulf Gebhardt	fc0675c461	updated database version in backend	2022-02-20 12:01:52 +01:00
Ulf Gebhardt	0c15bed74e	backend is buildable	2022-02-20 04:46:36 +01:00
Ulf Gebhardt	93ec25f72f	remove comment	2022-02-20 04:27:31 +01:00
Ulf Gebhardt	c88b67faa4	removed length properties and define nullable userId as int	2022-02-20 04:15:14 +01:00
Ulf Gebhardt	281a4fbc9b	fixed lint warning	2022-02-20 04:06:18 +01:00
Ulf Gebhardt	9ba7d6341a	fixed lint warning	2022-02-20 04:06:08 +01:00
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