10963 Commits

Author SHA1 Message Date
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
joseji
d799eecada added contributionId and amount to some tests 2022-10-11 12:11:18 +02:00
jjimenezgarcia
c8cd221598
Merge branch 'master' into event-updating 2022-10-11 11:35:03 +02:00
joseji
a50871185f new contribution related admin events implemented and working 2022-10-07 12:47:07 +02:00
joseji
088e30daae added admin events for contributions 2022-10-07 12:36:31 +02:00
joseji
34b6e0d48f added new events 2022-10-07 12:32:00 +02:00
joseji
84d87bbee6 fixed wrong order on one method call parameters 2022-10-07 12:15:49 +02:00
joseji
3cfe266a05 Merge branch 'contribution-resolver-logs-and-events' into admin-resolver-events-and-logging
as new events were added in the branch being merged
2022-10-07 12:11:35 +02:00
jjimenezgarcia
0ddd08d1e1
Merge branch 'master' into contribution-resolver-logs-and-events 2022-10-07 12:09:31 +02:00
joseji
ad174e6e0a corrections 2022-10-07 12:09:09 +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
Claus-Peter Hübner
e1af493be2 overwork the concept 2022-10-05 18:19:56 +02:00
mahula
d37b8d3e50 remove default prop value from ContributionMessagesListItem 2022-10-05 17:08:39 +02:00
Claus-Peter Hübner
5f3d209409 Merge branch '2144-feature-usecase-concept-setting-alias-in-user-profile' of github.com:gradido/gradido into 2144-feature-usecase-concept-setting-alias-in-user-profile 2022-10-05 15:29:03 +02:00
Claus-Peter Hübner
e9293395cc Merge remote-tracking branch 'origin/master' into 2144-feature-usecase-concept-setting-alias-in-user-profile 2022-10-05 15:28:11 +02:00
ogerly
68e24a5973 strip html from text 2022-10-05 08:19:11 +02:00
joseji
3eae1f60b2 applied propper conventions and fixed code duplication 2022-10-04 21:18:00 +02:00
jjimenezgarcia
a3ded15bf0
Merge branch 'master' into event-updating 2022-10-04 20:53:03 +02:00
joseji
65f53df939 added new column to event protocol dabatase table to keep message id 2022-10-04 20:34:37 +02:00
joseji
bb3d1caa73 fixed amount not being initialized in databsae while storing events 2022-10-04 20:33:50 +02:00
joseji
4853eea32a fixed wrong non mandatory attributes 2022-10-04 20:33:22 +02:00
joseji
903fd4446e changed database version 2022-10-04 20:32:10 +02:00
joseji
7a21ec12e0 message changed for messageId and some small problems solved 2022-10-04 19:26:05 +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
ogerly
ce3d9b1708 find link and replace to <a> element 2022-10-04 12:43:51 +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
979ae3f14d
Merge branch 'master' into 2144-feature-usecase-concept-setting-alias-in-user-profile 2022-09-30 00:28:57 +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