12080 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	aadd2149aa	Merge branch 'master' into 2547-normalized-amount-transaction-is-processed-again	2023-01-17 16:00:16 +01:00
ogerly	35997f5499	remove unused code	2023-01-17 15:59:46 +01:00
Ulf Gebhardt	443a2747e6	Merge pull request #2551 from gradido/fix-semaphore-deadlock-on-error ... fix(backend): semaphore deadlock	2023-01-17 15:55:54 +01:00
ogerly	808eee7ae2	session extend , remove creation from query verifyLogin	2023-01-17 15:39:01 +01:00
Moriz Wahl	a028222dc8	Merge branch 'master' into fix-semaphore-deadlock-on-error	2023-01-17 13:57:57 +01:00
ogerly	7829785799	resolve conflicts	2023-01-17 13:07:49 +01:00
Alexander Friedland	ba59364d9c	Merge branch 'master' into 2547-normalized-amount-transaction-is-processed-again	2023-01-17 12:57:04 +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
Ulf Gebhardt	cd203ab2c2	removed if possible comment	2023-01-17 12:31:55 +01:00
Ulf Gebhardt	a3a69bc012	removed comment	2023-01-17 12:29:28 +01:00
Ulf Gebhardt	82fd6a9c5b	implement moriz requirements for test	2023-01-17 12:24:41 +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
mahula	b52162320d	fix unit tests for amout input component	2023-01-17 11:32:22 +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
Alexander Friedland	5e61079e4b	Merge branch 'master' into 2547-normalized-amount-transaction-is-processed-again	2023-01-17 07:02:20 +01:00
Ulf Gebhardt	9b773217be	Merge branch 'master' into fix-semaphore-deadlock-on-error	2023-01-17 01:07:00 +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
Ulf Gebhardt	3bf69814ca	test error cases for semaphore	2023-01-16 16:47:33 +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
Ulf Gebhardt	466e59a550	typo	2023-01-16 11:27:30 +01:00
Ulf Gebhardt	c3f7f15420	refactor all semaphore-locks	2023-01-16 11:21:38 +01:00
Ulf Gebhardt	fd2563f171	Merge branch 'master' into fix-semaphore-deadlock-on-error	2023-01-16 11:16:45 +01:00
Ulf Gebhardt	dab7fe584a	try catch around semaphore lock	2023-01-16 11:04:14 +01:00
ogerly	d9f8f8cb07	normalized-amount-transaction-if-processed again	2023-01-16 10:19:10 +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