10650 Commits

Author SHA1 Message Date
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
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
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
mahula
e7207da9ac fix language dependency of some selectors in login and user profile tests 2022-09-28 12:13:49 +02:00
mahula
480378a182 fix language dependency of some selectors in login and user profile tests 2022-09-28 10:38:46 +02:00
Moriz Wahl
825b364a3b fix user contact migration. Each user must have one contact, forget about that email_opt_in trash data 2022-09-27 19:13:32 +02:00
mahula
bb7e8d2b3d set default command wait timout higher in cypress configuration 2022-09-27 15:51:05 +02:00
mahula
1a01c7df83 change cypress command in package.json to make "cypress open" available for local testing 2022-09-27 15:22:08 +02:00
Wolfgang Huß
cbfeb88a2f Fulfill Moriz suggestions
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
2022-09-27 14:13:19 +02:00
Wolfgang Huß
3c1b103f93 Refine the integration of the conflicting docu 2022-09-27 10:22:08 +02:00
Wolfgang Huß
6f41e0ba0d Merge branch 'master' of github.com:gradido/gradido into 2208-refine-deployment-docs
# Conflicts:
#	deployment/bare_metal/setup.md
2022-09-27 10:21:33 +02:00
Wolfgang Huß
b7c3d2acf1 Refactor 'setup.md' to a mark-down file and clearify instructions 2022-09-27 09:58:22 +02:00
Alexander Friedland
9ba337b4b8
Merge branch 'master' into 2109-Typo-im-Dialog 2022-09-27 09:45:43 +02:00
elweyn
186e6711f5 Remove unused import. 2022-09-26 09:10:58 +02:00
elweyn
209c61e5d8 Change call from Contribution to DbContribution and use Contribution as model. 2022-09-26 08:48:04 +02:00
Hannes Heine
9bab013847
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-26 08:27:22 +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
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