14385 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	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
Ulf Gebhardt	2bf839f362	lint fixes	2023-05-04 22:54:38 +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
Ulf Gebhardt	14a2766256	Merge branch 'master' into federation-docker-nodemon	2023-05-04 22:42:29 +02:00
Claus-Peter Huebner	6a63e5956d	adaptions after master-merge	2023-05-04 20:48:43 +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	8bda898c82	Merge branch 'master' into 2946-feature-x-com-3-introduce-business-communities	2023-05-04 18:06:21 +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
elweyn	77acaabe27	Fix linting rules.	2023-05-04 15:29:19 +02:00
Ulf Gebhardt	59cb0ce4b9	use yarn dev for federation to autoreload on codechange	2023-05-04 14:59:38 +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
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
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