12509 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
clauspeterhuebner	8af4d2fb91	Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-16 22:23:26 +01:00
ogerly	8c033842fb	placeholder in InputHoures.vue	2023-01-16 20:08:49 +01:00
Moriz Wahl	b66372bd90	change name of dynamic statitics fields	2023-01-16 19:42:01 +01:00
Moriz Wahl	1e66cda707	change name of dynamic statitics fields	2023-01-16 19:41:34 +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
Moriz Wahl	9f3c43426d	clean up	2023-01-16 15:28:20 +01:00
Moriz Wahl	6b1497a988	statistics for field resolvers	2023-01-16 15:23:17 +01:00
Moriz Wahl	7781011b1a	refactor(backend): field resolvers in statistics	2023-01-16 15:22:45 +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
elweyn	0d268ae96f	Change tests to the new reject layout.	2023-01-16 09:47:08 +01:00
ogerly	36c54f7211	change emit to methods	2023-01-16 09:26:13 +01:00
mahula	9737905dbd	adapt admin are overlay for open contributions page ... - use slots - refactor for reusability for main 3 admin actions confirm/delete/reject	2023-01-15 13:17:14 +01:00
mahula	97a4e337a9	adapt locales to admin functionality of confirmation, deletion, and rejection	2023-01-15 12:27:54 +01:00
Hannes Heine	8a27960aba	Merge branch 'master' into 2332-mark-contribution-as-rejected	2023-01-14 07:46:38 +01:00
clauspeterhuebner	be01529b75	Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-13 19:13:30 +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
clauspeterhuebner	3cff36148f	Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-13 15:39:13 +01:00
clauspeterhuebner	f5ba8af177	Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-13 15:38:44 +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	db6d18da1f	Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-13 14:21:20 +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