12033 Commits

Author SHA1 Message Date
clauspeterhuebner
7f6eb1cb47
Merge branch 'master' into fix-windows-line-breaks 2022-07-20 23:05:48 +02:00
Moriz Wahl
5719884461 test contribution list item 2022-07-20 19:22:55 +02:00
Moriz Wahl
583779d9a8 test contribution list 2022-07-20 18:40:53 +02:00
Moriz Wahl
495ca15128 test delete contribution API 2022-07-20 15:38:51 +02:00
Moriz Wahl
98ca12d635 Merge branch '2038-Community-contribution-site-and-form' of github.com:gradido/gradido into 2038-Community-contribution-site-and-form 2022-07-20 15:27:31 +02:00
Moriz Wahl
00e32036a5 test commmunity page 2022-07-20 15:14:51 +02:00
ogerly
a9a1be350c add delete Contribution function 2022-07-20 14:25:20 +02:00
ogerly
9ef150cc3a add mutation deleteContribution, add apollo deleteContribution 2022-07-20 14:25:20 +02:00
Alexander Friedland
9cf77ff462
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-20 13:46:25 +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
ogerly
a87c5f70ee add contributionDate for contribution list 2022-07-20 12:01:45 +02:00
ogerly
4ff5e74875 Merge remote-tracking branch 'origin/2065-add-contribution-date-to-list-queries' into 2038-Community-contribution-site-and-form 2022-07-20 11:02:40 +02:00
ogerly
46553c02d6 prepare math function maxGdd for Months when edit 2022-07-20 11:01:36 +02:00
elweyn
c8267cf774 Add contributionDate to the Contribution object. 2022-07-20 10:42:24 +02:00
ogerly
038a3c1a7c prepared for ContributionForm.spec.js 2022-07-20 09:05:04 +02:00
Alexander Friedland
a4d6ad57eb
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-20 08:48:03 +02:00
Claus-Peter Hübner
ab765e7a8f shift User from migration 0044 to 0039 2022-07-19 23:51:38 +02:00
Claus-Peter Hübner
0e2bb87437 return migration back to 0039 2022-07-19 23:36:59 +02:00
Claus-Peter Hübner
1ef7d8f1b9 Merge remote-tracking branch 'origin/master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-07-19 23:10:18 +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
Claus-Peter Hübner
4951a684c6 Merge remote-tracking branch 'origin/master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-07-19 21:11:28 +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
Moriz Wahl
c3fc068834 fix URL of community redeem contribution link 2022-07-19 14:59:45 +02:00
Moriz Wahl
f0c83321fa fix broeken .envs and config 2022-07-19 14:55:02 +02:00
Moriz Wahl
fc01c2d398 update hyperswarm to 6.2.0 2022-07-19 14:46:58 +02:00
Moriz Wahl
b78ad2fb00 Merge branch 'master' into setup-hyperswarm 2022-07-19 14:43:19 +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
mahula
0d6a6e6400
Merge branch 'master' into e2e-test-setup 2022-07-19 13:53:53 +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
mahula
fda966d273 update cypress dockerfile 2022-07-19 13:05:07 +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
elweyn
93e0451124 Fix linting. 2022-07-19 12:24:42 +02:00
elweyn
97a83e633a Add block to send the email to the sender of a transactionLink after the receiver redeemed it. 2022-07-19 12:11:57 +02:00
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
Moriz Wahl
c9098fa2cf fix: Add Contributions to User 2022-07-19 11:47:03 +02:00