elweyn
|
c9f8b70201
|
Resolve merge conflict.
|
2022-10-13 17:17:39 +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
|
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 |
|
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 |
|
clauspeterhuebner
|
92bda917ca
|
Merge branch 'master' into 2220-feature-reconfigure-log4js
|
2022-09-30 00:27:25 +02:00 |
|
Claus-Peter Hübner
|
ff93c41c19
|
Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js
|
2022-09-28 21:41:51 +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 |
|
clauspeterhuebner
|
55a8174822
|
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
|
2022-09-23 19:29:34 +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 |
|
clauspeterhuebner
|
e955b92235
|
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-09-23 18:48:11 +02:00 |
|
Claus-Peter Hübner
|
ab1a4ac8d1
|
solve tests
|
2022-09-23 18:24:13 +02:00 |
|
elweyn
|
e7b5400db2
|
Change the database version needed for the backend.
|
2022-09-23 16:49:12 +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 |
|
clauspeterhuebner
|
b0781bce88
|
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-23 01:03:07 +02:00 |
|
clauspeterhuebner
|
62446bd2f0
|
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-23 00:56:36 +02:00 |
|
Claus-Peter Hübner
|
3dd66b4527
|
small changes in log-pattern
Merge remote-tracking branch 'origin/master' into
2220-feature-reconfigure-log4js
|
2022-09-23 00:31:33 +02:00 |
|
Claus-Peter Hübner
|
99f0905bee
|
Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js
|
2022-09-22 23:42:23 +02:00 |
|
clauspeterhuebner
|
810d258965
|
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
|
2022-09-22 23:31:08 +02:00 |
|
Claus-Peter Hübner
|
de234cc7df
|
rework PR remarks
|
2022-09-22 23:29:51 +02:00 |
|
Moriz Wahl
|
18008e9598
|
Merge branch 'master' into add-client-request-time
|
2022-09-22 21:13:27 +02:00 |
|
Hannes Heine
|
69b0ee7cbb
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-22 14:35:49 +02:00 |
|
Moriz Wahl
|
25dd12b18b
|
Merge branch 'master' into add-client-request-time
|
2022-09-22 14:18:14 +02:00 |
|
elweyn
|
61f59a2594
|
Remove query of contribution message resolver test since it is never used.
|
2022-09-22 12:34:03 +02:00 |
|
elweyn
|
4461ff92a5
|
Correct tests after changing login and logout from queries to mutations.
|
2022-09-22 12:22:56 +02:00 |
|
elweyn
|
2d4f88ce84
|
Refactor logout method from query to mutation.
|
2022-09-22 11:53:54 +02:00 |
|
joseji
|
db21cf2e8d
|
removed unused imports
|
2022-09-22 11:49:56 +02:00 |
|
elweyn
|
e844bcc925
|
Change login from Query to Mutation.
|
2022-09-22 11:47:28 +02:00 |
|
joseji
|
f710fd9b45
|
fixed await for events redeem register
|
2022-09-22 11:19:32 +02:00 |
|
joseji
|
a8fc8b9249
|
solved conflicts
|
2022-09-22 11:01:10 +02:00 |
|