2429 Commits

Author SHA1 Message Date
elweyn
68aa0a5d07 Withdrew createdAt = new Date() and use updatedAt or createdAt from the contribution. 2022-10-24 16:00:08 +02:00
elweyn
ce73e2c447 Change value from new to old value. 2022-10-24 13:40:28 +02:00
elweyn
94e9039c86 Add changed values to the new contribution message. 2022-10-24 13:23:42 +02:00
elweyn
e29c9a111d Add a contribution message when things are changed. 2022-10-24 12:15:54 +02:00
elweyn
43705b3a40 Merge master into this branch, resolve merge conflicts 2022-10-24 12:03:27 +02:00
jjimenezgarcia
902222b9c8
Update backend/src/util/validate.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-10-24 08:05:37 +02:00
Moriz Wahl
ad99406060
Merge branch 'master' into left-join-with-deleted-email-contacts 2022-10-24 06:05:19 +02:00
42040e5562
Merge branch 'master' into test-transaction-resolver 2022-10-21 12:46:37 +02:00
6b793e7ff2
Merge branch 'master' into 2270-Text-changes-contribution-request 2022-10-21 12:43:57 +02:00
Hannes Heine
2827f30d08
Merge branch 'master' into 2139-add-deleted-by-to-contributions 2022-10-20 13:36:43 +02:00
elweyn
1e25bde9c5 Change database version for the feature, resolve merge conflicts. 2022-10-20 13:36:25 +02:00
Alexander Friedland
f88470de75
Merge branch 'master' into 2270-Text-changes-contribution-request 2022-10-20 13:02:22 +02:00
Alexander Friedland
295ea212d1
Merge branch 'master' into 2271-Show-rejected-Contributions 2022-10-20 13:01:26 +02:00
Moriz Wahl
6970cc1725 fix: Include Deleted Email Contacts in User Search 2022-10-20 11:51:37 +02:00
ogerly
a4bf122bf4 change E-Mail Subject 2022-10-20 11:46:19 +02:00
Moriz Wahl
886a8291c9 release: Version 1.13.1 2022-10-20 10:56:19 +02:00
Moriz Wahl
39df2a4e96 test send email with test modus true 2022-10-20 10:21:39 +02:00
ogerly
2d7bef3e7e dleted contributions are displayed to the user 2022-10-20 10:00:53 +02:00
Moriz Wahl
e9f40bc638 fix unit test 2022-10-20 09:47:59 +02:00
02f9439bd2
correctly evaluate to false 2022-10-19 19:16:21 +02:00
joseji
259475755c fixed wrong responsabilities of exception throwing and implementation of calculateBalance() 2022-10-18 23:24:43 +02:00
joseji
d90d366946 fixed unnecessary params 2022-10-18 20:24:30 +02:00
joseji
1848db1ba1 added some log tests 2022-10-18 19:51:10 +02:00
Moriz Wahl
f030493439
Merge branch 'master' into contribution-resolver-logs-and-events 2022-10-18 17:03:03 +02:00
Moriz Wahl
9551d6f8a2 release: Version 1.13.0 2022-10-18 15:39:44 +02:00
Moriz Wahl
26249f361c fix query to get email of linked user 2022-10-18 15:24:06 +02:00
jjimenezgarcia
49ea82783d
Merge branch 'master' into contribution-resolver-logs-and-events 2022-10-17 23:31:19 +02:00
joseji
cbdb68f385 missed 1 decimal check on tests 2022-10-17 23:22:04 +02:00
jjimenezgarcia
f6f2ec1a71
Merge branch 'master' into test-transaction-resolver 2022-10-17 23:17:46 +02:00
Moriz Wahl
9ae023842b fix: Daily Redeem of Contribution Link 2022-10-17 08:54:53 +02:00
joseji
2fd37a7503 fixed tests and negative numbers are now detected 2022-10-14 13:59:41 +02:00
joseji
b58851000b Merge branch 'master' into test-transaction-resolver 2022-10-14 13:55:53 +02:00
joseji
7d17735d7f decimals from db tested propperly and merged master 2022-10-14 13:05:00 +02:00
Hannes Heine
4cf2297d93
Merge branch 'master' into 2140-add-updated-at-to-contributions 2022-10-13 17:48:32 +02:00
Hannes Heine
c7d1d42434
Merge branch 'master' into 2139-add-deleted-by-to-contributions 2022-10-13 17:19:17 +02:00
elweyn
eb18bb8e7c Add deletedBy value on deleteContribution mutation. 2022-10-13 17:18:56 +02:00
elweyn
c9f8b70201 Resolve merge conflict. 2022-10-13 17:17:39 +02:00
Moriz Wahl
90c1e18aa3
Merge branch 'master' into jest-extension-decimal-equal 2022-10-13 17:01:49 +02:00
Moriz Wahl
5d37bd6df6
Merge branch 'master' into daily-rule-for-contribution-links-frontend 2022-10-13 16:51:11 +02:00
Moriz Wahl
81651e4c7e
Update backend/src/graphql/resolver/TransactionLinkResolver.test.ts
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-10-13 15:57:51 +02:00
Moriz Wahl
2ef5efde20
Merge branch 'master' into daily-rule-for-contribution-links-frontend 2022-10-13 15:56:21 +02:00
Moriz Wahl
795a16627c
Merge branch 'master' into do-not-list-expired-contribution-links 2022-10-13 15:55:03 +02:00
joseji
91c05fcb9b events implemented and tested 2022-10-13 14:13:23 +02:00
joseji
a4ded0f61e database version 2022-10-13 13:57:48 +02:00
joseji
0b68f2f74b tests up and working 2022-10-13 13:44:39 +02:00
Wolfgang Huß
d4353f34fa Fix reminder in test TransactionLinkResolver.test.ts of merging master – login is now a mutation 2022-10-13 13:33:24 +02:00
Wolfgang Huß
cc63c627c2 Merge branch 'master' of github.com:gradido/gradido into do-not-list-expired-contribution-links 2022-10-13 13:30:15 +02:00
Wolfgang Huß
e56ba75ee3 Fix reminder in test TransactionLinkResolver.test.ts of merging master – login is now a mutation – again, sorry 2022-10-13 12:48:18 +02:00
Wolfgang Huß
3477c009ae Fix reminder in test TransactionLinkResolver.test.ts of merging master – login is now a mutation 2022-10-13 12:39:56 +02:00
joseji
f6b386101d test start 2022-10-13 12:18:38 +02:00