9528 Commits

Author SHA1 Message Date
Wolfgang Huß
3e3770e5a9 Provide volume for database log-file in Docker 2022-07-21 13:33:10 +02:00
Wolfgang Huß
08d6cf77eb Provide volume for mariadb log-files in Docker 2022-07-21 11:21:49 +02:00
Wolfgang Huß
213b670f68 Provide volume for backend log-files in Docker, move the ones of nginx from dev Docker Compose to main 2022-07-21 11:04:19 +02:00
Moriz Wahl
47fb530725
Merge pull request #2064 from gradido/fix-windows-line-breaks
fix: Windows 0D 0A Linebreaks to Unix 0A
2022-07-21 09:11:21 +02:00
clauspeterhuebner
7f6eb1cb47
Merge branch 'master' into fix-windows-line-breaks 2022-07-20 23:05:48 +02:00
Hannes Heine
5ce94282b3
Merge pull request #2066 from gradido/2065-add-contribution-date-to-list-queries
Add contributionDate to the Contribution object.
2022-07-20 12:08:28 +02:00
elweyn
c8267cf774 Add contributionDate to the Contribution object. 2022-07-20 10:42:24 +02:00
clauspeterhuebner
5e0eea4cfe
Merge pull request #2062 from gradido/add-contributions-relation-to-user
fix: Add Contributions to User
2022-07-19 23:09:39 +02:00
clauspeterhuebner
8d30c56213
Merge branch 'master' into add-contributions-relation-to-user 2022-07-19 23:01:25 +02:00
Moriz Wahl
1e5738f0aa fix: Windows 0D 0A Linebreaks to Unix 0A 2022-07-19 15:11:27 +02:00
Hannes Heine
9cd0d012c5
Merge pull request #2035 from gradido/2000-contribution-delete
Feat: ContributionResolver - delete mutation
2022-07-19 14:01:57 +02:00
elweyn
ccc16b4083 Test that an already confirmed contribution can not be deleted. 2022-07-19 13:09:44 +02:00
elweyn
b4a4a9e126 Throw error if confirmedAt is present. 2022-07-19 13:09:03 +02:00
Hannes Heine
d5a2c24d7e
Merge branch 'master' into 2000-contribution-delete 2022-07-19 12:25:12 +02:00
Moriz Wahl
c9098fa2cf fix: Add Contributions to User 2022-07-19 11:47:03 +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
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
elweyn
55d81d2feb Merge branch '2000-contribution-delete' of https://github.com/gradido/gradido into 2000-contribution-delete 2022-07-18 13:08:39 +02:00
elweyn
e84061c412 Added tests for deleteContribution 2022-07-18 13:08:27 +02:00
elweyn
4c33d3784b Added mutation for deleteContribution 2022-07-18 13:07:44 +02:00
Hannes Heine
d8872c825c
Merge branch 'master' into 2000-contribution-delete 2022-07-18 13:05:41 +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
elweyn
da3574edb8 Fix merge conflict and reviewed name changes. 2022-07-18 12:35:42 +02:00
elweyn
7a337f027d Fix merge conflict. 2022-07-18 12:32:24 +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