13159 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
elweyn	2e9f8caa9d	Add denied symbols in the frontend.	2023-01-13 11:08:18 +01:00
elweyn	70017c3115	Add state & messagesCount to the query listAllContributions.	2023-01-13 11:07:26 +01:00
elweyn	79220ced79	Add deleted Contribution to the Contribution list in the admin interface.	2023-01-13 11:05:56 +01:00
Hannes Heine	49f69816de	Merge branch 'master' into 2535-editing-transaction-does-not-work	2023-01-13 10:38:32 +01:00
Hannes Heine	d64a385ff8	Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus	2023-01-13 10:34:04 +01:00
mahula	76136c9569	Merge pull request #2541 from gradido/open-creations-call ... refactor(frontend): remove open creations from store	2023-01-13 10:27:53 +01:00
mahula	18a2b7b6f9	Merge branch 'master' into open-creations-call	2023-01-13 10:13:32 +01:00
Alexander Friedland	b16a599209	Merge branch 'master' into 2535-editing-transaction-does-not-work	2023-01-13 08:50:39 +01:00
clauspeterhuebner	0a2a02a784	Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey	2023-01-13 00:28:20 +01:00
Claus-Peter Hübner	29109fc4c8	Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-13 00:24:50 +01:00
Claus-Peter Hübner	de3fdd7c62	Merge branch ... '2428-feature-federation-implement-multiple-apollo-graphql-endpoints' of github.com:gradido/gradido into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-13 00:24:08 +01:00
Ulf Gebhardt	51991024ae	Merge pull request #2524 from gradido/vscode-extensions ... feat(other): vscode extensions	2023-01-12 22:40:11 +01:00
Ulf Gebhardt	852d9746dd	Merge branch 'master' into vscode-extensions	2023-01-12 22:24:20 +01:00
Ulf Gebhardt	f05176becb	Merge pull request #2533 from gradido/remove-jest-from-dependencies ... fix(backend): remove jest from dependecies	2023-01-12 22:24:04 +01:00
Ulf Gebhardt	b5b4799d5b	Merge branch 'master' into remove-jest-from-dependencies	2023-01-12 22:08:55 +01:00
mahula	102f2fc919	Merge pull request #2546 from gradido/initials-without-space ... fix(frontend): initials without space	2023-01-12 21:10:29 +01:00
mahula	0c65d8c4ab	Merge branch 'master' into open-creations-call	2023-01-12 20:58:15 +01:00
ogerly	1f23afc147	initials without space	2023-01-12 19:49:51 +01:00
mahula	15b1a1a8f4	set up packages for linting and configure prettier to not force semicolons	2023-01-12 19:25:51 +01:00
Claus-Peter Hübner	f9e8add040	Merge branch '2428-feature-federation-implement-multiple-apollo-graphql-endpoints' of github.com:gradido/gradido into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-12 18:23:46 +01:00
Claus-Peter Hübner	8dd1ef881f	komische linting results...	2023-01-12 18:22:24 +01:00
Claus-Peter Hübner	9547eff793	Merge remote-tracking branch 'origin/master' into ... 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-12 18:02:15 +01:00
Claus-Peter Hübner	4c4979f8eb	Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints	2023-01-12 16:54:14 +01:00
Ulf Gebhardt	d6a6dcde5b	Merge branch 'master' into vscode-extensions	2023-01-12 16:09:42 +01:00
Ulf Gebhardt	5ceab09451	Merge branch 'master' into remove-jest-from-dependencies	2023-01-12 16:09:26 +01:00
Ulf Gebhardt	789a26e2b2	Merge branch 'master' into 2509-feature-federation-separate-dht-node-as-new-modul	2023-01-12 16:05:34 +01:00
Ulf Gebhardt	76363fb115	docker file	2023-01-12 16:04:47 +01:00
Ulf Gebhardt	bc5106938e	docker	2023-01-12 16:01:54 +01:00
Ulf Gebhardt	6a6d26d656	coverage 83%	2023-01-12 15:43:58 +01:00
Moriz Wahl	f5fe88cffc	setup slots for content header and right side	2023-01-12 15:41:41 +01:00
Ulf Gebhardt	49fc3b3a92	more cleanup	2023-01-12 15:40:10 +01:00
Ulf Gebhardt	62722bf193	remove decimal.js, cleanups	2023-01-12 15:36:06 +01:00
elweyn	9b4d1cd2b3	Add new locales.	2023-01-12 15:29:34 +01:00
elweyn	b88bfabb78	Add button to deny contribution in the admin interface	2023-01-12 15:06:45 +01:00
Ulf Gebhardt	0fc425223b	fix tests	2023-01-12 15:06:31 +01:00
elweyn	493aa32011	Deny contribution sends rejected contribution email.	2023-01-12 15:05:41 +01:00
Alexander Friedland	cb05eb716c	Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus	2023-01-12 14:57:03 +01:00
Alexander Friedland	2b8836783c	Merge branch 'master' into 2535-editing-transaction-does-not-work	2023-01-12 14:56:40 +01:00
Moriz Wahl	f66fb5b597	add unit test for open creations amount component	2023-01-12 14:46:08 +01:00
Moriz Wahl	862a6c4b10	fix(frontend): computed hours for open contribution amounts	2023-01-12 14:09:17 +01:00
clauspeterhuebner	3adbbe9377	Merge branch 'master' into 1489-feature-backup-cron	2023-01-12 14:07:27 +01:00
Ulf Gebhardt	24755f5d5b	Merge pull request #2539 from gradido/fix_admin_no_confirm ... fix(backend): fix backend not confirmable	2023-01-12 13:53:28 +01:00
Moriz Wahl	5a763f030a	Merge branch 'master' into open-creations-call	2023-01-12 13:41:21 +01:00
Alexander Friedland	d72c54c7e1	Merge branch 'master' into 2535-editing-transaction-does-not-work	2023-01-12 13:36:50 +01:00
Alexander Friedland	0acca718f3	Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus	2023-01-12 13:36:27 +01:00
ogerly	035d588c5a	fix test	2023-01-12 13:35:48 +01:00
Ulf Gebhardt	cf48e3243a	Merge branch 'master' into fix_admin_no_confirm	2023-01-12 13:33:24 +01:00