IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,160 Commits 1 Branch 0 Tags
Commit Graph

10160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
clauspeterhuebner
8d30c56213
Merge branch 'master' into add-contributions-relation-to-user 2022-07-19 23:01:25 +02:00
Moriz Wahl
740000a9a9 adjust router test (no double community test) 2022-07-19 17:04:44 +02:00
Moriz Wahl
d6be4e46b7 Merge branch '2038-Community-contribution-site-and-form' of github.com:gradido/gradido into 2038-Community-contribution-site-and-form 2022-07-19 17:02:23 +02:00
ogerly
35700d06d3 fix locales 2022-07-19 16:25:21 +02:00
ogerly
acbdc0635a lastMonth to openAmountForMonth,delete thisMonth 2022-07-19 16:25:21 +02:00
ogerly
48283d39b6 test router community 2022-07-19 16:25:21 +02:00
Moriz Wahl
66192d667b test new route for Communty 2022-07-19 16:05:28 +02:00
Moriz Wahl
17e6589045 get the tests working 2022-07-19 15:45:18 +02:00
Alexander Friedland
4222b0aad4
Update frontend/src/components/Contributions/ContributionListItem.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-07-19 15:43:50 +02:00
Alexander Friedland
a116578771
Update frontend/src/components/Contributions/ContributionListItem.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-07-19 15:43:43 +02:00
Moriz Wahl
c2891cd048
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-19 15:29:57 +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
Moriz Wahl
515da85626
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-19 12:40:18 +02:00
Moriz Wahl
d7a907b41e
Merge branch 'master' into 2049-remove-image-entries-in-docker-compose-files 2022-07-19 12:37:54 +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
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
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
Alexander Friedland
8956aef42d
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-18 12:43:50 +02:00
Wolfgang Huß
e41e8fea7f Merge branch 'master' of github.com:gradido/gradido into 2049-remove-image-entries-in-docker-compose-files 2022-07-18 12:43:03 +02:00