12094 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elweyn	191d86beee	Add tests for decline button	2023-01-17 15:40:28 +01:00
elweyn	9438cefb04	Fix small merge error, and verifyLogin query.	2023-01-17 15:24:41 +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
Hannes Heine	bba5d4a193	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-17 13:25:12 +01:00
Alexander Friedland	b31f6f7a7a	Merge pull request #2552 from gradido/mobil-menu-transparent-bg-color ... fix(frontend): mobile design	2023-01-17 12:53:46 +01:00
Hannes Heine	149eddfb91	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-17 12:31:12 +01:00
elweyn	121130175c	Add tests for OpenCreationsTable to have 100% coverage.	2023-01-17 12:27:40 +01:00
ogerly	5dec52f508	add icon for deleted in crontibution list	2023-01-17 11:58:26 +01:00
Alexander Friedland	c623ff1294	Update frontend/src/components/Inputs/InputHour.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-01-17 11:42:08 +01:00
Alexander Friedland	81fee35064	Update frontend/src/components/Inputs/InputHour.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-01-17 11:41:58 +01:00
Alexander Friedland	7bcb3c915e	Update frontend/src/components/Inputs/InputHour.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-01-17 11:41:46 +01:00
ogerly	e062fc6288	fix lint	2023-01-17 11:33:53 +01:00
ogerly	4f0a78022a	fix tests	2023-01-17 11:10:06 +01:00
ogerly	07dc5cf5d4	test first example	2023-01-17 10:56:17 +01:00
ogerly	f4729e4984	navbar name add router link	2023-01-17 09:48:08 +01:00
ogerly	3c86d523a8	mobil navbar set sheet image	2023-01-17 08:37:02 +01:00
ogerly	5203644283	mobil navbar fix and transparent	2023-01-17 07:36:34 +01:00
ogerly	8c033842fb	placeholder in InputHoures.vue	2023-01-16 20:08:49 +01:00
ogerly	01093d026f	current date custom in datepicker	2023-01-16 19:39:22 +01:00
ogerly	f3ae7a02e9	mobil navbar avatar and name displayed	2023-01-16 19:17:09 +01:00
ogerly	c0a889a5b3	fix stylelint and locales	2023-01-16 15:43:30 +01:00
ogerly	5c5ecc84e3	fix lint	2023-01-16 15:42:46 +01:00
Alexander Friedland	60ca3485c3	Merge branch 'master' into mobil-menu-transparent-bg-color	2023-01-16 15:37:28 +01:00
ogerly	067ed3652b	settings header data style	2023-01-16 15:34:29 +01:00
ogerly	51d20d4d5b	mobil navbar toggler no border	2023-01-16 15:03:09 +01:00
ogerly	fae97dd786	mobile starttext change style	2023-01-16 14:54:35 +01:00
ogerly	41f7dfe56f	remove last month label, matching stands and button size	2023-01-16 14:24:02 +01:00
ogerly	8514e9af9d	mobil navbar avatar over sheet image	2023-01-16 13:45:24 +01:00
ogerly	0d93e55635	mobile menu has transparent background color	2023-01-16 13:00:36 +01:00
Moriz Wahl	becaa750e8	Merge pull request #2548 from gradido/slots-for-right-sidebar ... refactor(frontend): slots for right sidebar and header	2023-01-16 12:45:00 +01:00
Moriz Wahl	d95dc27e17	Merge branch 'master' into slots-for-right-sidebar	2023-01-16 11:38:04 +01:00
Moriz Wahl	82a6c61633	mock replace in route.path, stub last transactions	2023-01-16 11:37:13 +01:00
elweyn	0d268ae96f	Change tests to the new reject layout.	2023-01-16 09:47:08 +01:00
Hannes Heine	8a27960aba	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-14 07:46:38 +01:00
Alexander Friedland	baeedf80a6	Merge pull request #2527 from gradido/2516-Creation-menu-is-not-highlighted-on-all-submenus ... fix(frontend): creation menu highlighted on all submenus	2023-01-13 16:54:34 +01:00
Alexander Friedland	bec3184bac	Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus	2023-01-13 16:34:30 +01:00
Moriz Wahl	031da1b028	more compact right side	2023-01-13 15:24:54 +01:00
Moriz Wahl	0c330854df	Merge pull request #2545 from gradido/computed-hours-for-open-creations ... refactor(frontend): computed hours for open creations	2023-01-13 15:07:38 +01:00
Moriz Wahl	0d59f83bb8	Merge branch 'master' into computed-hours-for-open-creations	2023-01-13 14:54:49 +01:00
mahula	a3f83b9822	Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus	2023-01-13 14:23:40 +01:00
clauspeterhuebner	2c366aa67d	Merge pull request #2532 from gradido/1489-feature-backup-cron ... feat(other): add description for daily backup cronjob	2023-01-13 14:20:20 +01:00
Alexander Friedland	270d837ba2	Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus	2023-01-13 14:17:35 +01:00
clauspeterhuebner	d7d4eae8d4	Merge branch 'master' into 1489-feature-backup-cron	2023-01-13 14:07:09 +01:00
Alexander Friedland	20c3851308	Merge pull request #2543 from gradido/2535-editing-transaction-does-not-work ... fix(frontend): editing transaction does not work	2023-01-13 14:03:24 +01:00
elweyn	51abaf8a22	Last changes to make it work.	2023-01-13 13:20:00 +01:00
elweyn	7a7246cde5	Add error for already confirmed contribution.	2023-01-13 11:37:48 +01:00
elweyn	9d8c026617	Move contribution, user and moderator search in the first try block to lock the database.	2023-01-13 11:35:33 +01:00
elweyn	df4e2b419a	Merge master in here.	2023-01-13 11:24:11 +01:00
elweyn	605812d777	Add error to confirmContribution mutation in case where contributionState is 'DENIED'	2023-01-13 11:15:14 +01:00