diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index bcc08a7030020c48d3bb3d768a13b5f9dfc22118..eec594740f066f822b9dfaca6e3d568e0b77b441 100644 --- a/.github/workflows/appstore-build-publish.yml +++ b/.github/workflows/appstore-build-publish.yml @@ -32,7 +32,7 @@ jobs: echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 with: path: ${{ env.APP_NAME }} @@ -56,7 +56,7 @@ jobs: - name: Set up node ${{ steps.versions.outputs.nodeVersion }} # Skip if no package.json if: ${{ steps.versions.outputs.nodeVersion }} - uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3 + uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3 with: node-version: ${{ steps.versions.outputs.nodeVersion }} @@ -66,7 +66,7 @@ jobs: run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}" - name: Set up php ${{ env.PHP_VERSION }} - uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054 # v2 + uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 with: php-version: ${{ env.PHP_VERSION }} coverage: none @@ -126,9 +126,10 @@ jobs: unzip latest-$NCVERSION.zip - name: Checkout server master fallback - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 if: ${{ steps.server-checkout.outcome != 'success' }} with: + submodules: true repository: nextcloud/server path: nextcloud @@ -148,7 +149,7 @@ jobs: tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }} - name: Attach tarball to github release - uses: svenstaro/upload-release-action@7319e4733ec7a184d739a6f412c40ffc339b69c7 # v2 + uses: svenstaro/upload-release-action@2b9d2847a97b04d02ad5c3df2d3a27baa97ce689 # v2 id: attach_to_release with: repo_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml index 1e2ed38a40efcd69165976f771b47314bc6e405f..9548d19f2d5cdb9e2c9a694521bc287670f3bed5 100644 --- a/.github/workflows/fixup.yml +++ b/.github/workflows/fixup.yml @@ -3,7 +3,7 @@ # https://github.com/nextcloud/.github # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization -name: Pull request checks +name: Block fixup and squash commits on: pull_request: @@ -28,6 +28,6 @@ jobs: steps: - name: Run check - uses: xt0rted/block-autosquash-commits-action@79880c36b4811fe549cfffe20233df88876024e7 # v2 + uses: skjnldsv/block-fixup-merge-action@42d26e1b536ce61e5cf467d65fb76caf4aa85acf # v1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lint-eslint-when-unrelated.yml b/.github/workflows/lint-eslint-when-unrelated.yml index 63710eb6654c1c1c1bc8e5ae9179ca011821cfae..7a2e9f05814d5e44718f813548fc0a92e4e99d0e 100644 --- a/.github/workflows/lint-eslint-when-unrelated.yml +++ b/.github/workflows/lint-eslint-when-unrelated.yml @@ -6,7 +6,7 @@ # Use lint-eslint together with lint-eslint-when-unrelated to make eslint a required check for GitHub actions # https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks -name: Lint +name: Lint eslint on: pull_request: diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml index 0e83a8672c10bd174e5ae9bdc848f0af9e56819d..508d713953c9b7381a6eeacd8ea293594b8ac6cc 100644 --- a/.github/workflows/lint-eslint.yml +++ b/.github/workflows/lint-eslint.yml @@ -6,7 +6,7 @@ # Use lint-eslint together with lint-eslint-when-unrelated to make eslint a required check for GitHub actions # https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks -name: Lint +name: Lint eslint on: pull_request: @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Read package.json node and npm engines version uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1 @@ -48,7 +48,7 @@ jobs: fallbackNpm: '^7' - name: Set up node ${{ steps.versions.outputs.nodeVersion }} - uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3 + uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3 with: node-version: ${{ steps.versions.outputs.nodeVersion }} diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml index 8f024cfcb9840713544e81034f540ddf706a2b9b..7b9e1c99cfa8195bab0b87e4404bf2a8717476b7 100644 --- a/.github/workflows/lint-info-xml.yml +++ b/.github/workflows/lint-info-xml.yml @@ -3,7 +3,7 @@ # https://github.com/nextcloud/.github # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization -name: Lint +name: Lint info.xml on: pull_request: @@ -27,13 +27,13 @@ jobs: name: info.xml lint steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Download schema run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd - name: Lint info.xml - uses: ChristophWurst/xmllint-action@d18a551aab4728e4af449617638600634d7a48cb # v1 + uses: ChristophWurst/xmllint-action@39155a91429af431d65fafc21fa52ba5c4f5cb71 # v1.1 with: xml-file: ./appinfo/info.xml xml-schema-file: ./info.xsd diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index 887f491ac89c6589e9a9ccceb223e4b7cf9f3324..f8d3375111fefae435da0042e2086d4763abc745 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -3,7 +3,7 @@ # https://github.com/nextcloud/.github # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization -name: Lint +name: Lint php-cs on: pull_request @@ -22,13 +22,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Set up php - uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054 # v2 + uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 with: php-version: 8.1 coverage: none + ini-file: development env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 1c2cf0ea22f3b9dadb733adcd55eeb3f91411096..88eb360494337900ea6bdd16e35d4afd96c2f301 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -3,7 +3,7 @@ # https://github.com/nextcloud/.github # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization -name: Lint +name: Lint php on: pull_request: @@ -31,13 +31,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054 # v2 + uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 with: php-version: ${{ matrix.php-versions }} coverage: none + ini-file: development env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dcdd475ecfbaed382d5df1f99c885e6b05dd278..ffc94fa3d7bb489f67a10e29b167933aa82e7a5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Changelog +## 4.4.4 – 2023–08-03 +### Fixed +- Navigation button positioning +- Navigation toggle overlap +- Long email addresses in sharing + +## 4.4.3 – 2023–06-29 +### Changed +- Frontend now uses NcSelect +### Fixed +- Empty events + ## 4.4.2 – 2023–06-12 ### Fixed - Temporarily revert Talk room feature for appointments due to upgrade issues @@ -17,7 +29,7 @@ - Add save button to calendar settings - Icon for appointment confirmation dialogue - Include booking person's name in appointment event -- Add server details and ToS link to public sharing page +- Add server details and ToS link to public sharing page ### Fixed - Public sharing footer - Date formatting in list view @@ -84,11 +96,7 @@ ## 4.1.1 - 2022-12-15 ### Fixed -<<<<<<< HEAD -- Disabled timezone popup -======= -- Disabled timezone popup ->>>>>>> a46efa4aa6a96d152602a9c07152c6b785760c18 +- Disabled timezone popup - Style for timezone popup - Location in booking VEVENT - Bottom part cut off for public calendar @@ -133,7 +141,7 @@ ## 3.5.0 - 2022-08-25 ### Added -- Option to duplicate calendar events +- Option to copy calendar events - Config setting to disable appointments ### Changed - Moved icons to material design @@ -513,7 +521,7 @@ [#2089](https://github.com/nextcloud/calendar/pull/2089) - Long repeating events not correctly shown on web-calender under certain conditions [#2048](https://github.com/nextcloud/calendar/issues/2048) -- Repeating events not displayed on first day of monthly calendar +- Repeating events not displayed on first day of monthly calendar [#1913](https://github.com/nextcloud/calendar/issues/1913) ## 2.0.2 - 2020-03-02 @@ -664,7 +672,7 @@ [#1655](https://github.com/nextcloud/calendar/issues/1655) - Sharing published link via email doesn't work [#1640](https://github.com/nextcloud/calendar/issues/1640) -- Order All-day events by calendar +- Order All-day events by calendar [#760](https://github.com/nextcloud/calendar/issues/769) - Restructure menu for reminders [#1638](https://github.com/nextcloud/calendar/pull/1638) @@ -815,7 +823,7 @@ Even though all features present on the 1.x calendar app versions have been reim [#809](https://github.com/nextcloud/calendar/issues/809) - Non-unique Id in HTML [#860](https://github.com/nextcloud/calendar/issues/860) -- X-NC-GROUP-ID was not properly removed +- X-NC-GROUP-ID was not properly removed [#342](https://github.com/nextcloud/calendar/issues/342) - Fields in repeat area are not disabled in read-only in Edge [#420](https://github.com/nextcloud/calendar/issues/420) @@ -879,7 +887,7 @@ Even though all features present on the 1.x calendar app versions have been reim ### Fixed - Double the height of the description textarea [#675](https://github.com/nextcloud/calendar/issues/675) -- Fix parsing for all-day VEvents that +- Fix parsing for all-day VEvents that [#692](https://github.com/nextcloud/calendar/issues/692) - Manual override for timezone [#586](https://github.com/nextcloud/calendar/issues/586) @@ -924,7 +932,7 @@ Even though all features present on the 1.x calendar app versions have been reim ## 1.5.5 - 2017-09-19 ### Fixed -- Remove invalid signed signature from release +- Remove invalid signed signature from release ## 1.5.4 - 2017-09-12 ### Fixed @@ -1084,4 +1092,4 @@ Even though all features present on the 1.x calendar app versions have been reim ### Fixed - Delete alarms from events - Adjusted colors to Nextcloud -- Properly display line breaks in agenda views +- Properly display line breaks in agenda views \ No newline at end of file diff --git a/appinfo/info.xml b/appinfo/info.xml index 3f09c08ae79195bdc6b84be25dc0e400e280a0a7..f0111f29e2cfbdba95ccf3eeb3cb0308c93ffdc5 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -15,7 +15,7 @@ * ☑️ Tasks! See tasks with a due date directly in the calendar * 🙈 **We’re 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. ]]> - 4.4.2 + 4.4.4 agpl Anna Larch Nextcloud Groupware Team diff --git a/css/app-navigation.scss b/css/app-navigation.scss index fe32a59c7a94fb938ba229a05a0aabfbb71e6f16..c48ca69f83cf6189a00892e18f9696e30c2423d3 100644 --- a/css/app-navigation.scss +++ b/css/app-navigation.scss @@ -35,7 +35,7 @@ // for the rounded corner buttons on the sides, see further below border-radius: 0; font-weight: normal; - margin: 3px -1px 3px 0; + margin: 0 0 var(--default-grid-baseline) 0; flex-grow: 1; } @@ -95,6 +95,11 @@ .new-event-today-view-section { display: flex; + // Fix margins from core + .button { + margin: 0 var(--default-grid-baseline) 0 0; + } + .new-event { flex-grow: 5; text-overflow: ellipsis; @@ -108,6 +113,11 @@ } } +// Add background to navigation toggle to fix overlap with calendar elements +.app-navigation-toggle { + background-color: var(--color-main-background) !important; +} + .app-navigation { button.icon-share { opacity: 0.3 !important; diff --git a/css/app-sidebar.scss b/css/app-sidebar.scss index 32408bb71d6a279ec7f8b618ef551af92563d48d..1ffcf62faa40a2c8cd6eabdaaeffcb815d66fbf9 100644 --- a/css/app-sidebar.scss +++ b/css/app-sidebar.scss @@ -140,7 +140,7 @@ &__buttons { position: fixed; - bottom: var(--body-container-margin); + bottom: var(--body-container-margin);; z-index: 2; width: calc(27vw - 11px); min-width: 300px - 11px; diff --git a/css/fullcalendar.scss b/css/fullcalendar.scss index fd51be4b4b83ff63e6a2d0a948792e5f64a6e6e9..f128d22246ec401541ebd45b8627b1f5f3717807 100644 --- a/css/fullcalendar.scss +++ b/css/fullcalendar.scss @@ -116,6 +116,16 @@ word-break: break-word; } +// Prevent events overlapping over day header +.fc .fc-list-sticky .fc-list-day > * { + z-index: 1; +} + +// Padding to account for left navigation toggle +.fc-list-table .fc-list-day-cushion { + padding-left: calc(var(--default-clickable-area) + var(--default-grid-baseline) * 2); +} + // highlight current day (exclude day view) .fc-timeGridWeek-view, .fc-dayGridMonth-view { diff --git a/lib/Controller/EmailController.php b/lib/Controller/EmailController.php index efa79fe250122964e66cc03df0ea91b124cccd47..313e2d42b672da27de54642265c153341ae858db 100644 --- a/lib/Controller/EmailController.php +++ b/lib/Controller/EmailController.php @@ -4,6 +4,7 @@ declare(strict_types=1); /** * @author Thomas Citharel * @author Georg Ehrke + * @author Richard Steinmetz * * @copyright 2016 Thomas Citharel * @copyright 2019 Georg Ehrke @@ -104,6 +105,12 @@ class EmailController extends Controller { public function sendEmailPublicLink(string $recipient, string $token, string $calendarName):JSONResponse { + if (strlen($recipient) > 512) { + return new JSONResponse([ + 'message' => $this->l10n->t('Provided email-address is too long'), + ], Http::STATUS_BAD_REQUEST); + } + $user = $this->userSession->getUser(); if (!$user) { return new JSONResponse([ diff --git a/lib/Service/Appointments/MailService.php b/lib/Service/Appointments/MailService.php index db7ad5a9e126e283ad56d25fb82fb7b76d620794..79b78db9d4bcc71bc6b7a6a1fce7b0440030ebba 100644 --- a/lib/Service/Appointments/MailService.php +++ b/lib/Service/Appointments/MailService.php @@ -126,11 +126,6 @@ class MailService { $template->addBodyListItem($config->getDescription(), 'Description:'); } - $template->addBodyListItem($user->getDisplayName(), 'Appointment with:'); - if (!empty($config->getDescription())) { - $template->addBodyListItem($config->getDescription(), 'Description:'); - } - // Create Booking overview $this->addBulletList($template, $this->l10n, $booking, $config->getLocation()); diff --git a/package-lock.json b/package-lock.json index 69f71c34c4ed182c28b118682631443000facc80..cef42f0b1e37cb7c7050db46e4c2be8a70ef29b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "calendar", - "version": "4.4.2", + "version": "4.4.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "calendar", - "version": "4.4.2", + "version": "4.4.4", "license": "agpl", "dependencies": { "@fullcalendar/core": "^6.1.7", diff --git a/package.json b/package.json index df95ae3f0d1de0e4d9a6c7eeecf7edf32ade4e3d..4eaa2cb188c1b8a6cadc58cbe7550da190dcb37b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "calendar", "description": "A calendar app for Nextcloud. Easily sync events from various devices, share and edit them online.", - "version": "4.4.2", + "version": "4.4.4", "author": "Georg Ehrke ", "contributors": [ "Georg Ehrke ", diff --git a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue index d8c26a606d3ebbdfb586a1ebd75c8c2e461ffa87..217f2d9aca6cd04814416633d555cc0727a9c812 100644 --- a/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue +++ b/src/components/AppNavigation/EditCalendarModal/SharingSearch.vue @@ -25,11 +25,10 @@