12979 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	7fe285c79f	update database version	2023-01-26 13:14:21 +01:00
Ulf Gebhardt	aee4f47201	build docker images	2023-01-26 12:58:47 +01:00
Ulf Gebhardt	5c98947d5d	also up the database for testing	2023-01-26 12:44:20 +01:00
Ulf Gebhardt	ec53e24734	clean .env.template	2023-01-26 12:38:30 +01:00
Ulf Gebhardt	7804675355	fix docker build with larger context	2023-01-26 12:30:45 +01:00
Ulf Gebhardt	aa20dd93f9	corrected docker ports	2023-01-26 12:25:23 +01:00
Ulf Gebhardt	0bf7ebe458	Merge branch 'master' into 2509-feature-federation-separate-dht-node-as-new-modul	2023-01-26 12:22:56 +01:00
Hannes Heine	1fac86def0	Merge branch 'master' into 2594-filter-query-all-contributions	2023-01-26 10:21:14 +01:00
Hannes Heine	c9ffa23f0d	Merge pull request #2629 from gradido/2611-change-button-color ... feat(frontend): 'yes'-button shows which dialog is currently open with a different color	2023-01-26 10:13:31 +01:00
mahula	94bf6eea5f	Merge branch 'master' into 2611-change-button-color	2023-01-26 09:50:22 +01:00
elweyn	14c4388ca6	Merge branch '2594-filter-query-all-contributions' of https://github.com/gradido/gradido into 2594-filter-query-all-contributions	2023-01-26 07:07:10 +01:00
elweyn	12703a33f9	Remove unused i18n import.	2023-01-26 07:06:57 +01:00
Hannes Heine	eb16416900	Merge branch 'master' into 2594-filter-query-all-contributions	2023-01-26 07:04:39 +01:00
Claus-Peter Hübner	ba8d02eb8a	linting	2023-01-25 22:59:21 +01:00
Claus-Peter Hübner	8f4420f54c	Merge branch '2501-feature-federation-implement-a-graphql-client-to-request-getpublickey' of github.com:gradido/gradido into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-25 22:57:12 +01:00
Claus-Peter Hübner	30be532dd5	temporarily removed the not matching community entry deletion after ... validation	2023-01-25 22:55:43 +01:00
clauspeterhuebner	99f1b0d240	Update backend/src/federation/validateCommunities.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-01-25 22:49:10 +01:00
Claus-Peter Hübner	b64fad1b7d	add the startValidateCommunities again after master-merge	2023-01-25 21:18:18 +01:00
Claus-Peter Hübner	d24b858959	Merge branch '2501-feature-federation-implement-a-graphql-client-to-request-getpublickey' of github.com:gradido/gradido into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-25 21:13:38 +01:00
Claus-Peter Hübner	8cc62c1949	Merge remote-tracking branch 'origin/master' into ... 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-25 21:12:41 +01:00
clauspeterhuebner	c5bb2ae380	Merge pull request #2459 from gradido/2428-feature-federation-implement-multiple-apollo-graphql-endpoints ... feat(backend): federation implement multiple apollo graphql endpoints	2023-01-25 18:12:06 +01:00
clauspeterhuebner	bb30be15ce	Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-25 17:25:52 +01:00
clauspeterhuebner	c45c5699f3	Update federation/src/graphql/api/GetTestApiResult.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-01-25 17:21:26 +01:00
elweyn	0bd3ce27df	Change Tests to statusFilter.	2023-01-25 16:48:49 +01:00
elweyn	7796d57c97	Merge branch '2594-filter-query-all-contributions' of https://github.com/gradido/gradido into 2594-filter-query-all-contributions	2023-01-25 16:40:45 +01:00
elweyn	8b3423b91b	Remove i18n, change state to status.	2023-01-25 16:40:32 +01:00
Hannes Heine	d47310e106	Merge branch 'master' into 2594-filter-query-all-contributions	2023-01-25 16:30:23 +01:00
Moriz Wahl	d7c2e1ece5	comment unused code to raise coverage	2023-01-25 16:29:37 +01:00
Moriz Wahl	b959a64e77	remove unused TransactionType enumerator to raise coverage	2023-01-25 16:29:18 +01:00
elweyn	96262a2405	Add 2370-feature-deleting-contribution-must-be-analog-to-confirming-contribution-dialog changes.	2023-01-25 14:44:24 +01:00
elweyn	dc70a375f6	Correct merge conflicts.	2023-01-25 14:41:03 +01:00
elweyn	22af8012f5	Correct merged stash conflicts.	2023-01-25 14:37:30 +01:00
elweyn	5e58d6e312	Correct merged stash conflicts.	2023-01-25 14:36:55 +01:00
elweyn	bd9d62b2d6	Change cancel button variant to info, change variant of 'Yes' button to 'danger' for deletedialog, 'warning' for denydialog and 'success' for confirm-dialog	2023-01-25 14:30:08 +01:00
Hannes Heine	a7b19fcc82	Merge pull request #2625 from gradido/legend-to-all-contribution-tab ... refactor(frontend): add legend to all contribution tab, and add tests.	2023-01-25 14:06:12 +01:00
mahula	ae0f4f0cc5	Merge branch 'master' into legend-to-all-contribution-tab	2023-01-25 13:51:21 +01:00
elweyn	2f787043c1	Remove some function emits, remove comments of wip.	2023-01-25 13:41:35 +01:00
elweyn	2eff5d99cd	Add test suite for deny prozess.	2023-01-25 13:34:33 +01:00
elweyn	70494a8e11	Remove unused local key denyNow, change color of deny button to yellow, change order of confirm and deny buttons.	2023-01-25 13:10:46 +01:00
mahula	eccb74baea	fix linting	2023-01-25 12:38:16 +01:00
elweyn	e7b27a32ee	Refactor GetTestApiResult & Add second resolver to version 1_0	2023-01-25 12:29:34 +01:00
Hannes Heine	309eddd841	Merge branch 'master' into 2370-feature-deleting-contribution-must-be-analog-to-confirming-contribution-dialog	2023-01-25 12:21:37 +01:00
mahula	cc4c8ce351	refactor overlay conditions on admin creation confirmation page	2023-01-25 12:11:56 +01:00
elweyn	9e7da0f451	Add tests for filterState parameter in listAllContributions query.	2023-01-25 08:11:47 +01:00
elweyn	47eea57c09	Remove unused import.	2023-01-25 08:00:34 +01:00
elweyn	cc0fe5968d	Tests that the filterState parameter in listAllContributions works as expected.	2023-01-25 07:54:17 +01:00
Hannes Heine	d91857b1a4	Merge branch 'master' into 2594-filter-query-all-contributions	2023-01-25 06:38:51 +01:00
clauspeterhuebner	cba5d330a1	Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-25 02:34:42 +01:00
clauspeterhuebner	a3af2e5513	Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-25 02:34:29 +01:00
Moriz Wahl	66cec91ed4	Merge pull request #2587 from gradido/unit-tests-community-page ... feat(frontend): unit tests community page	2023-01-24 20:01:54 +01:00