11463 Commits

Author SHA1 Message Date
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
Wolfgang Huß
89d3105afb Refine logger.info message for successfully send email 2022-10-12 11:53:02 +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
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
Wolfgang Huß
267a48c970 Increase config version from 'v1.2022-03-18' to 'v10.2022-09-20' 2022-10-11 10:08:51 +02:00
Wolfgang Huß
056afdb2a5 Fix hanging of seeding, because of the 'i18n' configuration 2022-10-11 10:05:27 +02:00
Wolfgang Huß
54461e2465 Fix test in 'UserResolver.test.ts' 2022-10-11 09:20:27 +02:00
Wolfgang Huß
05074e37bc Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates 2022-10-10 17:51:55 +02:00
Wolfgang Huß
f90f981566 Refine translation 2022-10-10 17:51:40 +02:00
Wolfgang Huß
ad719dde43 Implement translation, very first approach 2022-10-10 11:54:09 +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
3ccb3c44ed
Merge branch 'master' into 1574-Concept_to_introduce_Gradido-ID 2022-10-06 23:50:32 +02:00
clauspeterhuebner
09b2fbd4ad
Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham 2022-10-06 22:34:50 +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
clauspeterhuebner
8e2b70a1be
Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham 2022-10-06 22:13:41 +02:00
Claus-Peter Hübner
4d2157be30 Merge remote-tracking branch 'origin/master' into 1574-Concept_to_introduce_Gradido-ID 2022-10-06 20:41:58 +02:00
Claus-Peter Hübner
c263a1ee6c finish description of stage-2 2022-10-06 20:40:12 +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
Wolfgang Huß
d6300c373c Merge branch '2172-merge-contribution-message-compoments' of github.com:gradido/gradido into 1288-email-templates 2022-10-06 13:37:56 +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
f268651700 Merge remote-tracking branch 'origin/master' into
1574-Concept_to_introduce_Gradido-ID
2022-10-06 01:20:43 +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
Wolfgang Huß
83d2aaa276 Refine email design 2022-10-05 13:39:38 +02:00
Wolfgang Huß
a02d8d0edb Get email-template to work the first time 2022-10-05 11:07:16 +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