12533 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
clauspeterhuebner	cc1d571435	Merge branch 'master' into 2632-feature-dockerfile-for-federation	2023-02-09 17:38:28 +01:00
Alexander Friedland	6deb7e2c20	Merge pull request #2638 from gradido/2604-Text-Generate-Link-incorrect ... refactor(frontend): change text for gdd_per_link.choose-amount	2023-02-09 17:35:02 +01:00
Alexander Friedland	b936141de3	Merge branch 'master' into 2604-Text-Generate-Link-incorrect	2023-02-09 17:16:18 +01:00
Claus-Peter Hübner	0473a7df81	rework PR-comments	2023-02-09 17:08:50 +01:00
Ulf Gebhardt	51f25a1527	Merge pull request #2688 from gradido/2624-bug-emails-for-deny-and-delete-contribution ... fix(backend): emails for deny and delete contribution	2023-02-09 16:01:32 +01:00
Ulf Gebhardt	894cf7f3ab	Merge branch 'master' into 2624-bug-emails-for-deny-and-delete-contribution	2023-02-09 15:31:23 +01:00
Claus-Peter Hübner	7b5e17a692	Merge branch '2632-feature-dockerfile-for-federation' of github.com:gradido/gradido into 2632-feature-dockerfile-for-federation	2023-02-09 14:57:58 +01:00
Claus-Peter Hübner	225e8922f4	Merge remote-tracking branch 'origin/master' into 2632-feature-dockerfile-for-federation	2023-02-09 14:38:06 +01:00
Ulf Gebhardt	e46d39735e	Merge pull request #2686 from gradido/remove_config_version_from_env_dist ... refactor(other): remove config version from `.env.dist`	2023-02-09 14:31:18 +01:00
Ulf Gebhardt	4a023255d4	Merge branch 'master' into remove_config_version_from_env_dist	2023-02-09 14:19:53 +01:00
Ulf Gebhardt	a783f83ed3	Merge pull request #2663 from gradido/logger_contributionMessageResolver ... refactor(backend): use LogError on contributionMessageResolver	2023-02-09 14:07:10 +01:00
Ulf Gebhardt	a04a498882	remove config version from all .env.dist	2023-02-09 14:02:11 +01:00
Ulf Gebhardt	163c840446	remove config version from .env.dist	2023-02-09 14:00:23 +01:00
Ulf Gebhardt	48f3802fe9	Merge branch 'master' into logger_contributionMessageResolver	2023-02-09 13:49:40 +01:00
Moriz Wahl	7ae99bf42b	set config federation api in unit tests	2023-02-09 13:28:03 +01:00
Moriz Wahl	f35aab3504	get unit tests running	2023-02-09 13:20:21 +01:00
Claus-Peter Hübner	3015fb39e1	additional tests files	2023-02-08 23:18:23 +01:00
Claus-Peter Hübner	10957fddfc	additional files to buildup test-environment, don't know if complette	2023-02-08 23:17:48 +01:00
Claus-Peter Hübner	8e85705b9e	remove jest.mock('@/config')	2023-02-08 22:29:20 +01:00
Claus-Peter Hübner	ae9279357b	Merge remote-tracking branch 'origin/master' into 2632-feature-dockerfile-for-federation	2023-02-08 21:53:55 +01:00
mahula	7fa34ab56a	adapt unit tests tu changes on email variants in backend	2023-02-08 18:17:14 +01:00
Moriz Wahl	29a70a556c	Merge pull request #2668 from gradido/refactor-last-transaction ... refactor(backend): get last transaction by only one function	2023-02-08 16:29:34 +01:00
Moriz Wahl	036d335426	Merge branch 'master' into refactor-last-transaction	2023-02-08 15:51:05 +01:00
Hannes Heine	2892e8dfee	Merge pull request #2667 from gradido/do-not-compile-for-test-changes ... refactor(other): don't rebuild modul if unit test file has been changed	2023-02-08 14:24:52 +01:00
mahula	b4b180a1d1	remove commented unused code	2023-02-08 13:39:42 +01:00
mahula	687ae6e877	remove commented unused code	2023-02-08 13:22:44 +01:00
Moriz Wahl	f5d9866644	remove accessLayer folder	2023-02-08 10:33:53 +01:00
Hannes Heine	5baa1bf4c3	Merge branch 'master' into do-not-compile-for-test-changes	2023-02-08 10:09:57 +01:00
mahula	01cca65dea	finish denyContribution method in contribution resolver	2023-02-08 08:46:36 +01:00
mahula	274bd8b864	set correct locale key in contribution deleted email template	2023-02-08 08:39:11 +01:00
mahula	cf9b06824b	set right to deny a contribution	2023-02-08 08:37:49 +01:00
Claus-Peter Hübner	dcd7e0b7c3	unit test, but is not working	2023-02-08 00:38:10 +01:00
Claus-Peter Hübner	42e2ac4877	linting	2023-02-07 23:47:22 +01:00
Claus-Peter Hübner	0d0d361358	docker and workflow files	2023-02-07 23:34:11 +01:00
mahula	0b1d6b5237	add deying to events and event protocol	2023-02-07 21:56:32 +01:00
mahula	2fc2ecf5af	WIP add elements to get contribution denying working in backend	2023-02-07 21:46:44 +01:00
mahula	5c42ec828a	fix admin right to deny confirmation	2023-02-07 21:40:02 +01:00
mahula	f980ca20b1	adapt backend's email sending to added deletion email	2023-02-07 21:11:34 +01:00
mahula	bd9307612f	adapt backend locales to changes regarding denying and deleting contributuins	2023-02-07 21:10:35 +01:00
mahula	9c282c0142	add email template for deleted contributions	2023-02-07 21:09:16 +01:00
Ulf Gebhardt	0b8ac928cf	more detailed error messages	2023-02-07 18:24:20 +01:00
Ulf Gebhardt	ff335d81f3	Merge branch 'master' into logger_contributionMessageResolver	2023-02-07 15:17:17 +01:00
Ulf Gebhardt	36e8e2c38d	Merge pull request #2662 from gradido/logger_contributionLinkResolver ... refactor(backend): use LogError on contributionLinkResolver	2023-02-07 15:16:57 +01:00
Ulf Gebhardt	a04d4d3985	remove empty string check since we do a length check on memeo & name	2023-02-07 11:01:35 +01:00
Ulf Gebhardt	db1ed715ca	Merge branch 'master' into logger_contributionLinkResolver	2023-02-07 10:59:40 +01:00
elweyn	e706a3c844	Merge branch 'do-not-compile-for-test-changes' of https://github.com/gradido/gradido into do-not-compile-for-test-changes	2023-02-07 07:10:15 +01:00
elweyn	8544eb51e9	Fix some lint problems.	2023-02-07 07:10:01 +01:00
Hannes Heine	78a83dd87d	Merge branch 'master' into do-not-compile-for-test-changes	2023-02-07 07:07:20 +01:00
Ulf Gebhardt	078a7432bb	Merge pull request #2670 from gradido/event_protocol_remove_config_switch ... refactor(backend): remove event protocol config switch	2023-02-07 01:43:11 +01:00
Ulf Gebhardt	151f381d94	fix config aggregation on dht-node & backend	2023-02-07 00:29:07 +01:00