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
e357d9c0eb
Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month
2022-09-30 14:00:37 +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
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
joseji
f05c31f69b
removed duplicated code
2022-09-29 12:32:43 +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
jjimenezgarcia
f4b6b371e9
Merge branch 'master' into contribution-resolver-logs-and-events
2022-09-29 12:20:38 +02:00
joseji
7061718c1f
all conversations solved
2022-09-29 12:20:08 +02:00
joseji
ce280f6320
some conversations solved
2022-09-29 11:53:32 +02:00
mahula
0a81a1210a
Merge branch 'master' into 2243-fix-cypress-tests-unreliability
2022-09-29 11:41:30 +02:00
joseji
df25197842
solved unnecessary date creation regarding one invalid date testing
2022-09-29 11:39:01 +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
Claus-Peter Hübner
ff93c41c19
Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js
2022-09-28 21:41:51 +02:00
mahula
5d24d1d510
update cypress test readme
2022-09-28 13:59:29 +02:00
mahula
2a82faff47
fix error caused by missing files regarding rgistration tests
2022-09-28 13:01:27 +02:00
joseji
a756f0a4cc
all tests completed
2022-09-28 12:47:00 +02:00
mahula
e7207da9ac
fix language dependency of some selectors in login and user profile tests
2022-09-28 12:13:49 +02:00
joseji
0f1f9baa8d
added tests for events
2022-09-28 11:57:49 +02:00
