10777 Commits

Author SHA1 Message Date
Moriz Wahl
79e4bce06d unify list transaction link query 2022-10-18 15:21:01 +02:00
clauspeterhuebner
34ee0470fa
Merge pull request #2148 from gradido/2144-feature-usecase-concept-setting-alias-in-user-profile
concept capturing alias
2022-10-18 03:37:54 +02:00
clauspeterhuebner
92ed556420
Merge branch 'master' into 2144-feature-usecase-concept-setting-alias-in-user-profile 2022-10-18 03:27:14 +02:00
Moriz Wahl
ea519ded22
Merge pull request #2265 from gradido/fix-daily-redeem-rule
fix: 🍰 Daily Redeem Of Contribution Link
2022-10-17 15:36:58 +02:00
Moriz Wahl
9ae023842b fix: Daily Redeem of Contribution Link 2022-10-17 08:54:53 +02:00
mahula
5c68186d40
Merge pull request #2260 from gradido/2246-bug-redeem-code-is-lost
fix: 🐛 Prevent Loosing Redeem Code When Changing Between Register and Login in Auth Navbar
2022-10-13 17:34:29 +02:00
mahula
505181b975
Merge branch 'master' into 2246-bug-redeem-code-is-lost 2022-10-13 17:23:34 +02:00
mahula
fc56be334e
Merge pull request #2264 from gradido/2249-bug-disable-change-of-month-on-update-contribution
fix: Disable Change of Month on Update Contribution
2022-10-13 17:22:24 +02:00
mahula
5547e8fa53
Merge branch 'master' into 2246-bug-redeem-code-is-lost 2022-10-13 17:15:25 +02:00
Moriz Wahl
1e965c6db0
Merge branch 'master' into 2249-bug-disable-change-of-month-on-update-contribution 2022-10-13 17:12:27 +02:00
Moriz Wahl
19833a2df6
Merge pull request #2261 from gradido/jest-extension-decimal-equal
feat: 🍰 Global Jest Extension For Decimal Equal
2022-10-13 17:11:44 +02:00
Moriz Wahl
90c1e18aa3
Merge branch 'master' into jest-extension-decimal-equal 2022-10-13 17:01:49 +02:00
Moriz Wahl
4b6dd5376d
Merge pull request #2262 from gradido/daily-rule-for-contribution-links-frontend
feat: 🍰 Daily Rule For Contribution Links In Admin Interface
2022-10-13 17:01:20 +02:00
Moriz Wahl
833bc909de Merge branch 'daily-rule-for-contribution-links-frontend' of github.com:gradido/gradido into daily-rule-for-contribution-links-frontend 2022-10-13 16:51:42 +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
10a6398d55
Merge pull request #2257 from gradido/do-not-list-expired-contribution-links
feat: 🍰 Do Not Show Expired Contribution Links In Wallet
2022-10-13 16:27:03 +02:00
Moriz Wahl
0b079397f9 remove unused computed property 2022-10-13 15:59:19 +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
Moriz Wahl
025a10f3ba
Update frontend/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-10-13 15:53:54 +02:00
Moriz Wahl
3bddcda53b
Merge pull request #2258 from gradido/disable-change-month-for-contribution-updates
fix: 🍰 Disable Change Of Month For Update Contribution (wallet and admin)
2022-10-13 15:53:20 +02:00
mahula
80fcde8c13
Merge branch 'master' into 2249-bug-disable-change-of-month-on-update-contribution 2022-10-13 14:32:50 +02:00
mahula
7b1daaf760 disable change of month in creation editing form in admin area 2022-10-13 13:58:09 +02:00
mahula
43a9ec2a4c adapt contribution form unit tests to changes 2022-10-13 13:34:51 +02:00
mahula
bb65a1b11b disable contribution form datepicker when editing existing contribution 2022-10-13 13:34:09 +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
mahula
b0352aadf2
Merge branch 'master' into 2246-bug-redeem-code-is-lost 2022-10-13 10:49:27 +02:00
mahula
3439bdc673 change import path for auth links mixin 2022-10-13 10:28:29 +02:00
Moriz Wahl
51da13b461 increase test coverage 2022-10-13 10:18:36 +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
Wolfgang Huß
3fd085f680
Merge pull request #2232 from gradido/2218-refactor-logout-to-mutation
refactor: 🍰 Login And Logout To Mutations
2022-10-13 09:58:37 +02:00
Moriz Wahl
d662338f6a feat: Daily Rule for Contribution Links in Admin Interface 2022-10-13 09:52:25 +02:00
mahula
b161114861
Merge branch 'master' into 2246-bug-redeem-code-is-lost 2022-10-13 09:50:03 +02:00
mahula
dc510edf28 adapt unit tests to changes on auth nav bar component 2022-10-13 09:43:51 +02:00
Moriz Wahl
bf5abb9055 Merge branch 'daily-rule-for-contribution-links' into daily-rule-for-contribution-links-frontend 2022-10-13 09:08:32 +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
mahula
70e11b8e49 use computed auth links from mixins 2022-10-12 18:16:02 +02:00
Wolfgang Huß
642b408d1e Merge branch 'master' of github.com:gradido/gradido into 2218-refactor-logout-to-mutation 2022-10-12 17:39:44 +02:00
Wolfgang Huß
b75b822d10 Increase coverage in admin interface 2022-10-12 17:38:17 +02:00
mahula
1b4c013077
Merge pull request #2254 from gradido/2069-verify-token-before-redeeming-a-link
fix: 🐛 Verify Token Before Redeeming A Link
2022-10-12 17:31:35 +02:00
Moriz Wahl
b36abc5c62 set backend unit test coverage to 74 2022-10-12 17:23:09 +02:00
Moriz Wahl
686c24a57d add tests for daily contribution link 2022-10-12 17:17:10 +02:00
Wolfgang Huß
cb0e044fb4 Refine GQL logout in admin interface 2022-10-12 17:16:30 +02:00