14128 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mahula	eedd3edf11	clean up email header template	2023-05-12 15:47:40 +02:00
mahula	78571e7dac	clean up email template layout	2023-05-10 11:27:06 +02:00
mahula	e49f738bac	clean up email template layout	2023-05-10 10:42:43 +02:00
mahula	ccd93a4a95	clean up locales	2023-05-10 09:57:25 +02:00
mahula	c822b2820a	fix address in footer	2023-05-10 09:17:24 +02:00
mahula	622892ffc6	fix locales	2023-05-10 09:16:34 +02:00
mahula	8c171835e1	update email template layout	2023-05-10 09:08:26 +02:00
mahula	c6cbfab68e	refine contribution related email templates	2023-05-09 17:52:53 +02:00
mahula	3f9de705a8	refine contribution related email templates	2023-05-09 17:47:57 +02:00
mahula	9fe429cfc7	refine password reset email template	2023-05-09 14:11:43 +02:00
mahula	a3a3152b1c	refine account multi registration email template	2023-05-09 14:02:24 +02:00
mahula	fae405b7ab	refine account activation email template	2023-05-09 11:36:28 +02:00
mahula	3393c59879	Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails	2023-05-08 13:12:58 +02:00
Moriz Wahl	13963f4d04	Merge pull request #2953 from gradido/no-email-in-user ... refactor(backend): no email in user	2023-05-08 12:40:06 +02:00
mahula	9ad3b704df	adapt cypress env loginQuery to changes in backend	2023-05-08 12:10:43 +02:00
mahula	74f5cc2df1	fix typos	2023-05-08 11:14:15 +02:00
mahula	7aca69aba0	Revert "add pug plugin to linter" ... This reverts commit 79a1cd22d738bfca70af825b5fcb9e231993c256.	2023-05-08 10:30:03 +02:00
Moriz Wahl	ad4418d297	test transaction list query to raise coverage	2023-05-08 09:35:14 +02:00
mahula	5139209d70	apply layout to transaction related email templates	2023-05-08 09:03:37 +02:00
Moriz Wahl	c42ee8d264	Merge branch 'master' into no-email-in-user	2023-05-08 08:55:18 +02:00
Moriz Wahl	7dbfff7bfd	Merge pull request #2952 from gradido/remove-email-in-frontend ... refactor(frontend): remove email in wallet	2023-05-08 08:54:56 +02:00
Moriz Wahl	ac33005304	Merge branch 'master' into remove-email-in-frontend	2023-05-08 08:42:06 +02:00
mahula	bfc943d10c	apply pug layout to contribution related email templates	2023-05-07 15:08:20 +02:00
mahula	79a1cd22d7	add pug plugin to linter	2023-05-07 13:53:41 +02:00
mahula	b6bb9a4fbd	remove logo iamge file	2023-05-07 13:10:32 +02:00
mahula	ea4f49bcce	update footer file	2023-05-07 13:06:16 +02:00
mahula	0cb38b3104	move greeting formula to separate pug file	2023-05-07 13:05:24 +02:00
mahula	7f8f2bc86c	move email salutation to includes	2023-05-07 13:03:58 +02:00
mahula	936798464f	apply new layout to password reset email template	2023-05-07 13:01:36 +02:00
mahula	ad0431fff3	apply new layout to multi account activation email template	2023-05-07 13:00:59 +02:00
mahula	400fe031ba	apply new layout to account activation email template	2023-05-07 13:00:34 +02:00
mahula	019ba8f43f	update backend locales	2023-05-07 12:10:03 +02:00
mahula	b226dc42f3	add pug file for greeting	2023-05-05 20:40:11 +02:00
mahula	39ecb65b25	set correct url for gradido logo in email footer	2023-05-05 20:14:16 +02:00
mahula	3ad0c23d97	Merge pull request #2974 from gradido/resolve-window-mock-problem-in-tests ... fix(frontend): update jest-canvas-mock version to resolve window mock problem in tests	2023-05-05 13:49:09 +02:00
mahula	67d1ae7d1b	update jest-canvas-mock version to resolve window mock problem in tests	2023-05-05 13:26:16 +02:00
Ulf Gebhardt	ee6c2f2231	Merge pull request #2969 from gradido/federation-docker-nodemon ... feat(federation): federation autoreload on codechange	2023-05-05 13:11:28 +02:00
Hannes Heine	76c627b177	Merge branch 'master' into federation-docker-nodemon	2023-05-05 12:37:23 +02:00
Hannes Heine	b9c0d4201b	Merge pull request #2887 from gradido/2876-add-fields-to-subscriber ... feat(backend): add fields to subscriber	2023-05-05 12:03:06 +02:00
Hannes Heine	f13cb3f26d	Merge branch 'master' into 2876-add-fields-to-subscriber	2023-05-05 11:44:15 +02:00
Ulf Gebhardt	14a2766256	Merge branch 'master' into federation-docker-nodemon	2023-05-04 22:42:29 +02:00
Hannes Heine	2df8a758fa	Merge pull request #2890 from gradido/2882-feature-distingue-communities-and-communities_federation-in-database ... feat(backend): x-com-2: distingue communities and communities_federation in database	2023-05-04 18:01:30 +02:00
Hannes Heine	464cdcf7aa	Merge branch 'master' into 2882-feature-distingue-communities-and-communities_federation-in-database	2023-05-04 17:28:09 +02:00
Ulf Gebhardt	59cb0ce4b9	use yarn dev for federation to autoreload on codechange	2023-05-04 14:59:38 +02:00
Hannes Heine	4c452e3529	Merge branch 'master' into 2876-add-fields-to-subscriber	2023-05-04 14:31:44 +02:00
Hannes Heine	3ed65fee51	Merge pull request #2886 from gradido/2785-add-events-for-subscribe-unsubscribe ... feat(backend): add event for subscribe and unsubscribe	2023-05-04 12:02:48 +02:00
Hannes Heine	b4a497e158	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-05-04 11:28:42 +02:00
Claus-Peter Huebner	b3a7781ffc	Merge remote-tracking branch 'origin/master' into ... 2882-feature-distingue-communities-and-communities_federation-in-database	2023-05-04 00:40:03 +02:00
Ulf Gebhardt	f3af9aaec1	Merge pull request #2922 from gradido/eslint-disable-more-typesafety ... refactor(backend): eslint disable more typesafety	2023-05-03 13:29:54 +02:00
Ulf Gebhardt	8c76de3ee5	try fixing auth tests by reverting header token change	2023-05-03 13:07:54 +02:00