11463 Commits

Author SHA1 Message Date
mahula
ce63ffed35 add feature test for changing the password in user profile 2022-09-15 10:13:02 +02:00
mahula
7e20531f39 update user authentication feature test 2022-09-15 09:55:44 +02:00
mahula
9890898191 add custom command for reusable login via API 2022-09-15 09:14:29 +02:00
mahula
1418d2e8fb update yarn.lock 2022-09-15 09:07:59 +02:00
mahula
9fea90fe57 add run exclusion of tests marked to skip 2022-09-15 09:07:40 +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
clauspeterhuebner
952fd5ee3b
Merge branch 'master' into 2144-feature-usecase-concept-setting-alias-in-user-profile 2022-09-14 22:43:49 +02:00
Claus-Peter Hübner
b024956dbd results of architecture-meeting and results of resolver method analysis
to take care about user timezone offset
2022-09-14 21:56:19 +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
Claus-Peter Hübner
b7a35d167b first draft 2022-09-13 22:33:16 +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
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
elweyn
5aea6f9d9d Move sendAddedContributionMessageEmail to new file. 2022-09-09 09:20:34 +02:00
elweyn
d49d5f6bb7 Remove addedContributionMessageEmail test from this file. 2022-09-09 09:20:14 +02:00
elweyn
032348f8c2 Remove addedContributionMessageEmail from this file. 2022-09-09 09:19:49 +02:00