Compare commits

...

6 Commits

Author SHA1 Message Date
Anna 877ce9c05e
Merge pull request #5956 from nextcloud/build/release-v3.5.9
build: release v3.5.9
2024-04-25 17:32:51 +02:00
Anna Larch ec870ae79d build: release v3.5.9
Signed-off-by: Anna Larch <anna@nextcloud.com>
2024-04-25 17:31:54 +02:00
Richard Steinmetz 9dbe1d8d88
Merge pull request #5958 from nextcloud/ci/use-codecov-token
ci: use codecov token when uploading coverage
2024-04-25 17:28:18 +02:00
Richard Steinmetz a0d65c3c59
ci: use codecov token when uploading coverage
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2024-04-25 17:22:19 +02:00
Anna cbe6caa2ac
Merge pull request #5954 from nextcloud/backport/5953/stable3.5
[stable3.5] fix(appointments): simplify booking response
2024-04-25 17:04:24 +02:00
Anna Larch e7a52ed93f fix(appointments): simplify booking response
Signed-off-by: Anna Larch <anna@nextcloud.com>
2024-04-25 15:03:41 +00:00
7 changed files with 11 additions and 5 deletions

View File

@ -36,6 +36,7 @@ jobs:
- name: Upload coverage to Codecov - name: Upload coverage to Codecov
uses: codecov/codecov-action@v1 uses: codecov/codecov-action@v1
with: with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage/coverage-final.json file: ./coverage/coverage-final.json
flags: javascript flags: javascript
fail_ci_if_error: true fail_ci_if_error: true

View File

@ -53,6 +53,7 @@ jobs:
if: ${{ matrix.nextcloud-versions == 'master' }} if: ${{ matrix.nextcloud-versions == 'master' }}
uses: codecov/codecov-action@v1 uses: codecov/codecov-action@v1
with: with:
token: ${{ secrets.CODECOV_TOKEN }}
file: nextcloud/apps/calendar/clover.unit.xml file: nextcloud/apps/calendar/clover.unit.xml
flags: php flags: php
fail_ci_if_error: true fail_ci_if_error: true

View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## 3.5.9 - 2024-04-25
### Changed
- Slot booking response
## 3.5.8 - 2023-01-10 ## 3.5.8 - 2023-01-10
### Fixed ### Fixed
- Rate limit appointment booking and config creation - Rate limit appointment booking and config creation

View File

@ -15,7 +15,7 @@
* ☑️ Tasks! See tasks with a due date directly in the calendar * ☑️ Tasks! See tasks with a due date directly in the calendar
* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries. * 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.
]]></description> ]]></description>
<version>3.5.8</version> <version>3.5.9</version>
<licence>agpl</licence> <licence>agpl</licence>
<author>Anna Larch</author> <author>Anna Larch</author>
<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author> <author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>

View File

@ -215,7 +215,7 @@ class BookingController extends Controller {
); );
} }
return JsonResponse::success($booking); return JsonResponse::success();
} }
/** /**

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "calendar", "name": "calendar",
"version": "3.5.8", "version": "3.5.9",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "calendar", "name": "calendar",
"version": "3.5.8", "version": "3.5.9",
"license": "agpl", "license": "agpl",
"dependencies": { "dependencies": {
"@fullcalendar/core": "5.11.0", "@fullcalendar/core": "5.11.0",

View File

@ -1,7 +1,7 @@
{ {
"name": "calendar", "name": "calendar",
"description": "A calendar app for Nextcloud. Easily sync events from various devices, share and edit them online.", "description": "A calendar app for Nextcloud. Easily sync events from various devices, share and edit them online.",
"version": "3.5.8", "version": "3.5.9",
"author": "Georg Ehrke <oc.list@georgehrke.com>", "author": "Georg Ehrke <oc.list@georgehrke.com>",
"contributors": [ "contributors": [
"Georg Ehrke <oc.list@georgehrke.com>", "Georg Ehrke <oc.list@georgehrke.com>",