1720 Commits

Author SHA1 Message Date
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
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
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
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
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ß
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
joseji
a50871185f new contribution related admin events implemented and working 2022-10-07 12:47:07 +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
Wolfgang Huß
a02d8d0edb Get email-template to work the first time 2022-10-05 11:07:16 +02:00
joseji
bb3d1caa73 fixed amount not being initialized in databsae while storing events 2022-10-04 20:33:50 +02:00
clauspeterhuebner
92bda917ca
Merge branch 'master' into 2220-feature-reconfigure-log4js 2022-09-30 00:27:25 +02:00
joseji
7061718c1f all conversations solved 2022-09-29 12:20:08 +02:00
joseji
df25197842 solved unnecessary date creation regarding one invalid date testing 2022-09-29 11:39:01 +02:00
joseji
a756f0a4cc all tests completed 2022-09-28 12:47:00 +02:00
joseji
0f1f9baa8d added tests for events 2022-09-28 11:57:49 +02:00
joseji
33eeab344f added missing error logs 2022-09-28 11:14:16 +02:00
joseji
2ca9945a1b added missing events 2022-09-28 11:09:14 +02:00
elweyn
ea234add11 Add message after updateContribution. 2022-09-27 13:37:45 +02:00
joseji
91b363e61c fixed conflicts 2022-09-26 22:53:57 +02:00
elweyn
186e6711f5 Remove unused import. 2022-09-26 09:10:58 +02:00
elweyn
fefdf9f0fa Merge master and resolve merge conflict. 2022-09-26 08:53:25 +02:00
elweyn
209c61e5d8 Change call from Contribution to DbContribution and use Contribution as model. 2022-09-26 08:48:04 +02:00
Hannes Heine
9bab013847
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-26 08:27:22 +02:00
elweyn
6df8b9a83f Test that when an admin user create a contribution in FE he can not delete it in admin interface. 2022-09-24 11:32:07 +02:00
joseji
744c961c0b fixed tests with new log message 2022-09-23 19:33:54 +02:00
Claus-Peter Hübner
516fc5c5e7 Merge remote-tracking branch 'origin/master' into
2220-feature-reconfigure-log4js
2022-09-23 19:28:28 +02:00
joseji
60d2e2ff7b fixed contribution delete event saving and testing 2022-09-23 18:46:40 +02:00
Claus-Peter Hübner
ab1a4ac8d1 solve tests 2022-09-23 18:24:13 +02:00
elweyn
8c69b94e8e Throw error if moderator tries to deleted own contribution created as user. Add deletedby value. 2022-09-23 16:25:22 +02:00
Claus-Peter Hübner
b3bf7fecc4 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-09-23 01:32:44 +02:00
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