Wolfgang Huß
|
4e5b100b44
|
Merge pull request #2050 from gradido/2049-remove-image-entries-in-docker-compose-files
chore: 🍰 Change `image` Entries In Docker Compose Files And Get Apple M1 Running
|
2022-07-21 11:47:56 +02:00 |
|
Wolfgang Huß
|
3e259b049a
|
Merge branch 'master' into 2049-remove-image-entries-in-docker-compose-files
|
2022-07-21 11:35:10 +02:00 |
|
Wolfgang Huß
|
08d6cf77eb
|
Provide volume for mariadb log-files in Docker
|
2022-07-21 11:21:49 +02:00 |
|
Moriz Wahl
|
9ba51a813a
|
Merge branch 'master' into insert-missing-contributions-migration
|
2022-07-21 11:18:29 +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 |
|
ogerly
|
4abac7a3c1
|
fix locales
|
2022-07-21 08:36:46 +02:00 |
|
ogerly
|
4e6c9fe07d
|
add info text on the tabs
|
2022-07-21 08:35:26 +02:00 |
|
ogerly
|
29fd5dfcd2
|
fix locales
|
2022-07-21 07:45:25 +02:00 |
|
ogerly
|
539f858dec
|
resolve conflict
|
2022-07-21 07:43:46 +02:00 |
|
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 |
|
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
|
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 |
|