10976 Commits

Author SHA1 Message Date
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
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
Claus-Peter Hübner
fde236aa43 add migration of users, user_contacts and email_opt_in 2022-08-25 01:06:25 +02:00
Claus-Peter Hübner
ab1dd4a2c8 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-08-25 00:20:20 +02:00
ogerly
5a0bbbf20d add slots for messages 2022-08-24 22:36:26 +02:00
ogerly
66647d64f2 Merge branch '2131-crud-for-messages' into Contribution-Messages 2022-08-24 16:53:05 +02:00
elweyn
4dbcabf96d Add where clause. 2022-08-24 16:52:42 +02:00
ogerly
0eb63689ee Merge branch '2131-crud-for-messages' into Contribution-Messages 2022-08-24 16:45:59 +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
ogerly
938079d8b4 Merge branch '2131-crud-for-messages' into Contribution-Messages 2022-08-24 16:35:17 +02:00
ogerly
8b063639f6 add apollo mutation createContributionMessage 2022-08-24 16:34:23 +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
ogerly
8adf366c52 Merge branch '2133-Messages-in-Admin-Interface' into Contribution-Messages 2022-08-24 14:52:30 +02:00
ogerly
5aee0ac7bb resolve conflict 2022-08-24 14:52:05 +02:00
Claus-Peter Hübner
80eeb0ac94 add hints to add feature dependent logging and EventProtokoll 2022-08-24 14:51:54 +02:00
ogerly
95abc61964 Merge branch '2131-crud-for-messages' into Contribution-Messages 2022-08-24 14:50:03 +02:00
ogerly
2e0820ca9c yarn locales 2022-08-24 14:47:18 +02:00
Claus-Peter Hübner
5db002dd88 remove uasecase specific alias-mocks from general balsamic file 2022-08-24 14:05:35 +02:00
Claus-Peter Hübner
084f0b9304 Merge branch 'master' of github.com:gradido/gradido into
2144-feature-usecase-concept-setting-alias-in-user-profile
2022-08-24 14:02:18 +02:00
Claus-Peter Hübner
3c91c597ef separate mocks in usecase specific balsamic-file 2022-08-24 13:57:59 +02:00
ogerly
7bc82db3c4 add apollo mutation adminCreateContributionMessage 2022-08-24 12:45:13 +02:00
ogerly
250c444722 Merge branch '2131-crud-for-messages' into 2133-Messages-in-Admin-Interface 2022-08-24 11:12:17 +02:00
ogerly
39c51a6698 Merge branch '2131-crud-for-messages' into 2132-Messages-in-Wallet 2022-08-24 11:07:13 +02:00
ogerly
a0d765c7f2 add list and formular for contribution messages 2022-08-24 11:04: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
ogerly
1ac50875c0 Merge branch '2131-crud-for-messages' into 2132-Messages-in-Wallet 2022-08-24 07:45:28 +02:00
Claus-Peter Hübner
d5fa9fcdc4 description of backend service changes 2022-08-24 02:51:29 +02:00
Claus-Peter Hübner
9b0c2b01f5 draft for backend services 2022-08-23 17:38:59 +02:00