IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,479 Commits 1 Branch 0 Tags
Commit Graph

10479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus-Peter Hübner
969d6d0fbe Merge branch '1798-feature-gradidoid-1-adapt-and-migrate-database-schema' of github.com:gradido/gradido into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-23 01:12:24 +02:00
Claus-Peter Hübner
e701f99553 rework PR comments 2022-09-23 01:11:37 +02:00
clauspeterhuebner
b0781bce88
Update backend/src/graphql/resolver/UserResolver.test.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-09-23 01:03:07 +02:00
clauspeterhuebner
62446bd2f0
Update backend/src/graphql/resolver/AdminResolver.test.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-09-23 00:56:36 +02:00
Claus-Peter Hübner
0b410fd5fd oel convert 2022-09-23 00:50:07 +02:00
Claus-Peter Hübner
d2ff1862e6 Merge remote-tracking branch 'origin/master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-16 15:22:56 +02:00
Claus-Peter Hübner
86b12f98ed set overall resolvers the isolationlevel to REPEATABLE READ 2022-09-16 15:20:51 +02:00
Claus-Peter Hübner
3fcc62539a changes after merge from master 2022-09-16 15:14:51 +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
clauspeterhuebner
d592c57024
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-15 17:56:21 +02:00
Claus-Peter Hübner
bb8fc6a16e change using findUserByEmail() instead of raw queries 2022-09-15 17:48:22 +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
Claus-Peter Hübner
4e07aeaff1 Merge branch '1798-feature-gradidoid-1-adapt-and-migrate-database-schema' of github.com:gradido/gradido into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-15 02:43:18 +02:00
Claus-Peter Hübner
411e03c843 rework PR comments 2022-09-15 02:40:59 +02:00
clauspeterhuebner
9a99a8741d
Update database/entity/0049-add_user_contacts_table/User.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-09-15 01:05:34 +02:00
clauspeterhuebner
45330a60fa
Update database/entity/0049-add_user_contacts_table/User.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-09-15 00:59:45 +02:00
clauspeterhuebner
64aab998e2
Update backend/src/graphql/resolver/UserResolver.test.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-09-14 23:57:53 +02:00
Claus-Peter Hübner
13d79fd8b7 remove multi-line comments 2022-09-14 23:00:47 +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
Claus-Peter Hübner
d9313b68db init moderator in UnconfirmedContribution 2022-09-12 19:26:59 +02:00
Claus-Peter Hübner
7cd5ecb463 linting 2022-09-12 19:02:12 +02:00
Claus-Peter Hübner
298924001c linting 2022-09-12 18:45:42 +02:00
Claus-Peter Hübner
68ba6def14 now find users including emailContact 2022-09-12 18:41:17 +02:00
Claus-Peter Hübner
e6155d52e1 solve error 2022-09-12 18:34:21 +02:00
Claus-Peter Hübner
94f15f7475 Merge remote-tracking branch 'origin/master' into 
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
 2022-09-12 18:18:46 +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