10589 Commits

Author SHA1 Message Date
clauspeterhuebner
82ac2d4fe2
Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month 2022-09-23 22:22:33 +02:00
mahula
9ac62d5101
Merge pull request #2047 from gradido/e2e-test-setup
End-to-end test setup
2022-09-23 21:17:53 +02:00
mahula
d6b1b25f6e
Merge branch 'master' into e2e-test-setup 2022-09-23 21:06:41 +02:00
clauspeterhuebner
901e85e90b
Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month 2022-09-23 19:39:48 +02:00
clauspeterhuebner
a6d30328ff
Merge pull request #2216 from gradido/2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
config testmodus flag for sending emails to test or team account instead of user account
2022-09-23 19:38:50 +02:00
clauspeterhuebner
55a8174822
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account 2022-09-23 19:29:34 +02:00
clauspeterhuebner
22845c6264
Merge pull request #2058 from gradido/1798-feature-gradidoid-1-adapt-and-migrate-database-schema
GradidoID 1: adapt and migrate database schema
2022-09-23 19:07:53 +02:00
clauspeterhuebner
e955b92235
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-23 18:48:11 +02:00
Claus-Peter Hübner
792d8a8d53 eol convert 2022-09-23 18:47:07 +02:00
Moriz Wahl
a411dbe761
Merge branch 'master' into e2e-test-setup 2022-09-23 18:24:15 +02:00
Claus-Peter Hübner
ab1a4ac8d1 solve tests 2022-09-23 18:24:13 +02:00
Moriz Wahl
79ab041137
Merge pull request #2206 from gradido/add-client-request-time
feat: Add Client Request Time to Context
2022-09-23 18:18:03 +02:00
Moriz Wahl
929593e92d
Merge branch 'master' into add-client-request-time 2022-09-23 18:08:46 +02:00
Hannes Heine
fd77e5e2ec
Merge branch 'master' into e2e-test-setup 2022-09-23 15:52:22 +02:00
mahula
60e4cbfd60 make login query string more human readable in cypress.config.ts 2022-09-23 14:23:07 +02:00
mahula
454c8e2fda correct cypress execution command in package.json 2022-09-23 14:20:30 +02:00
mahula
a12bb9e09b bundle cypress step definitions
- bundle step definitions in feature-related multiple-step files
- avoid the long ugly file names
2022-09-23 12:19:37 +02:00
mahula
9f23ac9734
shorten script name for cypress execution in e2e-tests/cypress/tests/package.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-23 10:23:30 +02:00
Claus-Peter Hübner
b3bf7fecc4 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-09-23 01:32:44 +02:00
Claus-Peter Hübner
969d6d0fbe Merge branch '1798-feature-gradidoid-1-adapt-and-migrate-database-schema' of github.com:gradido/gradido into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-09-23 01:12:24 +02:00
Claus-Peter Hübner
e701f99553 rework PR comments 2022-09-23 01:11:37 +02:00
clauspeterhuebner
b0781bce88
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-23 01:03:07 +02:00
clauspeterhuebner
62446bd2f0
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-23 00:56:36 +02:00
Claus-Peter Hübner
0b410fd5fd oel convert 2022-09-23 00:50:07 +02:00
clauspeterhuebner
810d258965
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account 2022-09-22 23:31:08 +02:00
Claus-Peter Hübner
de234cc7df rework PR remarks 2022-09-22 23:29:51 +02:00
clauspeterhuebner
4735687c0b
Merge pull request #2234 from gradido/2219-feature-rework-eventprotocol
2219 feature rework eventprotocol
2022-09-22 22:06:47 +02:00
Moriz Wahl
18008e9598
Merge branch 'master' into add-client-request-time 2022-09-22 21:13:27 +02:00
clauspeterhuebner
63afbab8ea
Merge branch 'master' into 2219-feature-rework-eventprotocol 2022-09-22 14:56:26 +02:00
jjimenezgarcia
47a7778481
Merge pull request #2214 from gradido/test-register-with-redeem-code
Refactor: Test register with redeem code
2022-09-22 14:20:51 +02:00
Moriz Wahl
25dd12b18b
Merge branch 'master' into add-client-request-time 2022-09-22 14:18:14 +02:00
jjimenezgarcia
1d9f76b483
Merge branch 'master' into test-register-with-redeem-code 2022-09-22 14:04:14 +02:00
joseji
db21cf2e8d removed unused imports 2022-09-22 11:49:56 +02:00
joseji
f710fd9b45 fixed await for events redeem register 2022-09-22 11:19:32 +02:00
Alexander Friedland
c4b4661a5c
Merge pull request #2211 from gradido/2203-Delete-query-when-redeeming-the-Redeem-link
2203 delete query modal when redeeming the redeem link
2022-09-22 11:13:49 +02:00
joseji
a8fc8b9249 solved conflicts 2022-09-22 11:01:10 +02:00
Alexander Friedland
ef49dee81d
Merge branch 'master' into 2203-Delete-query-when-redeeming-the-Redeem-link 2022-09-22 10:10:59 +02:00
Moriz Wahl
b34fd7e76f
Merge branch 'master' into e2e-test-setup 2022-09-22 10:01:35 +02:00
Hannes Heine
0102aab498
Merge pull request #2228 from gradido/2226-change-email-templates
Refactor: 🍰 Change email templates
2022-09-22 09:52:27 +02:00
Moriz Wahl
91acb5f4b8 test client request time in request header 2022-09-22 08:57:06 +02:00
Moriz Wahl
5c784abe8a test client request time in request header 2022-09-22 08:53:58 +02:00
joseji
c822580c1a removed unused variable 2022-09-21 19:53:57 +02:00
joseji
6202ca64ad test for register through transaction link done 2022-09-21 19:50:27 +02:00
mahula
9469ce9897 adapt lenguage dependent selectors on page object files 2022-09-21 18:25:06 +02:00
mahula
aecf84f5ca fix linting 2022-09-21 18:06:07 +02:00
mahula
2da97bf275 adapt language dependent selectors for login page object 2022-09-21 16:43:31 +02:00
mahula
ab17e77b24 add linting module depencendies to package.json 2022-09-21 16:41:38 +02:00
mahula
75b9273ae1 add token time decoding to custom login command 2022-09-21 16:38:36 +02:00
elweyn
6c0cb17196 Refactor sendTransactionLinkredeemed
.
2022-09-21 12:41:25 +02:00
elweyn
686c43fa89 Change text of linkRedeemed template. 2022-09-21 12:12:23 +02:00