14869 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	740b5cc83f	admin: rename dist folder to build	2023-05-08 11:45:14 +02:00
mahula	74f5cc2df1	fix typos	2023-05-08 11:14:15 +02:00
clauspeterhuebner	153fec8479	Merge branch 'master' into 2913-feature-mirgate-transactions-table-for-x-community-sendcoins	2023-05-08 11:05:11 +02:00
Claus-Peter Huebner	0cd2b7646d	rework PR-comments	2023-05-08 11:03:01 +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
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
Claus-Peter Huebner	6346ae0225	linting	2023-05-05 15:33:14 +02:00
clauspeterhuebner	c32af153e8	Merge branch 'master' into 2946-feature-x-com-3-introduce-business-communities	2023-05-05 15:20:01 +02:00
Claus-Peter Huebner	df0df73335	rework PR-comments	2023-05-05 15:17:31 +02:00
Ulf Gebhardt	2286700b83	fix e2e test	2023-05-05 14:20:30 +02:00
Ulf Gebhardt	44afa8d1f3	Merge branch 'master' into 2892-Frontend-multiple-auto-logout-messages	2023-05-05 14:11:39 +02:00
Ulf Gebhardt	6c95541c46	Merge branch 'master' into fix-store-problems	2023-05-05 13:49:44 +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
elweyn	ebde17297e	Merge branch 'refactor-klicktipp-controller' of https://github.com/gradido/gradido into refactor-klicktipp-controller	2023-05-05 13:36:02 +02:00
elweyn	4de3daf12d	Remove unused method.	2023-05-05 13:35:48 +02:00
mahula	67d1ae7d1b	update jest-canvas-mock version to resolve window mock problem in tests	2023-05-05 13:26:16 +02:00
Hannes Heine	4968adaadd	Merge branch 'master' into refactor-klicktipp-controller	2023-05-05 13:14:51 +02:00
elweyn	64d0200f99	Rename klicktippSignIn to subscribe.	2023-05-05 13:11:36 +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
Ulf Gebhardt	569b887f14	Merge branch 'master' into fix-store-problems	2023-05-05 12:58:56 +02:00
Ulf Gebhardt	2cc45d23f7	fix between store problems	2023-05-05 12:44:42 +02:00
Hannes Heine	76c627b177	Merge branch 'master' into federation-docker-nodemon	2023-05-05 12:37:23 +02:00
Hannes Heine	7429943060	Merge branch 'master' into 2878-trigger-export-klicktipp	2023-05-05 12:35:19 +02:00
elweyn	466ace75cd	Remove update of cypress version of this pr.	2023-05-05 12:23:44 +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
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
Claus-Peter Huebner	6771a4cbef	remove detailed logging of graphql-request-error	2023-05-05 01:08:18 +02:00