9516 Commits

Author SHA1 Message Date
mahula
0d6a6e6400
Merge branch 'master' into e2e-test-setup 2022-07-19 13:53:53 +02:00
mahula
fda966d273 update cypress dockerfile 2022-07-19 13:05:07 +02:00
mahula
5ab925d823 update both README file regarding using the hosts network for local testing 2022-07-19 11:03:25 +02:00
mahula
5baf558e77 update README regarding yarn usage 2022-07-19 08:35:48 +02:00
Hannes Heine
298f76de0f
Merge pull request #2061 from gradido/add_count_to_list_contributions
Fix: Add count to list contributions
2022-07-19 01:59:49 +02:00
Hannes Heine
ab6db2e0a6
Merge branch 'master' into add_count_to_list_contributions 2022-07-19 01:50:39 +02:00
Moriz Wahl
b35b3e5965
Merge pull request #2022 from gradido/docu-env-vars
docu: Explain how `.env` Files are Working
2022-07-19 00:55:54 +02:00
Moriz Wahl
f2e34938c5 Merge branch 'docu-env-vars' of github.com:gradido/gradido into docu-env-vars 2022-07-19 00:23:04 +02:00
Moriz Wahl
b31309f7ef remove file artifact 2022-07-19 00:22:47 +02:00
Moriz Wahl
19dda11857
Merge branch 'master' into docu-env-vars 2022-07-19 00:20:21 +02:00
clauspeterhuebner
0188fc7213
Merge pull request #1997 from gradido/1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol
[WIP] 1794 feature event protocol 1 implement the basics of the business event protocol
2022-07-19 00:19:46 +02:00
Claus-Peter Hübner
86487a2ddb change to Unix LF 2022-07-18 23:55:13 +02:00
Claus-Peter Hübner
e9b8691b38 turned around the logic 2022-07-18 23:53:59 +02:00
Moriz Wahl
22a8f0a280
Merge branch 'master' into docu-env-vars 2022-07-18 23:47:42 +02:00
Moriz Wahl
1691167582 explain nginx ports with docker 2022-07-18 23:47:24 +02:00
mahula
196e0e661d refactor Dockerfile to avoid hardcoded versioning of Playwright 2022-07-18 22:50:58 +02:00
mahula
a04610153b set Playwright test to utilize webkit 2022-07-18 22:28:31 +02:00
mahula
e8bcda810a fix selection if identifiers for login POM in Playwright tests 2022-07-18 22:26:47 +02:00
clauspeterhuebner
5a77247c79
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-18 19:31:47 +02:00
clauspeterhuebner
3e617fdf95
Update deployment/bare_metal/.env.dist
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-18 19:31:24 +02:00
clauspeterhuebner
d4f32f42e0
Update backend/.env.template
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-18 19:30:56 +02:00
clauspeterhuebner
212952cf56
Update backend/.env.dist
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-18 19:30:25 +02:00
Hannes Heine
15051a61e1
Merge branch 'master' into add_count_to_list_contributions 2022-07-18 14:32:05 +02:00
Wolfgang Huß
6a2eb4a549
Merge pull request #2060 from gradido/2055-docs-setting-up-and-using-gql-playground
docs: 🍰 Document The Setup Of The GraphQL Playground
2022-07-18 12:42:14 +02:00
Wolfgang Huß
b7949a6220
Update backend/README.md
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-07-18 12:25:58 +02:00
Wolfgang Huß
c6279a3ba1
Update backend/README.md
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2022-07-18 12:25:36 +02:00
Wolfgang Huß
2f88a169b2 Merge branch 'master' of github.com:gradido/gradido into 2055-docs-setting-up-and-using-gql-playground 2022-07-18 11:42:29 +02:00
elweyn
ae04024dd3 Remove unused import. 2022-07-18 11:39:17 +02:00
elweyn
42b8d625da Change query fields to new names. 2022-07-18 11:38:58 +02:00
Wolfgang Huß
1ec317259b Document the setup of the GraphQL Playground 2022-07-18 11:35:31 +02:00
elweyn
11dacd40be Change query listAllContributions now gets contributionCount and contributionList instead of linkCount and linkList. 2022-07-18 11:34:30 +02:00
elweyn
3a8fb6b353 Change query of listContribution to get contributionCount and contributionList instead of link... 2022-07-18 11:31:39 +02:00
elweyn
495fbfd05c Change linkCount to contributionCount and linkList to contributionList. 2022-07-18 11:31:04 +02:00
elweyn
93c2d6814a Change the listContribution query to give back ContributionListResult object with linkCount. 2022-07-18 11:27:44 +02:00
Hannes Heine
6e0db93591
Merge pull request #2057 from gradido/2051-list-all-confirmed-contribution
Feat: List all contribution
2022-07-18 11:08:26 +02:00
Claus-Peter Hübner
85a6b09635 Merge branch '1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol' of github.com:gradido/gradido into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-15 16:42:15 +02:00
Claus-Peter Hübner
5810235cec add EVENT_PROTOCOL_ENABLED 2022-07-15 16:40:46 +02:00
clauspeterhuebner
77813317f5
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-15 15:34:24 +02:00
mahula
9860a0509d rework cypress tests dockerfile:
- reduce to necessary dependencies
- control browser installation (chromium, firefox)
- use yarn for cypress installation
2022-07-15 15:09:57 +02:00
elweyn
10fb7fc84a Merge branch '2051-list-all-confirmed-contribution' of https://github.com/gradido/gradido into 2051-list-all-confirmed-contribution 2022-07-15 14:49:05 +02:00
elweyn
5892f7b429 Remove OneToOne import from contribution entity. 2022-07-15 14:48:51 +02:00
Hannes Heine
d9a64293ca
Merge branch 'master' into 2051-list-all-confirmed-contribution 2022-07-15 14:35:27 +02:00
elweyn
843993e340 Fix linting. 2022-07-15 14:34:47 +02:00
mahula
eaabed0bc3 add eslint to package config 2022-07-15 14:33:38 +02:00
Moriz Wahl
d7eb65014a
Merge pull request #2059 from gradido/do-not-log-IntrospectionQuery
feat: Do not log IntrospectionQuery from Query Browser
2022-07-15 14:32:58 +02:00
elweyn
cada4eca19 Change OneToOne relation to OneToMany / ManyToOne. 2022-07-15 14:32:20 +02:00
mahula
d419462b7b use yarn instead of npm with cypress tests 2022-07-15 14:29:18 +02:00
mahula
0dca2725e7 fix typo in POM file 2022-07-15 14:20:24 +02:00
elweyn
382211f3ca Adapt test so that we check findAllContributions. 2022-07-15 14:14:55 +02:00
elweyn
5f5c19e6ba Change find to much more efficient code. 2022-07-15 14:14:15 +02:00