12233 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
elweyn	589df276c0	Add legend to all contribution tab, and add tests for this case.	2023-01-24 16:28:41 +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
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
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
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
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
Ulf Gebhardt	31b7e09017	fix error handling to throw proper errors	2023-01-19 15:33:38 +01:00
Hannes Heine	6b38d26979	Merge branch 'master' into admin-text-memo-add-text-break	2023-01-19 15:30:10 +01:00
Hannes Heine	901f09b9c7	Merge pull request #2585 from gradido/fix-french-translation ... refactor(frontend): equalize en with fr languages.	2023-01-19 15:29:20 +01:00
ogerly	7349a9bdd1	add localation in toast	2023-01-19 15:25:40 +01:00
Ulf Gebhardt	89d5d3b3cb	fixed error	2023-01-19 15:16:22 +01:00
elweyn	a5fd937e14	Equalize en with fr languages.	2023-01-19 14:58:19 +01:00
Alexander Friedland	d4f1ad872d	Merge branch 'master' into admin-text-memo-add-text-break	2023-01-19 14:45:56 +01:00
Alexander Friedland	44517bb2b1	Merge branch 'master' into word-break-in-contribution	2023-01-19 14:44:50 +01:00
ogerly	3f6bcdc0d2	add text-break on all table memo fields	2023-01-19 14:42:36 +01:00
ogerly	e519f048fe	add no-resize props on InpuArea.vue	2023-01-19 14:27:50 +01:00
Moriz Wahl	400544c6b1	Merge pull request #2582 from gradido/update-forgot-password-unit-tests ... refactor(frontend): forgot password unit tests	2023-01-19 14:16:14 +01:00
mahula	a258df2521	Merge branch 'master' into word-break-in-contribution	2023-01-19 13:56:43 +01:00
Ulf Gebhardt	ba288e8e70	Merge branch 'master' into update-forgot-password-unit-tests	2023-01-19 13:56:12 +01:00
Ulf Gebhardt	0bf913a21f	Merge pull request #2581 from gradido/fix_min_value_hours ... fix(frontend): fix min value for hours input	2023-01-19 13:55:56 +01:00