10160 Commits

Author SHA1 Message Date
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
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
Hannes Heine
354b420e5c
Merge branch 'master' into 2131-crud-for-messages 2022-08-25 09:25:11 +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
elweyn
3fbf8b6444 Query ContributionMessages for a specific contributionId. 2022-08-25 09:10:13 +02:00
elweyn
d2790588ba Add new model ContributionMessageListResult. 2022-08-25 09:09:13 +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
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
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
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
elweyn
2c459a8fae Changed the Contribution.find so that we can throw a specific error, added an GraphQL Model as return value instead of DbEntity. 2022-08-23 11:55:34 +02:00
elweyn
1c433e2d57 Add graphql object that will be returned instead of dbEntity. 2022-08-23 11:53:19 +02:00
mahula
1ea43130dc adapt unit tests to link text changes 2022-08-23 11:41:01 +02:00
mahula
f55851e4d0 add hint text to copyLinkWithText method 2022-08-23 11:39:43 +02:00
ogerly
f24461f924 delete unused locales 2022-08-23 11:23:45 +02:00
elweyn
e70a18c6bb Change thrown error message. 2022-08-23 11:09:41 +02:00
mahula
d6c81d21d3 add redeem link hint to locales 2022-08-23 10:08:31 +02:00
Alexander Friedland
3ba1e99b13
Merge branch 'master' into 2145-Corrections-style-for-frontend 2022-08-23 09:28:38 +02:00
clauspeterhuebner
7126c7832d
Merge branch 'master' into 2072-feature-usecase-contribution-messaging 2022-08-22 16:47:02 +02:00
elweyn
27fd42f097 Change import for enum. 2022-08-22 12:27:46 +02:00
elweyn
5ca422c6d3 Change import for enum and arg. 2022-08-22 12:27:06 +02:00
elweyn
710d47b594 Add adminCreateContributionMessage. 2022-08-22 12:21:38 +02:00
elweyn
bca2f49483 Add admin right to create contribution message. 2022-08-22 12:17:11 +02:00
elweyn
c5b84694d0 Withdrew admin part of user createContributionMessage. 2022-08-22 12:16:20 +02:00
elweyn
281f6cde3f Update contributionStatus to new state. 2022-08-22 10:39:56 +02:00
elweyn
0376cffb19 First steps createContributionMessage method of ContributionMessageResolver. 2022-08-22 10:30:48 +02:00
elweyn
a59967d767 Add new Arg for ContributionMessage 2022-08-22 10:30:14 +02:00
elweyn
8f117f23b4 Add new right CREATE_CONTRIBUTION_MESSAGE 2022-08-22 10:13:11 +02:00
Hannes Heine
a2cd06b063
Merge pull request #2137 from gradido/create-message-table
🍰 Create `contribution messages` table
2022-08-22 09:58:28 +02:00
Hannes Heine
eb29df38ee
Merge branch 'master' into create-message-table 2022-08-22 09:49:33 +02:00