IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,740 Commits 1 Branch 0 Tags
Commit Graph

10740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Moriz Wahl
69c0c214b9 update browser list 2022-10-12 17:03:51 +02:00
Wolfgang Huß
34ec593f21 Implement GQL logout in admin interface 2022-10-12 16:46:46 +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
mahula
1f3bdfe036
Merge branch 'master' into 2069-verify-token-before-redeeming-a-link 2022-10-12 13:09:45 +02:00
mahula
00e7ea776d remove usage of jsonwebtoken from transaction list unit tests 2022-10-12 13:01:01 +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
505463a3f8 show default text when no contribution links are present 2022-10-11 20:03:52 +02:00
Moriz Wahl
7286389b87 filter contribution link list by valid to 2022-10-11 20:03:00 +02:00
jjimenezgarcia
b291c56d7b
Merge pull request #2240 from gradido/event-updating 
Refactor: Add all events to documentation table
 2022-10-11 12:11:45 +02:00
jjimenezgarcia
c8cd221598
Merge branch 'master' into event-updating 2022-10-11 11:35:03 +02:00
mahula
832dd17f3e
Merge branch 'master' into 2069-verify-token-before-redeeming-a-link 2022-10-07 11:05:29 +02:00
mahula
2c31e4e87f fix linting 2022-10-07 10:49:30 +02:00
mahula
1fd4764928 adapt unit tests to changes in page TransactionLink.vue 2022-10-07 10:44:15 +02:00
mahula
6bf1eec463 add node module jsonwebtoken (required for testing) to package.json 2022-10-07 10:36:40 +02:00
clauspeterhuebner
2761bd2d01
Merge pull request #2221 from gradido/2220-feature-reconfigure-log4js 
reconfig log4js with rollover feature and userid in logevent-message
 2022-10-06 22:24:17 +02:00
clauspeterhuebner
86d4a78da8
Merge branch 'master' into 2220-feature-reconfigure-log4js 2022-10-06 22:14:48 +02:00
mahula
46e2b5ca9f
Merge pull request #2251 from gradido/2172-merge-contribution-message-compoments 
refactor: 🍰 Refactoring Components Of `CotributionMessagesListItem`
 2022-10-06 18:39:40 +02:00
mahula
e93e8e6b0a fix language dependency in unit tests for ContributionMessagesListItem 2022-10-06 18:23:54 +02:00