10607 Commits

Author SHA1 Message Date
joseji
f05c31f69b removed duplicated code 2022-09-29 12:32:43 +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
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
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
joseji
e97aac759f typo camel case in 'send multiregistration email event' 2022-09-26 23:00:33 +02:00
joseji
91b363e61c fixed conflicts 2022-09-26 22:53:57 +02:00
joseji
c8a2d899b8 all stated according to the events table 2022-09-26 22:41:33 +02:00
joseji
329e6f0893 removed unnecesary previously included parameter 'message' on events 2022-09-26 22:29:48 +02:00
joseji
49378c64e2 new events fully implemented 2022-09-26 22:17:07 +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
joseji
744c961c0b fixed tests with new log message 2022-09-23 19:33:54 +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
joseji
60d2e2ff7b fixed contribution delete event saving and testing 2022-09-23 18:46:40 +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
joseji
79f7ebce57 updated event working, deletion is not working properly (deeper than the event itself) 2022-09-22 17:35:41 +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
0176131c39 errors are now logged, and events are checked 2022-09-22 12:07:12 +02:00
joseji
db21cf2e8d removed unused imports 2022-09-22 11:49:56 +02:00
joseji
c08aac58a9 events and half log tests 2022-09-22 11:44:30 +02:00