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ß
|
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 |
|
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 |
|
Wolfgang Huß
|
cb0e044fb4
|
Refine GQL logout in admin interface
|
2022-10-12 17:16:30 +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 |
|
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 |
|
mahula
|
0b7313d216
|
add checking token expiration time to TransactionLink.vue
|
2022-10-06 18:05:04 +02:00 |
|
mahula
|
40e505f6e5
|
fix unit test error
|
2022-10-06 10:39:42 +02:00 |
|
mahula
|
11f320ba3f
|
admin frontend: add tests for ContributionMessagesListItem
|
2022-10-06 10:23:47 +02:00 |
|
mahula
|
1bd90cf427
|
wallet frontend: add tests for ContributionMessagesListItem
|
2022-10-06 10:14:36 +02:00 |
|
mahula
|
d37b8d3e50
|
remove default prop value from ContributionMessagesListItem
|
2022-10-05 17:08:39 +02:00 |
|
jjimenezgarcia
|
a3ded15bf0
|
Merge branch 'master' into event-updating
|
2022-10-04 20:53:03 +02:00 |
|
mahula
|
0426665adc
|
Merge branch 'master' into 2172-merge-contribution-message-compoments
|
2022-10-04 17:29:07 +02:00 |
|
mahula
|
5d3ec46d1a
|
fix linting
|
2022-10-04 17:21:12 +02:00 |
|
mahula
|
b82bfb6b12
|
admin frontend: adapt unit tests for merged components
- add tests to ContributionMessagesListItem.spec.js
- remove tests for removed components
|
2022-10-04 17:12:11 +02:00 |
|
mahula
|
14aa976e5a
|
wallet frontend: adapt unit tests for merged components
- add tests to ContributionMessagesListItem.spec.js
- remove slots tests
|
2022-10-04 12:11:23 +02:00 |
|
clauspeterhuebner
|
92bda917ca
|
Merge branch 'master' into 2220-feature-reconfigure-log4js
|
2022-09-30 00:27:25 +02:00 |
|
Alexander Friedland
|
8a8ffccd71
|
Merge pull request #2233 from gradido/send-form-border-radius
style: add border-radius on send form
|
2022-09-29 15:22:05 +02:00 |
|
Alexander Friedland
|
42cc74e1dd
|
Merge branch 'master' into send-form-border-radius
|
2022-09-29 15:09:47 +02:00 |
|
Alexander Friedland
|
d7dfa22134
|
Merge pull request #2212 from gradido/2198-adminarea-more-dates-on-created-transaction
2198 adminarea more dates on created transaction
|
2022-09-29 15:09:22 +02:00 |
|
Alexander Friedland
|
6d75801754
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-29 14:50:29 +02:00 |
|
Alexander Friedland
|
6219b00a93
|
Merge pull request #2213 from gradido/2109-Typo-im-Dialog
Bug: delete contribution link
|
2022-09-29 14:50:17 +02:00 |
|
Alexander Friedland
|
aea4057df1
|
Merge branch 'master' into 2109-Typo-im-Dialog
|
2022-09-29 14:36:36 +02:00 |
|
Alexander Friedland
|
66ea65fb1c
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-29 14:36:30 +02:00 |
|
mahula
|
09eed43c79
|
Merge pull request #2245 from gradido/2243-fix-cypress-tests-unreliability
chore: 🍰 Fix Cypress Tests Unreliability
|
2022-09-29 14:07:49 +02:00 |
|
Alexander Friedland
|
9518ac55c8
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-29 14:05:54 +02:00 |
|
Alexander Friedland
|
352a6fee5c
|
Merge branch 'master' into 2109-Typo-im-Dialog
|
2022-09-29 14:05:37 +02:00 |
|