1150 Commits

Author	SHA1	Message	Date
mahula	f584ad4e52	Merge branch 'master' into 2655-Remove-Overview-Menu-entry	2023-02-14 10:32:59 +01:00
Moriz Wahl	ac250181ef	chore(release): version 1.18.2	2023-02-10 16:09:33 +01:00
Moriz Wahl	25b1a6de44	fix(admin): deny contribution button to left	2023-02-10 15:55:16 +01:00
Alexander Friedland	b4200cca32	Merge branch 'master' into 2655-Remove-Overview-Menu-entry	2023-02-10 15:30:03 +01:00
Moriz Wahl	05f9917ac7	feat(release): Version 1.18.1	2023-02-10 14:42:16 +01:00
Alexander Friedland	27e956b7a2	Merge branch 'master' into 2655-Remove-Overview-Menu-entry	2023-02-10 07:57:09 +01:00
Moriz Wahl	7469a3caac	feat(release): version 1.18.0	2023-02-09 17:52:48 +01:00
Ulf Gebhardt	a04a498882	remove config version from all .env.dist	2023-02-09 14:02:11 +01:00
elweyn	8544eb51e9	Fix some lint problems.	2023-02-07 07:10:01 +01:00
elweyn	8b502c940c	Remove rebuild of admin, backend and frontend in case there tests files have been changed.	2023-02-06 15:35:11 +01:00
ogerly	a918735630	fix test over 96%	2023-02-03 11:31:16 +01:00
ogerly	1947575034	fix test	2023-02-02 18:34:31 +01:00
ogerly	484f03a53a	remove unused keys from locals	2023-02-02 18:22:35 +01:00
ogerly	e5ad0b1c50	remove overview and multi creation from navbar	2023-02-02 18:18:57 +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
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
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	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
elweyn	24557ae35b	Fix locales.	2023-01-24 14:43:07 +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
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
Ulf Gebhardt	62e76e02ad	v1.17.1	2023-01-19 22:11:20 +01:00
ogerly	3f6bcdc0d2	add text-break on all table memo fields	2023-01-19 14:42:36 +01:00
elweyn	dcbc137441	Update yarn.lock file of admin.	2023-01-19 09:19:29 +01:00
Hannes Heine	c84fa68132	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-19 07:50:22 +01:00
Ulf Gebhardt	a3dc4c168b	v1.17.0	2023-01-18 15:54:57 +01:00
elweyn	c73135e522	Change deny to reject.	2023-01-17 16:11:14 +01:00
elweyn	191d86beee	Add tests for decline button	2023-01-17 15:40:28 +01:00
elweyn	b8b6753677	Reviewed change requests.	2023-01-17 14:44:18 +01:00
Hannes Heine	576241f22d	Update admin/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-01-17 14:29:31 +01:00
mahula	e607d60962	adapt unit tests for creation confirmation page to changes	2023-01-17 14:20:39 +01:00
mahula	ca92123209	re-introduce cancel emit to open creations overlay	2023-01-17 14:19:57 +01:00
elweyn	121130175c	Add tests for OpenCreationsTable to have 100% coverage.	2023-01-17 12:27:40 +01:00
Moriz Wahl	1e66cda707	change name of dynamic statitics fields	2023-01-16 19:41:34 +01:00
Moriz Wahl	9f3c43426d	clean up	2023-01-16 15:28:20 +01:00