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
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
Wolfgang Huß
47e4be4697
Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
2022-10-04 11:46:52 +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
clauspeterhuebner
7460f95d8f
Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham
2022-09-30 00:23:12 +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
mahula
899b74d60a
wallet frontend: merge components
...
- functionality of slot compoments IsModerator and IsNotModerator is added to component ContributionMessagesListItem
- the slot components are removed, since not required anymore
2022-09-29 12:39:21 +02:00
