9504 Commits

Author SHA1 Message Date
elweyn
c1ec142121 Add method to send email to sender of a transactionLink after the receiver redeemed it. 2022-07-19 12:10:59 +02:00
elweyn
d23a060aba Add text to send to the sender of a transaction link after the receiver redeem it. 2022-07-19 12:10:09 +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
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
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
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
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
Alexander Friedland
6d948cd3b1
Merge branch 'master' into 2051-list-contribution-add-deleted 2022-07-15 09:10:49 +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