12979 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elweyn	2cecadded2	Add filterState to the backend test listAllContributions query.	2023-01-24 17:02:08 +01:00
ogerly	2e078a5fbb	fix: lint and locales	2023-01-24 17:00:50 +01:00
ogerly	ff614ad27b	add info text, locales in community page, if no contributions	2023-01-24 16:58:56 +01:00
ogerly	5bd37a5a2a	fix: locales	2023-01-24 16:52:28 +01:00
ogerly	295dbff4f8	show info if no open contribution for selected date	2023-01-24 16:51:56 +01:00
elweyn	589df276c0	Add legend to all contribution tab, and add tests for this case.	2023-01-24 16:28:41 +01:00
Hannes Heine	14c546627a	Merge branch 'master' into 2594-filter-query-all-contributions	2023-01-24 16:14:21 +01:00
Moriz Wahl	a24f464fbf	Merge branch 'master' into unit-tests-community-page	2023-01-24 16:13:58 +01:00
Hannes Heine	de0724e51e	Merge pull request #2461 from gradido/2332-mark-contribution-as-rejected ... feat(backend): deny contributions	2023-01-24 16:13:29 +01:00
Moriz Wahl	bfb6a9598b	Merge branch 'master' into unit-tests-community-page	2023-01-24 16:05:55 +01:00
elweyn	57222d07c4	Change rejected to deny, add error test for denyContribution & remove TODO comment.	2023-01-24 15:56:58 +01:00
elweyn	2291cc813e	Change en translation from deny to reject.	2023-01-24 15:47:31 +01:00
elweyn	4f85b8508d	Fix locales.	2023-01-24 15:38:28 +01:00
elweyn	62c85476d4	Correct tests.	2023-01-24 15:29:19 +01:00
ogerly	3c669a17cb	change open creation-page, add tabs for all state on contributions	2023-01-24 15:23:34 +01:00
elweyn	bfe2aa9246	Merge branch '2332-mark-contribution-as-rejected' of https://github.com/gradido/gradido into 2332-mark-contribution-as-rejected	2023-01-24 15:22:48 +01:00
elweyn	da652e6745	Rename reject to deny and rejected to denied.	2023-01-24 15:22:37 +01:00
Hannes Heine	446754fad4	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-24 15:04:15 +01:00
Hannes Heine	4d40944f1e	Merge pull request #2579 from gradido/update-admin-yarn-lock ... refactor(admin): update yarn.lock file of admin.	2023-01-24 15:03:48 +01:00
elweyn	24557ae35b	Fix locales.	2023-01-24 14:43:07 +01:00
elweyn	b940400e5b	Remove unused import.	2023-01-24 14:26:43 +01:00
elweyn	d42804acfb	Change type of filterState from string[] to ContributionStatus[].	2023-01-24 12:10:53 +01:00
elweyn	1554a7d454	Remove test loggings.	2023-01-24 12:04:09 +01:00
mahula	579ef7b25e	Merge branch 'master' into 2370-feature-deleting-contribution-must-be-analog-to-confirming-contribution-dialog	2023-01-24 11:56:42 +01:00
elweyn	f4c743f7b4	Add localization, change filterState from string to array of string.	2023-01-24 11:33:29 +01:00
elweyn	574906eb76	Add filterState parameter to listAllContributions query, can be a string or null and checks in the DB for the ContributionStatus.	2023-01-24 10:27:46 +01:00
Hannes Heine	23e3e02139	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-24 08:39:15 +01:00
elweyn	5fa6afbd90	Merge branch 'master' into update-admin-yarn-lock	2023-01-23 10:57:31 +01:00
Moriz Wahl	3b9a553513	localized message	2023-01-20 10:42:16 +01:00
Moriz Wahl	a1b1142128	Merge branch 'master' into unit-tests-community-page	2023-01-20 10:41:29 +01:00
clauspeterhuebner	81bd4d137a	Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-20 02:41:35 +01:00
clauspeterhuebner	4c5cecb108	Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-20 02:41:27 +01:00
Ulf Gebhardt	941c0daa06	Merge pull request #2588 from gradido/v1.17.1 ... chore(release): v1.17.1	2023-01-20 00:56:52 +01:00
Ulf Gebhardt	ce40f9a006	Merge branch 'master' into v1.17.1	2023-01-19 22:12:29 +01:00
Ulf Gebhardt	62e76e02ad	v1.17.1	2023-01-19 22:11:20 +01:00
Alexander Friedland	49ce522eac	Merge pull request #2583 from gradido/word-break-in-contribution ... refactor(frontend): change contribution memo add word-break	2023-01-19 21:47:18 +01:00
Moriz Wahl	b997a34aaf	coverage frontend to 95%	2023-01-19 19:32:11 +01:00
Moriz Wahl	68dab7a5b4	Merge branch 'master' into unit-tests-community-page	2023-01-19 19:29:42 +01:00
Moriz Wahl	a13c1a3cf5	further tests	2023-01-19 19:29:06 +01:00
Ulf Gebhardt	0b7fdac38a	removed comment	2023-01-19 18:24:00 +01:00
Moriz Wahl	be65595bee	refcator tests for apollo calls	2023-01-19 18:21:00 +01:00
clauspeterhuebner	0189603681	Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-19 18:09:12 +01:00
clauspeterhuebner	c4df2be4a7	Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-19 18:09:05 +01:00
Alexander Friedland	8ef9b240e4	Merge branch 'master' into word-break-in-contribution	2023-01-19 16:06:21 +01:00
Alexander Friedland	dc7dead09a	Merge pull request #2584 from gradido/admin-text-memo-add-text-break ... refactor(admin): add text-break on all table memo fields	2023-01-19 16:06:03 +01:00
Ulf Gebhardt	63f1f99907	Merge branch 'master' into admin-text-memo-add-text-break	2023-01-19 15:52:23 +01:00
Ulf Gebhardt	802d0b4efe	Merge pull request #2586 from gradido/fix-error-handling ... fix(frontend): throw proper frontend warning errors	2023-01-19 15:52:06 +01:00
Hannes Heine	e757a39349	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-19 15:46:06 +01:00
ogerly	aa5a6e0711	fix locales	2023-01-19 15:38:00 +01:00
Alexander Friedland	320eb85c8c	Merge branch 'master' into word-break-in-contribution	2023-01-19 15:37:47 +01:00