3713 Commits

Author	SHA1	Message	Date
Moriz Wahl	c42ee8d264	Merge branch 'master' into no-email-in-user	2023-05-08 08:55:18 +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
Ulf Gebhardt	4f0910baf1	jwt functions are async now, await them	2023-05-05 17:19:28 +02:00
Ulf Gebhardt	36d40cbe40	new jwt functions	2023-05-05 17:19:15 +02:00
Ulf Gebhardt	4e78dcddc1	install jose, remove jsonwebtoken	2023-05-05 17:18:53 +02:00
elweyn	b8e015db22	Remove unused method.	2023-05-05 16:17:47 +02:00
elweyn	4de3daf12d	Remove unused method.	2023-05-05 13:35:48 +02:00
elweyn	64d0200f99	Rename klicktippSignIn to subscribe.	2023-05-05 13:11:36 +02:00
Hannes Heine	f13cb3f26d	Merge branch 'master' into 2876-add-fields-to-subscriber	2023-05-05 11:44:15 +02:00
elweyn	8c31fc5789	Remove test code to find out the data of the fields.	2023-05-05 11:34:29 +02:00
elweyn	225f41fbbf	Remove unused test method.	2023-05-05 11:34:04 +02:00
elweyn	4a6a4376ec	Merge master in here.	2023-05-05 11:26:31 +02:00
Ulf Gebhardt	d3ba23e1e4	fix lint	2023-05-04 22:54:38 +02:00
Ulf Gebhardt	97b3a88065	86% line coverage	2023-05-04 22:54:38 +02:00
Ulf Gebhardt	6c7243758f	fix tests	2023-05-04 22:54:38 +02:00
Ulf Gebhardt	cd7cef4fbf	typo	2023-05-04 22:54:38 +02:00
Ulf Gebhardt	2abf228ca9	merge	2023-05-04 22:53:55 +02:00
Ulf Gebhardt	2d03ae938a	merge conflict	2023-05-04 22:50:06 +02:00
Ulf Gebhardt	c8ef6be2cd	Merge branch 'master' into refactor_federation_clients	2023-05-04 22:50:01 +02:00
Claus-Peter Huebner	3434c6a34f	Merge remote-tracking branch 'origin/master' into ... 2913-feature-mirgate-transactions-table-for-x-community-sendcoins	2023-05-04 20:39:53 +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
elweyn	77acaabe27	Fix linting rules.	2023-05-04 15:29:19 +02:00
Hannes Heine	ca8fd4c494	Merge branch 'master' into 2878-trigger-export-klicktipp	2023-05-04 14:58:56 +02:00
Hannes Heine	4c452e3529	Merge branch 'master' into 2876-add-fields-to-subscriber	2023-05-04 14:31:44 +02:00
Ulf Gebhardt	0a6c29bca3	variables must be transmitted due to backward compatibility	2023-05-04 11:28:53 +02:00
Hannes Heine	b4a497e158	Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe	2023-05-04 11:28:42 +02:00
elweyn	bf0eabae98	Remove unused import	2023-05-04 11:26:04 +02:00
Ulf Gebhardt	950ff2f9b6	lint	2023-05-04 02:01:45 +02:00
Ulf Gebhardt	d636f92261	fix problem in federation when variables are not defined	2023-05-04 01:57:43 +02:00
Ulf Gebhardt	1fa3396396	externalize the graphql query	2023-05-04 01:55:14 +02:00
Ulf Gebhardt	81552e51dd	properly reuse graphql client	2023-05-04 01:51:36 +02:00
Ulf Gebhardt	1c6142220f	rename getPublicKey function	2023-05-04 01:40:50 +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
clauspeterhuebner	65aaba9d9e	Merge branch 'master' into 2913-feature-mirgate-transactions-table-for-x-community-sendcoins	2023-05-04 00:24:20 +02:00
elweyn	5d4d7dfa05	Merge master in here.	2023-05-03 14:09:04 +02:00
Ulf Gebhardt	4850923f17	variables must be defined	2023-05-03 13:29:56 +02:00
Ulf Gebhardt	8c76de3ee5	try fixing auth tests by reverting header token change	2023-05-03 13:07:54 +02:00
Ulf Gebhardt	d3a2df2878	remove obsolete function	2023-05-03 13:03:27 +02:00
Ulf Gebhardt	870c97ce71	rfactor federation clients	2023-05-03 13:02:32 +02:00