10429 Commits

Author SHA1 Message Date
elweyn
e844bcc925 Change login from Query to Mutation. 2022-09-22 11:47:28 +02:00
Alexander Friedland
c4b4661a5c
Merge pull request #2211 from gradido/2203-Delete-query-when-redeeming-the-Redeem-link
2203 delete query modal when redeeming the redeem link
2022-09-22 11:13:49 +02:00
Alexander Friedland
ef49dee81d
Merge branch 'master' into 2203-Delete-query-when-redeeming-the-Redeem-link 2022-09-22 10:10:59 +02:00
Hannes Heine
0102aab498
Merge pull request #2228 from gradido/2226-change-email-templates
Refactor: 🍰 Change email templates
2022-09-22 09:52:27 +02:00
elweyn
6c0cb17196 Refactor sendTransactionLinkredeemed
.
2022-09-21 12:41:25 +02:00
elweyn
686c43fa89 Change text of linkRedeemed template. 2022-09-21 12:12:23 +02:00
elweyn
3b3a963ac5 Change text template of contributionConfirmed. 2022-09-21 12:09:36 +02:00
elweyn
6c446fb477 Change text template of transactionReceived. 2022-09-21 12:07:19 +02:00
elweyn
bf6ed35c6e Change text template of ContributionMessageReceived. 2022-09-21 12:05:49 +02:00
jjimenezgarcia
dfda1b6d36
Merge pull request #2204 from gradido/events-and-logs-user-resolver
Refactor: Events and logs completed in User Resolver
2022-09-19 21:49:34 +02:00
Moriz Wahl
5378a17daf
Merge branch 'master' into events-and-logs-user-resolver 2022-09-19 19:31:51 +02:00
joseji
1203dada61 ids are now checked in event creation 2022-09-19 19:18:06 +02:00
jjimenezgarcia
5f94cfca88
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-19 15:40:59 +02:00
joseji
cfdec3d122 Fixed wrong handling of dates in tests failing depending on the day you execute them 2022-09-16 13:45:20 +02:00
joseji
390bb1db3d IDs also tested while event saving, added ActivateAccount event when setting password 2022-09-16 12:22:32 +02:00
Alexander Friedland
387ea5949f
Merge branch 'master' into 2203-Delete-query-when-redeeming-the-Redeem-link 2022-09-16 09:15:28 +02:00
Alexander Friedland
8ea1a207c7
Merge pull request #2210 from gradido/change-support-mail
change support mail
2022-09-16 09:15:10 +02:00
ogerly
f19b521726 add support mail in env 2022-09-16 09:01:29 +02:00
ogerly
222d8c2f57 fix lint 2022-09-16 08:25:55 +02:00
ogerly
caf487d206 remove text from modal for redeem link 2022-09-16 08:24:31 +02:00
ogerly
e3e5fdd12b remove modal box if redeem a redeemlink 2022-09-16 08:22:24 +02:00
ogerly
dbc3297305 change support mail 2022-09-15 21:02:16 +02:00
Hannes Heine
9c7506f20c
Merge pull request #2193 from gradido/2095-send-email-contribution-confirmed
feat: 🍰 Send email when contribution is confirmed
2022-09-15 16:57:24 +02:00
Hannes Heine
e3c6918436
Merge branch 'master' into 2095-send-email-contribution-confirmed 2022-09-15 16:33:16 +02:00
Hannes Heine
7f06364f33
Merge pull request #2187 from gradido/2134-send-email-when-admin-writes-message-to-contribution
feat: 🍰 Send email when admin writes message to contribution
2022-09-15 16:31:09 +02:00
Hannes Heine
f261e76a38
Merge branch 'master' into 2134-send-email-when-admin-writes-message-to-contribution 2022-09-15 16:02:37 +02:00
Hannes Heine
e463205d0e
Merge pull request #2063 from gradido/2010-send-email-to-transaction-link-sender
feat: 🍰 Send Email To Transaction Link Sender After Receiver Redeemed It
2022-09-15 16:02:18 +02:00
Hannes Heine
c71caa139d
Merge branch 'master' into 2010-send-email-to-transaction-link-sender 2022-09-15 15:44:35 +02:00
joseji
ded649f342 Events and logs completed in User Resolver 2022-09-15 11:42:03 +02:00
elweyn
a2309ea1a5 Correct text, 'Deine' => 'Dein'. 2022-09-14 11:28:28 +02:00
elweyn
e3257c1f71 Fix prettier. 2022-09-14 11:22:42 +02:00
elweyn
6d15ea5c2b Remove unused import. 2022-09-14 11:20:50 +02:00
elweyn
3b810b2add Tests that sendContributionConfirmedEmail is called, removed contributionAmount since it can not be checked. 2022-09-14 09:31:39 +02:00
Hannes Heine
4d493f5a4f
Merge branch 'master' into 2095-send-email-contribution-confirmed 2022-09-14 09:07:01 +02:00
elweyn
ce1fe72a4f Merge branch '2134-send-email-when-admin-writes-message-to-contribution' of https://github.com/gradido/gradido into 2134-send-email-when-admin-writes-message-to-contribution 2022-09-14 09:05:21 +02:00
Hannes Heine
6704cb0f87
Merge branch 'master' into 2134-send-email-when-admin-writes-message-to-contribution 2022-09-14 09:04:56 +02:00
elweyn
0820d8d529 Tests that the method sendAddedContributionMessageEmail is called. 2022-09-14 09:04:39 +02:00
elweyn
d65bd827ca Change search to get the contribution.user instead of queriing it after wards. 2022-09-14 09:03:28 +02:00
Hannes Heine
a87667af02
Update backend/src/mailer/sendAddedContributionMessageEmail.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-14 08:34:41 +02:00
Moriz Wahl
4b226813aa
Merge pull request #2196 from gradido/v1.12.1
release: Version 1.12.1
2022-09-13 13:47:56 +02:00
Moriz Wahl
65318c4498 release: Version 1.12.1 2022-09-13 13:37:30 +02:00
Alexander Friedland
0525a1e689
Merge pull request #2195 from gradido/bug-icon-all-contributions
fix: 🍰 Show Not Icons In `allContribution` List
2022-09-13 13:21:32 +02:00
ogerly
f7454e3146 fix bug 2022-09-13 10:18:16 +02:00
elweyn
7ab7380f09 Call new method to send confirmedContribution EMail to the user. 2022-09-12 11:36:24 +02:00
elweyn
0356ae6f26 Add method to send email when contribution has been confirmed. 2022-09-12 11:35:56 +02:00
elweyn
7812a941b5 Add EMail text for contributionConfirmed. 2022-09-12 11:35:31 +02:00
elweyn
72f85c0d59 Add test for sendContributionConfirmedEmail. 2022-09-12 11:35:01 +02:00
Moriz Wahl
3d6b889624
Merge pull request #2191 from gradido/release-1.12.0
release: v1.12.0
2022-09-12 11:13:09 +02:00
Moriz Wahl
39d7de3d4b release: v1.12.0 2022-09-12 10:47:07 +02:00
Alexander Friedland
ee58530900
Merge pull request #2189 from gradido/2188-do-not-save-empty-messages
if message empty else disabled button
2022-09-09 15:53:41 +02:00