elweyn
|
00d0068efc
|
Remove unused imports.
|
2022-09-21 13:44:42 +02:00 |
|
elweyn
|
8989b6f50e
|
Change query of the creationTransactionList, add new parameters to CreationTransactionList and add translations.
|
2022-09-21 13:33:32 +02:00 |
|
elweyn
|
5aa499a073
|
Change the result for the FE so that we get datas from the contribution table instead of the transaction table.
|
2022-09-21 13:31:19 +02:00 |
|
elweyn
|
a93085b822
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-21 12:42:38 +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 |
|
ogerly
|
db2415e617
|
fix locales
|
2022-09-16 10:22:19 +02:00 |
|
ogerly
|
420296ca94
|
fix lint
|
2022-09-16 09:59:44 +02:00 |
|
ogerly
|
641d2d4cc2
|
creation date better represented
|
2022-09-16 09:58:41 +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
|
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 |
|
elweyn
|
42f667674e
|
Remove unused import.
|
2022-09-09 14:54:37 +02:00 |
|
elweyn
|
a3d65228f9
|
Add sendEmail mock to the test file.
|
2022-09-09 14:44:22 +02:00 |
|
elweyn
|
93e7684eda
|
Change import to the new file.
|
2022-09-09 14:44:00 +02:00 |
|
elweyn
|
655e405866
|
Change text of email.
|
2022-09-09 14:43:30 +02:00 |
|
ogerly
|
6c39fe9362
|
if message empty else disabled button
|
2022-09-09 14:40:15 +02:00 |
|
elweyn
|
2651a8afca
|
Move test for sendAddedContributionMessageEmail.
|
2022-09-09 09:20:56 +02:00 |
|