2551 Commits

Author SHA1 Message Date
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
Wolfgang Huß
80fdc8d30a Merge branch 'master' of github.com:gradido/gradido into daily-rule-for-contribution-links-frontend
# Conflicts:
#	backend/src/seeds/graphql/mutations.ts
2022-10-13 12:01:06 +02:00
Wolfgang Huß
98e64ed867 Merge branch 'master' of github.com:gradido/gradido into disable-change-month-for-contribution-updates 2022-10-13 10:10:03 +02:00
Moriz Wahl
25e461188c ignore eslint rule no-empty-interface 2022-10-13 09:04:29 +02:00
Moriz Wahl
39982759f2 test more decimal values coming from DB 2022-10-12 19:40:26 +02:00
Moriz Wahl
463f0a0601 feat: Global Jest Extension for Decimal Equal 2022-10-12 19:30:06 +02:00
Moriz Wahl
686c24a57d add tests for daily contribution link 2022-10-12 17:17:10 +02:00
Moriz Wahl
69c0c214b9 update browser list 2022-10-12 17:03:51 +02:00
Wolfgang Huß
6d06c0f2d8 Merge branch 'master' of github.com:gradido/gradido into 2218-refactor-logout-to-mutation
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.test.ts
#	backend/src/seeds/factory/contributionLink.ts
#	backend/src/seeds/factory/creation.ts
2022-10-12 16:23:04 +02:00
Moriz Wahl
7e66e299d9 feat: Daily Rule for Contribution Links 2022-10-12 14:46:22 +02:00
Wolfgang Huß
89d3105afb Refine logger.info message for successfully send email 2022-10-12 11:53:02 +02:00
Moriz Wahl
4e13678367 fix test. Add dynamic valid to date for contribution link 2022-10-11 20:56:02 +02:00
Moriz Wahl
bc2889a9f8 fix: Disable Change of Month for Update Contribution (wallet and admin) 2022-10-11 20:44:41 +02:00
Moriz Wahl
7286389b87 filter contribution link list by valid to 2022-10-11 20:03:00 +02:00
joseji
d799eecada added contributionId and amount to some tests 2022-10-11 12:11:18 +02:00
Wolfgang Huß
056afdb2a5 Fix hanging of seeding, because of the 'i18n' configuration 2022-10-11 10:05:27 +02:00
Wolfgang Huß
54461e2465 Fix test in 'UserResolver.test.ts' 2022-10-11 09:20:27 +02:00
Wolfgang Huß
05074e37bc Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates 2022-10-10 17:51:55 +02:00
Wolfgang Huß
f90f981566 Refine translation 2022-10-10 17:51:40 +02:00
Wolfgang Huß
ad719dde43 Implement translation, very first approach 2022-10-10 11:54:09 +02:00
joseji
a50871185f new contribution related admin events implemented and working 2022-10-07 12:47:07 +02:00
joseji
088e30daae added admin events for contributions 2022-10-07 12:36:31 +02:00
joseji
34b6e0d48f added new events 2022-10-07 12:32:00 +02:00
joseji
84d87bbee6 fixed wrong order on one method call parameters 2022-10-07 12:15:49 +02:00
joseji
3cfe266a05 Merge branch 'contribution-resolver-logs-and-events' into admin-resolver-events-and-logging
as new events were added in the branch being merged
2022-10-07 12:11:35 +02:00
jjimenezgarcia
0ddd08d1e1
Merge branch 'master' into contribution-resolver-logs-and-events 2022-10-07 12:09:31 +02:00
joseji
ad174e6e0a corrections 2022-10-07 12:09:09 +02:00
Wolfgang Huß
83d2aaa276 Refine email design 2022-10-05 13:39:38 +02:00
Wolfgang Huß
a02d8d0edb Get email-template to work the first time 2022-10-05 11:07:16 +02:00