6562 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	33ce8a0799	Merge branch 'master' into combine_transaction_tables2	2022-02-28 12:21:54 +01:00
Hannes Heine	e6a2fbe6c7	Merge pull request #1541 from gradido/v1.6.6 ... v1.6.6	2022-02-28 12:15:36 +01:00
Ulf Gebhardt	ddd5c5abfb	updated changelog	2022-02-28 12:09:30 +01:00
Ulf Gebhardt	3703ce00dd	v1.6.6	2022-02-28 12:08:50 +01:00
Ulf Gebhardt	35681f1595	Merge pull request #1542 from gradido/fix_upper_case_register ... Fix: Upper case email on register breaks account	2022-02-28 12:06:56 +01:00
Ulf Gebhardt	396907ce89	also make email lowercase on email functions	2022-02-28 11:55:24 +01:00
Ulf Gebhardt	7358524168	database lint fixes	2022-02-28 11:49:06 +01:00
Ulf Gebhardt	ca3d4b87eb	trim and lower email to ensure future login will work	2022-02-28 11:49:06 +01:00
Ulf Gebhardt	fcb6b1c2d3	update database version	2022-02-28 11:49:06 +01:00
Ulf Gebhardt	7af33a5c9f	migration to convert all emails to lowercase	2022-02-28 11:49:06 +01:00
Alexander Friedland	a837fd5f60	Merge pull request #1432 from gradido/1106-first-transaction-cannot-be-expanded ... 1106 first transaction cannot be expanded	2022-02-28 11:40:18 +01:00
Alexander Friedland	5eeb870955	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-25 15:57:56 +01:00
Alexander Friedland	94e417a620	Merge pull request #1540 from gradido/1527-Redesign-the-Toaster ... added missing bootstrap scss. bootstrap/scss/bootstrap, plus more mis…	2022-02-25 15:51:59 +01:00
ogerly	3da6582a9c	fine bg color change for toast	2022-02-25 15:39:04 +01:00
ogerly	4ea2255cb7	style from App.vue in assets/scss geschoben. style for alert und toast eingefügt	2022-02-25 11:40:39 +01:00
Alexander Friedland	7b8b239279	Merge branch 'master' into 1527-Redesign-the-Toaster	2022-02-25 09:24:20 +01:00
ogerly	7f3f876ea5	added missing bootstrap scss. bootstrap/scss/bootstrap, plus more missing scss files	2022-02-25 08:54:36 +01:00
Moriz Wahl	a40552540a	Merge pull request #1533 from gradido/seed-deleted-user ... feat: Seed Deleted User	2022-02-24 12:38:45 +01:00
Moriz Wahl	adce2cb45f	Merge branch 'master' into seed-deleted-user	2022-02-24 12:23:44 +01:00
Moriz Wahl	1f47744392	Merge pull request #1534 from gradido/no-creations-for-deleted-users ... fix: No Creations for Deleted Users	2022-02-24 12:23:32 +01:00
Moriz Wahl	4332c78ace	Merge branch 'master' into no-creations-for-deleted-users	2022-02-24 12:14:24 +01:00
Moriz Wahl	805f4f95a7	Merge pull request #1535 from gradido/fix-wrong-key-name ... fix: Wrong Key Name for Recover User	2022-02-24 12:14:12 +01:00
Moriz Wahl	3c62b46907	fix: Wrong Key Name for Recover User	2022-02-24 11:20:49 +01:00
Moriz Wahl	ec143bd18f	fix: No Creations for Deleted Users	2022-02-24 11:08:30 +01:00
Moriz Wahl	953ff90ed6	seed deleted user	2022-02-24 10:31:39 +01:00
Moriz Wahl	7787093989	create Stephen Hawking	2022-02-24 10:25:31 +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
Alexander Friedland	855971872e	Merge branch 'master' into 1106-first-transaction-cannot-be-expanded	2022-02-23 13:01:17 +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