10188 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
elweyn	e510c2ddbf	Change import for enum.	2022-08-25 15:27:12 +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
elweyn	84ee364051	Revert "Fix imports." ... This reverts commit f3f0c27063053bed076e76442f98cfc10973a18d.	2022-08-25 15:00:21 +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	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
ogerly	a0f3c6d4ce	remove unused file ContributionMessagesList.vue	2022-08-25 09:11:17 +02:00
elweyn	3fbf8b6444	Query ContributionMessages for a specific contributionId.	2022-08-25 09:10:13 +02:00
Wolfgang Huß	7b263d9338	Merge branch 'master' into 2152-Decrease-statistical-values-in-the-frontend	2022-08-25 09:09:29 +02:00
elweyn	d2790588ba	Add new model ContributionMessageListResult.	2022-08-25 09:09:13 +02:00
Alexander Friedland	e726ac80b2	Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics	2022-08-25 09:07:09 +02:00
Alexander Friedland	97e173ebc3	Merge pull request #2147 from gradido/2145-Corrections-style-for-frontend ... 2145 corrections style for frontend	2022-08-25 09:06:07 +02:00
Alexander Friedland	627c91bb0b	Merge branch 'master' into 2150-Make-language-name-clickable	2022-08-25 09:04:52 +02:00
Alexander Friedland	b9fa850094	Merge branch 'master' into 2152-Decrease-statistical-values-in-the-frontend	2022-08-25 09:04:27 +02:00
Alexander Friedland	9ff3ac9998	Update frontend/src/pages/InfoStatistic.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-08-25 09:04:13 +02:00
elweyn	4dbcabf96d	Add where clause.	2022-08-24 16:52:42 +02:00
elweyn	057816e4c0	Change innerJoin to leftJoin, so that every contribution is shown not only the one with messages.	2022-08-24 16:43:32 +02:00
elweyn	a9c3dd25ed	Add RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES to the ROLES of Users.	2022-08-24 16:32:58 +02:00
elweyn	e0fcdb2cee	Add new RIGHT for LIST_ALL_CONTRIBUTION_MESSAGES.	2022-08-24 16:31:36 +02:00
elweyn	59df924e1d	Add User to Contribution link, query the messages user in the listContributions query.	2022-08-24 16:27:28 +02:00
elweyn	5dfe330168	Merge branch '2131-crud-for-messages' of https://github.com/gradido/gradido into 2131-crud-for-messages	2022-08-24 10:58:00 +02:00
elweyn	dd2022df25	Add new values to query for contributions in frontend.	2022-08-24 10:57:52 +02:00
elweyn	bda04f87d2	Add messages and state to the contribution model.	2022-08-24 10:57:03 +02:00
elweyn	0271a42741	Use user entity instead of user model.	2022-08-24 10:56:19 +02:00
Hannes Heine	9c609665e0	Merge branch 'master' into 2131-crud-for-messages	2022-08-23 16:06:20 +02:00
Alexander Friedland	b48c638c75	Merge branch 'master' into 2145-Corrections-style-for-frontend	2022-08-23 13:54:34 +02:00
ogerly	c2b4a4d082	test fix	2022-08-23 13:49:12 +02:00
Alexander Friedland	b08867bf9c	Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics	2022-08-23 13:49:01 +02:00
elweyn	41fb0d2a9f	Change export name of ContributionMessageResolver class.	2022-08-23 13:46:55 +02:00
clauspeterhuebner	bc83a15ab5	Merge pull request #2073 from gradido/2072-feature-usecase-contribution-messaging ... 2072 feature usecase contribution messaging	2022-08-23 13:46:29 +02:00
clauspeterhuebner	456fbd4b15	Merge branch 'master' into 2072-feature-usecase-contribution-messaging	2022-08-23 13:37:15 +02:00
ogerly	f8a67d6a2f	test fix	2022-08-23 13:37:01 +02:00
Alexander Friedland	ab641792d6	Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics	2022-08-23 13:30:14 +02:00
Alexander Friedland	55a8d3fe04	Merge branch 'master' into 2152-Decrease-statistical-values-in-the-frontend	2022-08-23 12:04:35 +02:00
mahula	b6a2516426	Merge pull request #2158 from gradido/2151-add-hint-to-redeem-link ... 2151 add hint to redeem link	2022-08-23 12:03:02 +02:00
elweyn	e3e4b61c57	Rename export of ContributionArgs to ContributionMessageArgs.	2022-08-23 11:59:24 +02:00