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 |
|
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 |
|
Moriz Wahl
|
9ae023842b
|
fix: Daily Redeem of Contribution Link
|
2022-10-17 08:54:53 +02:00 |
|
joseji
|
7d17735d7f
|
decimals from db tested propperly and merged master
|
2022-10-14 13:05:00 +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 |
|
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 |
|
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 |
|
jjimenezgarcia
|
0ddd08d1e1
|
Merge branch 'master' into contribution-resolver-logs-and-events
|
2022-10-07 12:09:31 +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
|
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 |
|
Claus-Peter Hübner
|
e701f99553
|
rework PR comments
|
2022-09-23 01:11:37 +02:00 |
|