9485 Commits

Author SHA1 Message Date
ogerly
f3390b7de1 add updateContribution updateContributionForm 2022-07-18 18:10:29 +02:00
ogerly
95b8e9e55a check disable button and amount info text 2022-07-18 18:10:29 +02:00
ogerly
70a8f9b0ca change query to get contributionCount and contributionList 2022-07-18 18:10:29 +02:00
elweyn
9385648285 Remove unused import. 2022-07-18 18:10:29 +02:00
elweyn
a25d9f7399 Change query fields to new names. 2022-07-18 18:10:29 +02:00
elweyn
7d5555c7e4 Change query listAllContributions now gets contributionCount and contributionList instead of linkCount and linkList. 2022-07-18 18:10:29 +02:00
elweyn
b384782e63 Change query of listContribution to get contributionCount and contributionList instead of link... 2022-07-18 18:10:29 +02:00
elweyn
f1238957f9 Change linkCount to contributionCount and linkList to contributionList. 2022-07-18 18:10:29 +02:00
elweyn
951d7f2f88 Change the listContribution query to give back ContributionListResult object with linkCount. 2022-07-18 18:10:29 +02:00
Alexander Friedland
8956aef42d
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-18 12:43:50 +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
Wolfgang Huß
1ec317259b Document the setup of the GraphQL Playground 2022-07-18 11:35:31 +02:00
Alexander Friedland
4dedad4ca9
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-18 11:18:50 +02:00
ogerly
1e4540ef71 fix locales 2022-07-18 11:13:32 +02:00
ogerly
0b8e898818 refactor contribution form 2022-07-18 11:13:32 +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
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
Alexander Friedland
a438c5c680
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-15 14:34:56 +02:00
elweyn
843993e340 Fix linting. 2022-07-15 14:34:47 +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
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
elweyn
d066227043 Change the Contribution entity to join on user. 2022-07-15 14:13:33 +02:00
elweyn
1147f58f17 Merge remote-tracking branch 'origin/do-not-log-IntrospectionQuery' into 2051-list-all-confirmed-contribution 2022-07-15 13:48:04 +02:00
Moriz Wahl
07093c466d
Merge branch 'master' into do-not-log-IntrospectionQuery 2022-07-15 13:47:11 +02:00
elweyn
ed75dce369 Merge branch 'master' into 2051-list-all-confirmed-contribution 2022-07-15 13:46:46 +02:00
Moriz Wahl
175bc514be feat: Do not log IntrospectionQuery from Query Browser 2022-07-15 13:36:31 +02:00
Alexander Friedland
fb2673284e
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-15 11:43:24 +02:00
Hannes Heine
ceae3915f9
Merge pull request #2052 from gradido/2051-list-contribution-add-deleted
Feat: Add confirmedBy and confirmedAt for the contribution query.
2022-07-15 11:40:33 +02:00
Moriz Wahl
66f10df1d0 improve logic and date handling. use v-model for form 2022-07-15 11:23:03 +02:00
Moriz Wahl
9efb83b2af fix tests 2022-07-15 11:01:36 +02:00
ogerly
c170c48ac4 change for tests 2022-07-15 10:11:40 +02:00
Alexander Friedland
6d948cd3b1
Merge branch 'master' into 2051-list-contribution-add-deleted 2022-07-15 09:10:49 +02:00
Alexander Friedland
6ce1fb2082
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-15 09:06:01 +02:00
ogerly
4215f62311 change props and data.form for update contribution 2022-07-15 09:05:27 +02:00
ogerly
dfc20a3254 change code, to review from moriz 2022-07-15 09:05:27 +02:00
Alexander Friedland
8ad1e2920f
Update frontend/src/pages/Community.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-15 08:36:26 +02:00
Alexander Friedland
8b4f0499c8
Merge pull request #2048 from gradido/add-creations-to-user-webapp
Add open creations to webapp
2022-07-15 07:50:13 +02:00
Alexander Friedland
1bf8c289ef
Merge branch 'master' into add-creations-to-user-webapp 2022-07-15 07:40:08 +02:00
Alexander Friedland
8f742ce1d1
Merge branch 'master' into 2051-list-contribution-add-deleted 2022-07-15 07:37:37 +02:00
elweyn
b86ddbf8b0 Fix linting. 2022-07-14 18:08:51 +02:00
elweyn
c242f97733 Change the test for listAllContributions to have every seed user and create all creations, add Test suite that checks if every seeded data arrives as well. 2022-07-14 17:52:31 +02:00
elweyn
34de4bb901 Merge conflict on contribution resolver test file 2022-07-14 17:42:49 +02:00
elweyn
22602c45b9 Merge master into this branch. 2022-07-14 17:40:58 +02:00