6385 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	09258eb57a	rename disabled to deleted	2022-02-22 12:18:06 +01:00
ogerly	9f4762647b	add deletedUser and unDeleteUser function in admin frontend	2022-02-22 12:18:06 +01:00
ogerly	0de018b296	Merge branch 'user_soft_delete_backend' into test-softdeleted	2022-02-22 12:18:06 +01:00
einhornimmond	dea26287ad	Merge pull request #1472 from gradido/admin_user_search_optimization ... Admin: Langsame Benutzer-Suche	2022-02-21 19:33:22 +01:00
einhornimmond	e64705d906	Merge branch 'master' into admin_user_search_optimization	2022-02-21 17:10:44 +01:00
Moriz Wahl	5efb7115de	Merge pull request #1513 from gradido/backend-tests-running-again ... fix: Backend Unit Tests Running Again	2022-02-21 16:02:28 +01:00
Moriz Wahl	b9c3e9c146	coverage backend to 48%	2022-02-21 15:48:36 +01:00
Moriz Wahl	72643b4346	wait for frontend image in CI for unit tests	2022-02-21 15:38:53 +01:00
Moriz Wahl	52d58afaf4	try frontend unot tests without build	2022-02-21 15:36:32 +01:00
Moriz Wahl	38d5eda9d2	set timeoute to 10000	2022-02-21 15:24:36 +01:00
Moriz Wahl	08b9abdfab	CI test backend without backend.tar dependency	2022-02-21 15:16:25 +01:00
Moriz Wahl	fb78a71f06	remove CI deelopment test target	2022-02-21 15:13:44 +01:00
Moriz Wahl	09a0f8abfd	coverage backend to 47%	2022-02-21 14:58:06 +01:00
Moriz Wahl	1f3c9d3908	get user resolver test running again	2022-02-21 14:57:16 +01:00
Moriz Wahl	8d9228aab8	ensure mnemomic type files are copied to build	2022-02-21 14:30:06 +01:00
Moriz Wahl	970216b2fc	Merge branch 'master' into backend-tests-running-again	2022-02-21 13:24:42 +01:00
einhornimmond	c3d3929ac6	Update backend/src/graphql/resolver/AdminResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-02-21 13:23:04 +01:00
Ulf Gebhardt	e0b253b7c2	Merge pull request #1523 from gradido/combine_transaction_tables ... Refactor: Combine transaction tables	2022-02-21 13:21:13 +01:00
Ulf Gebhardt	a344011403	lint fix	2022-02-21 13:02:15 +01:00
Ulf Gebhardt	bf64de06b1	reverse is destructing	2022-02-21 13:00:20 +01:00
Ulf Gebhardt	2158728752	enum instead of value definition	2022-02-21 12:41:11 +01:00
Ulf Gebhardt	314a1b1ed4	add todo	2022-02-21 12:08:37 +01:00
einhornimmond	00d040eeb1	Merge branch 'master' into admin_user_search_optimization	2022-02-21 12:05:05 +01:00
Einhornimmond	b3523b4c63	generic filtering, prevent overfetching from db	2022-02-21 12:03:19 +01:00
Ulf Gebhardt	ea3ecbc679	admin resolver: make sure to write userId only when we create a new balance	2022-02-21 12:00:17 +01:00
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