10976 Commits

Author SHA1 Message Date
Hannes Heine
ac268e002f
Merge pull request #2180 from gradido/add-is-moderator-to-contribution-message
Add is moderator to contribution message
2022-09-06 16:09:09 +02:00
Hannes Heine
4bb8ced489
Merge branch 'master' into add-is-moderator-to-contribution-message 2022-09-06 15:18:08 +02:00
elweyn
73db7707ce Remove nullable from graphql Field isModerator. 2022-09-06 14:39:44 +02:00
elweyn
a41cd825e9 Add new database version to the index file. 2022-09-06 14:34:32 +02:00
elweyn
317f3182fe Remove is_moderator from 0047 and moved it to new migration 0048. 2022-09-06 14:34:13 +02:00
Moriz Wahl
718ec421e8
Merge branch 'master' into fix-locales-nederlands 2022-09-06 14:05:11 +02:00
Hannes Heine
295972f55a
Merge pull request #2178 from gradido/2177-moderator-cannot-answer-himself
feat: 🍰 Moderator Cannot Answer Himself
2022-09-06 13:57:01 +02:00
elweyn
96015a9b1b Add isModerator to the graphql ContributionMessage model. 2022-09-06 11:27:27 +02:00
ogerly
3ec2fd8e0d fix test 2022-09-06 11:24:00 +02:00
ogerly
dfa97fd855 moderator cannot answer himself 2022-09-06 11:24:00 +02:00
elweyn
ecc42b49fa Add isModerator to the createContributionMessage calls. 2022-09-06 11:23:57 +02:00
elweyn
0dc45d81c5 Add is_moderator field to the contribution_messages table. 2022-09-06 11:22:16 +02:00
elweyn
aa9d60c78c Add test that admin can not call adminCreateContributionMessage on own contribution 2022-09-06 11:07:23 +02:00
elweyn
ced14bd752 Change error message Admin can not answer on own contribution. 2022-09-06 10:59:32 +02:00
elweyn
04b96bac2f Throw error if moderator tries to answer his own contribution in adminCreateContributionMessage. 2022-09-06 10:39:20 +02:00
Claus-Peter Hübner
0619fb2f67 tests for Password handling 2022-09-06 00:26:44 +02:00
Moriz Wahl
915cf4fcf1
Merge pull request #2170 from gradido/improve-statistics-query
refactor: Improve Statistics Query
2022-09-05 16:11:30 +02:00
mahula
aeff632d16
Merge branch 'master' into e2e-test-setup 2022-09-05 14:21:32 +02:00
mahula
3360ce1518
Merge branch 'master' into fix-locales-nederlands 2022-09-05 14:10:45 +02:00
mahula
cea6ef6988 update language switch unit tests to test for all current availlable languages 2022-09-05 13:51:49 +02:00
Moriz Wahl
bb3b50eabb
Merge branch 'master' into improve-statistics-query 2022-09-05 12:12:49 +02:00
Moriz Wahl
dbd6710006
Merge pull request #2171 from gradido/remove-statistics-from-wallet
fix: Remove Statistics from Wallet
2022-09-05 12:10:50 +02:00
mahula
177fb4b14c adapt unit tests regarding locales 2022-09-05 10:58:53 +02:00
mahula
bfbbd26a57 fix locales for Nederlands 2022-09-05 10:55:28 +02:00
Moriz Wahl
1e38994383 uncomment code for coverage 2022-09-02 12:13:09 +02:00
Claus-Peter Hübner
97dee4d67c adapt tests to work with User and UserContact 2022-09-02 02:34:45 +02:00
Moriz Wahl
a8bfa59c46 fix tests 2022-09-01 19:09:23 +02:00
Moriz Wahl
eb8a245c2d fix resolver args 2022-09-01 16:26:57 +02:00
Moriz Wahl
1f4b7772c0 remove unused locales 2022-09-01 16:20:10 +02:00
Moriz Wahl
230afd73a1 do not show and load the statistics 2022-09-01 16:19:59 +02:00
Moriz Wahl
01f1633da0 only check locales for en and de 2022-09-01 16:19:31 +02:00
Moriz Wahl
de2bd1113e refactor: Improve Statistics Query 2022-09-01 15:38:05 +02:00
Alexander Friedland
5b073950fb
Merge pull request #2164 from gradido/Contribution-Messages
feat: 🍰 Contribution Messages In Frontend
2022-09-01 15:10:15 +02:00
Alexander Friedland
29b6458271
Update frontend/src/locales/fr.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-09-01 15:00:39 +02:00
Alexander Friedland
2bc75916e1
Update frontend/src/locales/fr.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-09-01 15:00:27 +02:00
Alexander Friedland
43be07ac1b
Merge branch 'master' into Contribution-Messages 2022-09-01 15:00:07 +02:00
Alexander Friedland
7839276ed0
Update frontend/src/locales/es.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-01 14:35:27 +02:00
Alexander Friedland
cc4011b919
Update frontend/src/locales/es.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-01 14:35:14 +02:00
Alexander Friedland
aa27bb024f
Update frontend/src/locales/es.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-01 14:32:40 +02:00
Hannes Heine
f10a014af4
Merge pull request #2149 from gradido/2131-crud-for-messages
feat: 🚀 CRUD For Contribution Messages
2022-09-01 11:24:42 +02:00
elweyn
c03d98ac1e Merge branch '2131-crud-for-messages' of https://github.com/gradido/gradido into 2131-crud-for-messages 2022-09-01 10:25:49 +02:00
elweyn
fbd3d41210 Remove messages and replace it with messagesCount in the query listContributions. 2022-09-01 10:25:41 +02:00
elweyn
2177c501c3 Remove cleanDB in most afterAll so we don't need to seed contribution and contribution messages again in later tests. 2022-09-01 10:24:42 +02:00
Claus-Peter Hübner
a0fe5f7951 adapt UserResolverTest to work with Users and UserContacts 2022-09-01 01:07:25 +02:00
Claus-Peter Hübner
eedaf9e6e3 unit tests of AdminResolver now with Users and UserContacts 2022-08-31 23:04:55 +02:00
Claus-Peter Hübner
faa0500f10 adapt seeding using User and UserContact 2022-08-31 15:44:41 +02:00
ogerly
56a56e3c1d add it todo in test 2022-08-31 14:58:45 +02:00
Alexander Friedland
3ed2ecdd23
Merge branch '2131-crud-for-messages' into Contribution-Messages 2022-08-31 14:26:36 +02:00
Alexander Friedland
0597da98ce
Update frontend/src/locales/fr.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-31 14:24:39 +02:00
Alexander Friedland
cd956f9346
Update frontend/src/locales/es.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-08-31 14:24:09 +02:00