11341 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elweyn	5dc74b9cb8	Remove OneToMany import.	2022-08-27 11:21:12 +02:00
Claus-Peter Hübner	1d1de2011a	failed try to load OneToOne relation of user to userConmtact as ... emailConact-attribut... grrrrrr...	2022-08-26 20:00:29 +02:00
Claus-Peter Hübner	1184666fe2	try to solve problem of dbUser-entity with emailContact in context	2022-08-26 14:42:37 +02:00
elweyn	7a8f776380	Merge branch '2131-crud-for-messages' of https://github.com/gradido/gradido into 2131-crud-for-messages	2022-08-26 09:07:20 +02:00
elweyn	894140b418	Remove unused imports.	2022-08-26 08:50:08 +02:00
Hannes Heine	20ee18e3d3	Merge branch 'master' into 2131-crud-for-messages	2022-08-26 08:48:48 +02:00
elweyn	1090d17fdb	Remove OneToMany import.	2022-08-26 08:32:15 +02:00
Claus-Peter Hübner	0f90f960ce	remove unused code	2022-08-26 02:40:44 +02:00
Claus-Peter Hübner	5c9c63aa07	Merge remote-tracking branch 'origin/master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema	2022-08-26 02:29:38 +02:00
Claus-Peter Hübner	228451574d	adapt backend on database migration of UserContacts	2022-08-26 02:28:04 +02:00
ogerly	773207f80f	fix lint in adminarea	2022-08-25 18:46:58 +02:00
ogerly	38559694e2	fix lint && fix locales	2022-08-25 18:46:16 +02:00
ogerly	92ec3e4d25	new status in_progress in contribution list	2022-08-25 18:45:15 +02:00
ogerly	4e5c930dd5	add status icons in open contribution list	2022-08-25 15:45:51 +02:00
ogerly	22985974ae	resolve conflict	2022-08-25 15:32:47 +02:00
ogerly	45ef5e5d08	Added missing keys in locales	2022-08-25 15:28:41 +02:00
ogerly	d026ee7ffc	add unused keys in locales	2022-08-25 15:28:41 +02:00
ogerly	0104c5501b	style contributionMessages and List	2022-08-25 15:28:41 +02:00
elweyn	513936b55b	Add moderatorId to the object.	2022-08-25 15:28:41 +02:00
elweyn	e510c2ddbf	Change import for enum.	2022-08-25 15:27:12 +02:00
ogerly	3597feaa6c	resolve conflict	2022-08-25 15:27:02 +02:00
elweyn	3894341db8	Add new model ContributionMessageListResult.	2022-08-25 15:23:14 +02:00
elweyn	ead31344f5	Remove leftJoin on user and remove messages from UnconfirmedContribution model added messageCount instead to the model.	2022-08-25 15:16:44 +02:00
Alexander Friedland	f3e93397be	Merge branch 'master' into Contribution-Messages	2022-08-25 15:11:54 +02:00
elweyn	84ee364051	Revert "Fix imports." ... This reverts commit f3f0c27063053bed076e76442f98cfc10973a18d.	2022-08-25 15:00:21 +02:00
ogerly	9ee47e020f	add listUnconfirmedContributions messages count	2022-08-25 13:52:53 +02:00
elweyn	275ce304f9	Change the query to get the messages and the user of a message.	2022-08-25 13:52:53 +02:00
elweyn	8e61b89113	Add contribution state and contribution messages to the model	2022-08-25 13:52:53 +02:00
elweyn	339f33526d	Fix imports.	2022-08-25 13:52:53 +02:00
ogerly	87341f300f	add graphql query listContributionMessages.js	2022-08-25 13:52:53 +02:00
ogerly	9e255fb6e1	fix lint	2022-08-25 13:52:53 +02:00
elweyn	ff9866d4f3	Add userId to the ContributionMessage model.	2022-08-25 13:52:53 +02:00
elweyn	089b4d1195	Query ContributionMessages for a specific contributionId.	2022-08-25 13:52:53 +02:00
elweyn	8fbdbca5a8	Add new model ContributionMessageListResult.	2022-08-25 13:52:53 +02:00
elweyn	c27d64245b	Add moderatorId to the object.	2022-08-25 13:51:38 +02:00
Alexander Friedland	4c50a5a835	Merge pull request #2159 from gradido/2157-remove-fetchPolicy-network-only-from-statistics ... chore: 🍰 Remove Fetch Policy Network Only From Statistics	2022-08-25 09:53:51 +02:00
elweyn	f6ba34f73b	Merge branch '2131-crud-for-messages' of https://github.com/gradido/gradido into 2131-crud-for-messages	2022-08-25 09:52:41 +02:00
elweyn	cdb306dc85	Change the query to get the messages and the user of a message.	2022-08-25 09:52:33 +02:00
elweyn	0163eac52f	Add contribution state and contribution messages to the model	2022-08-25 09:51:58 +02:00
Wolfgang Huß	e60d10c9cc	Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics	2022-08-25 09:45:47 +02:00
Alexander Friedland	889e0104f6	Merge pull request #2153 from gradido/2152-Decrease-statistical-values-in-the-frontend ... feat: 🍰 Remove Some Statistics Data From Frontend	2022-08-25 09:45:27 +02:00
Alexander Friedland	5a16a3a84a	Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics	2022-08-25 09:36:38 +02:00
Alexander Friedland	abd1c45afe	Merge branch 'master' into 2152-Decrease-statistical-values-in-the-frontend	2022-08-25 09:36:26 +02:00
Alexander Friedland	7563987df8	Merge pull request #2156 from gradido/2150-Make-language-name-clickable ... feat: 🍰 Add Toogle Collaps On Language Name	2022-08-25 09:35:42 +02:00
Alexander Friedland	53a4813b29	Merge branch 'master' into Contribution-Messages	2022-08-25 09:27:49 +02:00
Alexander Friedland	7103ac7a08	Merge branch 'master' into 2150-Make-language-name-clickable	2022-08-25 09:27:15 +02:00
Hannes Heine	354b420e5c	Merge branch 'master' into 2131-crud-for-messages	2022-08-25 09:25:11 +02:00
Wolfgang Huß	e75627ff48	Fix linting	2022-08-25 09:19:41 +02:00
elweyn	f3f0c27063	Fix imports.	2022-08-25 09:12:49 +02:00
elweyn	4b9bdb0f15	Add userId to the ContributionMessage model.	2022-08-25 09:11:24 +02:00