1740 Commits

Author SHA1 Message Date
Moriz Wahl
c3b624f36f add order by clause 2022-10-27 19:55:23 +02:00
Moriz Wahl
568a6cdd2c
Merge branch 'master' into 2202-refactor-creations-query 2022-10-27 15:01:40 +02:00
elweyn
69004d5659 Merge branch 'master' into 2140-add-updated-at-to-contributions 2022-10-26 12:05:49 +02:00
elweyn
0d304f9d71 Remove TODO comments and change the written message to only the old values no prefix. 2022-10-26 12:05:27 +02:00
joseji
1407ea0e8b skipped test for changing month 2022-10-26 11:26:04 +02:00
Moriz Wahl
b2a1d7d672 include pending contributions for validation of contribution link, test it 2022-10-26 06:38:49 +02:00
Moriz Wahl
b5edc5f476 clean up 2022-10-25 13:45:43 +02:00
joseji
7662d281f7 fixed test with new info 2022-10-25 12:37:08 +02:00
Moriz Wahl
d1a1059158 Merge branch 'master' into 2202-refactor-creations-query 2022-10-25 12:15:51 +02:00
joseji
2bf1bd6d36 fixed collisions 2022-10-25 12:01:30 +02:00
joseji
f0c39703f1 fixed wrong removals of negative numbers 2022-10-24 22:05:17 +02:00
joseji
f8ef64054d Merge branch 'master' into test-transaction-resolver 2022-10-24 22:02:18 +02:00
joseji
3bd339d798 fixed wrong removals of negative numbers 2022-10-24 22:01:19 +02:00
elweyn
53d315749d Change import from ../enum to @enum 2022-10-24 16:01:48 +02:00
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
42040e5562
Merge branch 'master' into test-transaction-resolver 2022-10-21 12:46:37 +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
ogerly
2d7bef3e7e dleted contributions are displayed to the user 2022-10-20 10:00:53 +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
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
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