12310 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elweyn	c79d186a45	Log error when contribution is in the wrong state. Write full content in changeMessage.	2022-11-07 10:32:26 +01:00
Hannes Heine	b98e8edd42	Merge branch 'master' into 2140-add-updated-at-to-contributions	2022-11-07 10:21:33 +01:00
Hannes Heine	bb5b5fe739	Merge branch 'master' into 2272-send-email-for-rejected-contributions	2022-11-07 10:19:18 +01:00
elweyn	c2fc4feb6a	Call method to send Email if contribution is rejected.	2022-11-07 10:11:14 +01:00
elweyn	225119c8ab	Test that the email is build correctly.	2022-11-07 10:10:28 +01:00
elweyn	0192a45346	Build and send email for rejected contributions.	2022-11-07 10:09:49 +01:00
elweyn	d092bd0068	German email template for rejected contributions.	2022-11-07 10:08:23 +01:00
ogerly	47415e3195	refactor grid ride side system	2022-11-04 18:13:23 +01:00
mahula	3145571727	Merge pull request #2336 from gradido/2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time ... Refactor: GitHub test workflow - disable video recording and reduce wait time	2022-11-04 14:21:47 +01:00
mahula	5297ffaf40	Merge branch 'master' into 2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time	2022-11-04 14:08:56 +01:00
clauspeterhuebner	a460bbef20	Merge pull request #2289 from gradido/2274-feature-concept-manuel-user-registration-for-admins ... 2274 feature concept manuel user registration for admins	2022-11-04 14:06:14 +01:00
mahula	ceedc49063	Merge branch 'master' into 2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time	2022-11-04 13:43:47 +01:00
Ulf Gebhardt	070c58987c	remove github from scope list	2022-11-04 13:01:28 +01:00
Ulf Gebhardt	ece96e1933	include all prs	2022-11-04 12:57:15 +01:00
Ulf Gebhardt	5027f2030e	fix	2022-11-04 12:54:55 +01:00
Ulf Gebhardt	882e8b5304	lint_pr workflow	2022-11-04 12:53:29 +01:00
mahula	668546e49f	github workflow: remove branch specific trigger	2022-11-04 12:19:36 +01:00
mahula	dbdb0f4221	github workflow: set nginx building job after jobs for frontend, backend, and admin interface	2022-11-04 11:19:49 +01:00
mahula	958b681e94	github workflow: reuse system images build in previuos jobs	2022-11-04 11:12:44 +01:00
mahula	ece9e21aaf	github workflow: restructure system boot uo steps and reduce wait time	2022-11-04 11:10:50 +01:00
mahula	0a02a96885	github workflow: set reqiured image names in docker-compose.test.yml	2022-11-04 11:01:20 +01:00
ogerly	42c87839a2	sidebar menu position	2022-11-04 08:10:04 +01:00
ogerly	8b3525adcb	refactor template grid	2022-11-03 20:31:17 +01:00
Moriz Wahl	2e070cef7b	remove stupid comments	2022-11-03 20:05:57 +01:00
Moriz Wahl	2746c4718a	test apollo client with apollo client mock library	2022-11-03 19:53:24 +01:00
Alexander Friedland	60b3b8bbcc	Merge branch 'master' into 2303-Allow-the-admin-to-edit-automatic-contribution-link	2022-11-03 15:22:46 +01:00
clauspeterhuebner	70c5104e0c	Merge branch 'master' into 2274-feature-concept-manuel-user-registration-for-admins	2022-11-03 14:49:55 +01:00
Moriz Wahl	a8247da3d4	use apollo correctly	2022-11-03 14:24:09 +01:00
ogerly	8450075135	Merge branch '2004-Basic-Menu' into 2290-New-Design	2022-11-03 13:52:44 +01:00
ogerly	da9457be35	refactor struktur app, mainpage, flex and positions	2022-11-03 13:51:58 +01:00
ogerly	b8cb5e9c7f	Merge branch '2004-Basic-Menu' into 2290-New-Design	2022-11-03 13:02:48 +01:00
ogerly	95b0185de1	lightning and dark mode prepared	2022-11-03 13:02:02 +01:00
Moriz Wahl	0ba82d66fe	fix: Update Contribution List after Admin Updates Contribution	2022-11-03 13:01:02 +01:00
Hannes Heine	fb92cf9ed6	Merge branch 'master' into 2140-add-updated-at-to-contributions	2022-11-03 09:45:09 +01:00
elweyn	b3fd53ab7a	Change the display of the history message.	2022-11-03 08:35:26 +01:00
ogerly	28f67cbbf7	fix test	2022-11-03 07:56:40 +01:00
clauspeterhuebner	1bdb41f3a2	Merge pull request #2252 from gradido/1574-Concept_to_introduce_Gradido-ID ... 1574 concept to introduce gradidoID and change password encryption	2022-11-02 22:52:24 +01:00
clauspeterhuebner	64fb98de4a	Merge branch 'master' into 1574-Concept_to_introduce_Gradido-ID	2022-11-02 22:39:18 +01:00
Claus-Peter Hübner	c4ccc02828	finished	2022-11-02 22:24:27 +01:00
Claus-Peter Hübner	0a70a1f047	Merge branch '2274-feature-concept-manuel-user-registration-for-admins' of github.com:gradido/gradido into 2274-feature-concept-manuel-user-registration-for-admins	2022-11-02 18:47:07 +01:00
Claus-Peter Hübner	dba98e316d	Merge remote-tracking branch 'origin/master' into 2274-feature-concept-manuel-user-registration-for-admins	2022-11-02 18:45:38 +01:00
clauspeterhuebner	917eb0a5b0	Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month	2022-11-02 17:45:11 +01:00
mahula	d2f80e27c4	github workflow: restructure e2e steps for runtime reduction	2022-11-02 17:36:40 +01:00
jjimenezgarcia	afed8c94ea	Merge branch 'master' into logger-error-cleaning-history	2022-11-02 16:46:52 +01:00
clauspeterhuebner	694963c2e1	Merge pull request #2241 from gradido/2224-feature-concept-extend-contributionlink-rules-and-logic-abraham ... contributionlink stage-2 and stage-3 of capturing and activation	2022-11-02 16:36:02 +01:00
jjimenezgarcia	d693f5f025	Merge branch 'master' into logger-error-cleaning-history	2022-11-02 15:22:30 +01:00
clauspeterhuebner	3e530dc2ef	Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham	2022-11-02 14:45:02 +01:00
ogerly	c9fc3e61f5	fix stylelint	2022-11-02 14:37:46 +01:00
Alexander Friedland	c12b9af504	Merge branch 'master' into 2290-New-Design	2022-11-02 14:09:55 +01:00
ogerly	1607bed006	resolve conflicts	2022-11-02 14:08:02 +01:00