10976 Commits

Author SHA1 Message Date
ogerly
c76a58b59b delete v-toogle from element 2022-08-29 11:18:31 +02:00
ogerly
6acb944ac0 delete unused local keys 2022-08-29 11:17:45 +02:00
ogerly
6bd02a2d4b add method updateState and emits 2022-08-29 11:12:31 +02:00
ogerly
0cfd0f0097 add locales key form.reply 2022-08-29 10:21:50 +02:00
ogerly
40475ecb37 add locales key form.replay 2022-08-29 10:20:12 +02:00
ogerly
15af14a233 add methods updateState and emits 2022-08-29 10:00:41 +02:00
ogerly
14ca1378bf delete unused toggleContributionMessagesBox function 2022-08-29 08:15:48 +02:00
ogerly
ef52c8b6d5 delete unused toggleContributionMessagesBox function 2022-08-29 08:08:30 +02:00
ogerly
fd74a2e671 reload messages if submited adminarea 2022-08-27 11:21:12 +02:00
ogerly
c6f2e9fb0d reload messages if submited 2022-08-27 11:21:12 +02:00
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