11499 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mahula	ac32c3a6d5	Merge pull request #2471 from gradido/2435-bug-when-undeleting-an-user-two-success-toasts ... fix(admin): reduce triggers of success toast on deleted user form to exactly one	2022-12-22 09:34:28 +01:00
mahula	e45e022233	Merge branch 'master' into 2435-bug-when-undeleting-an-user-two-success-toasts	2022-12-20 08:01:23 +01:00
mahula	8f73e76e4f	Merge pull request #2470 from gradido/2457-refactor-move-nginx-docker-build-back-to-first-row-in-workflow ... refactor(other): build nginx docker image in workflow independent of other builds	2022-12-19 22:30:40 +01:00
mahula	3d220a99f5	remove success toast from deleted user form	2022-12-16 16:38:48 +01:00
mahula	b7ba244f28	remove unnecessary build dependencies from nginx in github test workflow	2022-12-16 14:32:49 +01:00
Moriz Wahl	e4e698b082	Merge pull request #2467 from gradido/release-v1.16.0 ... feat(release): version 1.16.0	2022-12-15 18:31:22 +01:00
Moriz Wahl	78a780568a	feat(release): version 1.16.0	2022-12-15 17:07:35 +01:00
jjimenezgarcia	a15b985c82	Merge pull request #2426 from gradido/clear-old-password-junk ... refactor(backend): cleaning user related old password junk	2022-12-15 16:12:44 +01:00
Moriz Wahl	1320c962ac	Merge branch 'clear-old-password-junk' of github.com:gradido/gradido into clear-old-password-junk	2022-12-15 13:04:48 +01:00
Moriz Wahl	ce0e306284	remove unused import	2022-12-15 13:03:23 +01:00
Moriz Wahl	873076ebfc	remove unused import	2022-12-15 13:02:19 +01:00
Moriz Wahl	88eeed7530	Merge branch 'master' into clear-old-password-junk	2022-12-15 12:56:34 +01:00
Moriz Wahl	2233bd9b84	Merge pull request #2453 from gradido/consistent-transaction-table ... fix(database): consistent transaction table	2022-12-15 12:29:18 +01:00
Ulf Gebhardt	97b169da2e	properly typecast and do thing right	2022-12-15 11:49:28 +01:00
Ulf Gebhardt	8afd66088d	Merge branch 'master' into consistent-transaction-table	2022-12-15 11:27:31 +01:00
Ulf Gebhardt	00a7ac4eb5	deleted old comment	2022-12-15 11:18:31 +01:00
Ulf Gebhardt	59b40bf44d	Merge branch 'master' into clear-old-password-junk ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.ts	2022-12-15 11:17:45 +01:00
Ulf Gebhardt	243fdc16c7	Merge pull request #2416 from gradido/dissolve_admin_resolver ... refactor(backend): dissolve admin resolver	2022-12-14 17:48:28 +01:00
joseji	798051f360	docker error solved	2022-12-14 00:10:55 +01:00
Moriz Wahl	1229a7f7df	change database version	2022-12-13 22:14:06 +01:00
Moriz Wahl	0bcd441837	rename migrations and entity number	2022-12-13 21:26:32 +01:00
joseji	9b97b6c40e	removed text files regarding passphrase	2022-12-13 21:16:57 +01:00
Moriz Wahl	b52c62749c	include user contact in user context object	2022-12-13 21:07:12 +01:00
Moriz Wahl	7b8d4e5c85	update database version	2022-12-13 20:54:07 +01:00
Moriz Wahl	35f9157f41	Merge branch 'master' into clear-old-password-junk	2022-12-13 20:52:06 +01:00
Moriz Wahl	7470a80818	Merge branch 'master' into consistent-transaction-table	2022-12-13 20:31:13 +01:00
Ulf Gebhardt	330f85e04e	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/AdminResolver.ts	2022-12-13 16:20:30 +01:00
Moriz Wahl	6e766fa76c	Merge pull request #2418 from gradido/test-validation-of-optin-codes ... fix(backend): email verification code never expired	2022-12-13 16:17:03 +01:00
Moriz Wahl	02656ee117	fix tests after merge	2022-12-13 15:49:41 +01:00
Moriz Wahl	98742c0db1	Merge branch 'master' into test-validation-of-optin-codes	2022-12-13 14:57:15 +01:00
Ulf Gebhardt	f2dadcd93d	Merge branch 'master' into consistent-transaction-table	2022-12-13 10:13:34 +01:00
Hannes Heine	4be546c68e	Merge branch 'master' into dissolve_admin_resolver	2022-12-13 09:01:44 +01:00
Moriz Wahl	907cd03ab8	Merge pull request #2451 from gradido/consistent-user-contacts-table ... fix(database): consistent deleted at bewteen users and user contacts	2022-12-12 14:58:51 +01:00
Moriz Wahl	04c88a743b	Merge branch 'master' into consistent-user-contacts-table	2022-12-12 13:50:40 +01:00
Moriz Wahl	82d92d9223	Merge branch 'consistent-user-contacts-table' into consistent-transaction-table	2022-12-12 12:46:46 +01:00
Moriz Wahl	61899579aa	Merge pull request #2454 from gradido/log-client-timezone-offset ... feat(backend): log client timezone offset	2022-12-12 12:45:47 +01:00
Moriz Wahl	c449e41cfb	update only by SQL, thanks @ulfgebhardt	2022-12-12 12:45:17 +01:00
Ulf Gebhardt	a82e1877a8	Merge branch 'master' into log-client-timezone-offset	2022-12-09 14:14:23 +01:00
Ulf Gebhardt	052f31d8ec	lint	2022-12-09 14:10:46 +01:00
Ulf Gebhardt	7638d29052	merge	2022-12-09 14:09:43 +01:00
Ulf Gebhardt	903fe56f60	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/AdminResolver.test.ts # backend/src/graphql/resolver/AdminResolver.ts # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.ts	2022-12-09 14:09:33 +01:00
Wolfgang Huß	70a3b1bc7e	Merge pull request #2398 from gradido/2392-refactor-more-emails-to-translatables ... refactor(backend): refactor more emails to translatables	2022-12-09 13:12:55 +01:00
Ulf Gebhardt	486777cb35	Merge branch 'master' into 2392-refactor-more-emails-to-translatables	2022-12-09 12:59:59 +01:00
Moriz Wahl	effa58d767	Merge pull request #2444 from gradido/fix-delete-email-contact ... fix(backend): delete / undelete email contact as well	2022-12-08 19:47:29 +01:00
Moriz Wahl	61ecfa22fd	Merge branch 'master' into log-client-timezone-offset	2022-12-08 19:13:26 +01:00
Moriz Wahl	c8fa84ac11	Merge branch 'master' into consistent-user-contacts-table	2022-12-08 19:12:49 +01:00
Moriz Wahl	3051d8f070	Merge branch 'master' into fix-delete-email-contact	2022-12-08 19:11:18 +01:00
Moriz Wahl	cbb688112f	Update backend/src/graphql/resolver/AdminResolver.test.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-12-08 19:11:09 +01:00
Moriz Wahl	bd3f05d6c8	Update backend/src/graphql/resolver/AdminResolver.test.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-12-08 19:11:01 +01:00
Moriz Wahl	7174bec2f3	Merge branch 'master' into test-validation-of-optin-codes	2022-12-08 19:10:21 +01:00