11463 Commits

Author SHA1 Message Date
elweyn
663097c378 Fix data with named contributionMemo instead. 2022-09-09 07:52:04 +02:00
elweyn
690b18c307 Remove email of admin who sends message. 2022-09-09 07:49:11 +02:00
elweyn
d73143cfdf Call method to send Email when an admin add a new contributionmessage. 2022-09-09 07:42:27 +02:00
elweyn
d2ff899100 Add method for sending EMail when their is a new contributionMessage from admin. 2022-09-09 07:41:45 +02:00
elweyn
d08b609088 Define the german text for the email addedContributionMessage. 2022-09-09 07:40:48 +02:00
Hannes Heine
2f41737d58
Merge branch 'master' into 2010-send-email-to-transaction-link-sender 2022-09-09 06:26:26 +02:00
Alexander Friedland
8f151b3554
Merge pull request #2185 from gradido/2184-button-for-the-messages-is-missing
messages show if Confirmed
2022-09-08 20:40:05 +02:00
Alexander Friedland
09cc02ae2b
Merge branch 'master' into 2184-button-for-the-messages-is-missing 2022-09-08 20:31:12 +02:00
Alexander Friedland
88707d3346
Merge pull request #2186 from gradido/2183-text-in-the-messages-smaller
text in messages smaller
2022-09-08 20:30:52 +02:00
ogerly
78a20ac9ba text in messages smaller 2022-09-08 18:52:16 +02:00
ogerly
35f05d2f9c messages show if Confirmed 2022-09-08 18:32:49 +02:00
Hannes Heine
7f5b2d6bc2
Merge pull request #2181 from gradido/klicktipp-retrieve-not-registered-email
feat: 🍰 Klicktipp retrieve not registered email
2022-09-08 09:52:55 +02:00
Hannes Heine
6817b5f139
Merge branch 'master' into klicktipp-retrieve-not-registered-email 2022-09-08 09:17:06 +02:00
Hannes Heine
81a99ae72b
Merge pull request #2182 from gradido/fix-admin-show-all-moderators-on-left-side
fix: 🍰 isModerator on messages to switch the messages side in the messages overview
2022-09-08 09:15:36 +02:00
Hannes Heine
039840139c
Merge branch 'master' into 2010-send-email-to-transaction-link-sender 2022-09-08 07:51:23 +02:00
elweyn
1efee2bbd7 Call isModerator for messages so we can switch the messages & Remove computed isModerator and use message.isModerator to switch. 2022-09-07 12:14:05 +02:00
elweyn
ed0900b735 Add lint command to ignore console.log statement. 2022-09-07 11:34:08 +02:00
elweyn
e50b80997b Fix imports. 2022-09-07 10:38:34 +02:00
elweyn
0fb1dcdb3e Moved klicktipp.ts to src/util 2022-09-07 10:34:09 +02:00
elweyn
0f0cdab800 Merge master 2022-09-07 10:31:23 +02:00
mahula
9e5f7f9b9a
Merge pull request #2174 from gradido/fix-locales-nederlands
Refactor locales for Nederlands
2022-09-07 09:57:01 +02:00
mahula
44a91950ac
Merge branch 'master' into fix-locales-nederlands 2022-09-07 09:47:51 +02:00
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