10699 Commits

Author SHA1 Message Date
mahula
7b1daaf760 disable change of month in creation editing form in admin area 2022-10-13 13:58:09 +02:00
mahula
43a9ec2a4c adapt contribution form unit tests to changes 2022-10-13 13:34:51 +02:00
mahula
bb65a1b11b disable contribution form datepicker when editing existing contribution 2022-10-13 13:34:09 +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
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
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
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
mahula
55453b217b admin 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:37:30 +02:00
jjimenezgarcia
0acdcc3220
Merge branch 'master' into event-updating 2022-09-29 12:27:13 +02:00
joseji
bc11a4a5ba headers fix 2022-09-29 12:26:28 +02:00
mahula
b0e9550ffc
update e2e-tests/cypress/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-29 12:21:49 +02:00
mahula
0a81a1210a
Merge branch 'master' into 2243-fix-cypress-tests-unreliability 2022-09-29 11:41:30 +02:00
mahula
f780b1c431
update e2e-tests/cypress/README.md
- hint about seeding the database before each test run
2022-09-29 11:32:57 +02:00
mahula
6796190f09
update e2e-tests/cypress/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-29 11:12:29 +02:00
mahula
07815e887f
update e2e-tests/cypress/README.md
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-29 11:12:06 +02:00
Wolfgang Huß
2b9a415d4b
Merge pull request #2209 from gradido/2208-refine-deployment-docs
docs: 🍰 Refine Deployment Documentation
2022-09-29 09:02:21 +02:00
Moriz Wahl
0ed12f878f remove back ticks in sql statement 2022-09-29 04:38:33 +02:00
Moriz Wahl
5bb6fd048d get email optin in a better way 2022-09-28 22:15:21 +02:00
Claus-Peter Hübner
5d705dfc7d Merge branch '2220-feature-reconfigure-log4js' of github.com:gradido/gradido into 2220-feature-reconfigure-log4js 2022-09-28 21:44:29 +02:00