14136 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Claus-Peter Huebner	bcb08fc0fb	correct migration after test with production data	2023-05-09 20:06:50 +02:00
Claus-Peter Huebner	864beb7914	linting	2023-05-09 18:23:21 +02:00
Claus-Peter Huebner	b87373947a	linting	2023-05-09 01:27:13 +02:00
clauspeterhuebner	920b0f6d02	Update database/migrations/0066-x-community-sendcoins-transactions_table.ts ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-05-08 17:15:06 +02:00
clauspeterhuebner	20daf80c44	Update database/migrations/0066-x-community-sendcoins-transactions_table.ts ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-05-08 17:14:55 +02:00
clauspeterhuebner	b88e5abdcf	Merge branch 'master' into 2913-feature-mirgate-transactions-table-for-x-community-sendcoins	2023-05-08 17:03:57 +02:00
clauspeterhuebner	03246bb54a	Update backend/src/util/utilities.ts ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2023-05-08 17:03:37 +02:00
Ulf Gebhardt	306c7b0c00	Merge pull request #2972 from gradido/fix-store-problems ... fix(frontend): between store problems	2023-05-08 15:51:55 +02:00
mahula	eb570ada63	Merge branch 'master' into fix-store-problems	2023-05-08 15:36:32 +02:00
Ulf Gebhardt	75974632a6	Merge pull request #2977 from gradido/delete-build-folders ... refactor(other): delete build folders	2023-05-08 15:12:32 +02:00
Ulf Gebhardt	a4ba61cccc	Merge branch 'master' into delete-build-folders	2023-05-08 14:57:01 +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
Ulf Gebhardt	b71f8c10c7	remove all build folders in start script	2023-05-08 11:47:31 +02:00
Ulf Gebhardt	60a86da5d2	corrected paths in scripts	2023-05-08 11:46:37 +02:00
Ulf Gebhardt	b9cded9162	frontend: rename dist fodler to build	2023-05-08 11:45:59 +02:00
Ulf Gebhardt	740b5cc83f	admin: rename dist folder to build	2023-05-08 11:45:14 +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
Moriz Wahl	ad4418d297	test transaction list query to raise coverage	2023-05-08 09:35:14 +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
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
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
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	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
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	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
clauspeterhuebner	65aaba9d9e	Merge branch 'master' into 2913-feature-mirgate-transactions-table-for-x-community-sendcoins	2023-05-04 00:24:20 +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
Ulf Gebhardt	9b9c0ea8cb	merge conflict	2023-05-03 12:37:29 +02:00
Ulf Gebhardt	70cf72a4c1	Merge branch 'master' into eslint-disable-more-typesafety	2023-05-03 12:37:19 +02:00
Ulf Gebhardt	cb3b800d5c	Merge pull request #2921 from gradido/eslint-disable-tests-typesafer ... refactor(backend): eslint disable tests typesafer	2023-05-03 12:23:54 +02:00
Ulf Gebhardt	239f42cfa4	Merge branch 'master' into eslint-disable-tests-typesafer	2023-05-03 11:24:56 +02:00