6491 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	0b39620f99	updated database requirement	2022-02-23 22:44:10 +01:00
Ulf Gebhardt	4ada6ea182	Merge branch 'master' into combine_transaction_tables2	2022-02-23 22:35:57 +01:00
Ulf Gebhardt	c113e75edd	removed unused include	2022-02-23 22:35:31 +01:00
Ulf Gebhardt	b02076fa49	combined functions	2022-02-23 22:20:20 +01:00
Ulf Gebhardt	6f36906723	removed unnecessary code	2022-02-23 22:17:56 +01:00
Ulf Gebhardt	f10029441c	refactor as transaction type as switch	2022-02-23 22:01:43 +01:00
Ulf Gebhardt	7a837be7b2	backend is building	2022-02-23 21:46:40 +01:00
Ulf Gebhardt	ebde61c664	corrected type to BigInt	2022-02-23 21:46:02 +01:00
Alexander Friedland	6de3136613	Merge pull request #1520 from gradido/test-softdeleted ... [Feature] : user deleted and undeleted functions for adminarea	2022-02-23 21:16:48 +01:00
Moriz Wahl	5fccc66126	Merge branch 'master' into test-softdeleted	2022-02-23 18:13:07 +01:00
Moriz Wahl	b557a17a1e	Merge pull request #1530 from gradido/fix-possible-sql-error ... fix: Possible SQL Exception in User Search	2022-02-23 18:11:09 +01:00
Moriz Wahl	567cde0c8a	coverage admin interface to 95%	2022-02-23 18:05:44 +01:00
Moriz Wahl	993b896da8	test new Search User Table	2022-02-23 18:04:50 +01:00
Moriz Wahl	980d3cf96a	test delete user component	2022-02-23 17:24:24 +01:00
Moriz Wahl	0bc96b35ca	Merge branch 'master' into fix-possible-sql-error	2022-02-23 16:22:31 +01:00
Ulf Gebhardt	4bb9f12783	fixed database build	2022-02-23 15:52:13 +01:00
Ulf Gebhardt	ab1df1c35d	updated entities	2022-02-23 15:14:24 +01:00
Ulf Gebhardt	f55e9f49b7	migrate the database state_user_transactions + transactions -> transactions	2022-02-23 15:00:34 +01:00
ogerly	15b2bc30f7	add DeletedUserFormular.spec.js for tests	2022-02-23 14:12:10 +01:00
ogerly	cd4a326ab7	Removing another code where no one knows where it comes from	2022-02-23 13:32:38 +01:00
ogerly	ff63706f51	Removing code where no one knows where it comes from	2022-02-23 13:14:29 +01:00
Alexander Friedland	b4d756d941	Merge branch 'master' into test-softdeleted	2022-02-23 13:02:33 +01:00
Ulf Gebhardt	48b18bc6be	corrected comment	2022-02-23 12:27:54 +01:00
Ulf Gebhardt	a56da5b9f0	Merge pull request #1529 from gradido/lint_warnings_are_evil ... Feature: Make lint warnings unwanted	2022-02-23 12:24:17 +01:00
Ulf Gebhardt	a23409602b	Merge branch 'master' into lint_warnings_are_evil	2022-02-23 12:16:57 +01:00
ogerly	bb3da3b088	class pointer on row and scroll to ref by click in table row	2022-02-23 11:48:27 +01:00
Moriz Wahl	a35aa0158c	Merge branch 'test-softdeleted' of github.com:gradido/gradido into test-softdeleted	2022-02-23 11:16:38 +01:00
Moriz Wahl	b8265924c8	make whole table row clickable	2022-02-23 11:15:05 +01:00
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
Moriz Wahl	57e9e825f1	fix: Possible SQL Exception in User Search	2022-02-23 08:18:06 +01:00
Ulf Gebhardt	0607731b1a	disallow warnings on frontend & admin	2022-02-23 00:41:41 +01:00
Ulf Gebhardt	a054c0ce26	disallow lint warnings on backend, fix warning	2022-02-23 00:41:25 +01:00
Ulf Gebhardt	a896c9eb8c	disallow warnings on database and fix all lint warnings	2022-02-23 00:41:04 +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