Skip to content

Commit

Permalink
Merge pull request #5158 from nextcloud-libraries/chore/noid/merge-ma…
Browse files Browse the repository at this point in the history
…ster-next

[next] chore(master): merge `master` into `next`
  • Loading branch information
susnux authored Jan 28, 2024
2 parents 5edd9a9 + 4ddee9d commit 58c6481
Show file tree
Hide file tree
Showing 164 changed files with 651 additions and 207 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/command-l10n-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Add reaction on start
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
repository: ${{ github.event.repository.full_name }}
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
git push --force origin ${{ needs.init.outputs.head_ref }}
- name: Add reaction on failure
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
if: failure()
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/command-rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Add reaction on start
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
repository: ${{ github.event.repository.full_name }}
Expand All @@ -42,7 +42,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}

- name: Add reaction on failure
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
if: failure()
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
Expand Down
21 changes: 20 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,26 @@ All notable changes to this project will be documented in this file.
* chore(vue3): Migrate NcAppSidebar* to vue 3 [\#4833](https://github.com/nextcloud-libraries/nextcloud-vue/pull/4833) \([raimund-schluessler](https://github.com/raimund-schluessler)\)
* chore(vue3): Migrate NcRich* to vue 3 [\#4976](https://github.com/nextcloud-libraries/nextcloud-vue/pull/4976) \([raimund-schluessler](https://github.com/raimund-schluessler)\)

## [v8.5.1](https://github.com/nextcloud-libraries/nextcloud-vue/tree/v8.5.1) (2024-01-24)
[Full Changelog](https://github.com/nextcloud-libraries/nextcloud-vue/compare/v8.5.0...v8.5.1)

### 🐛 Fixed bugs
* fix(NcPopover): a11y attrs provide-inject reactivity [\#5142](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5142) \([ShGKme](https://github.com/ShGKme)\)
* fix(NcCheckboxRadioSwitch): On button style align the text vertically [\#5151](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5151) \([susnux](https://github.com/susnux)\)
* fix: removed groupings in timezone picker [\#5130](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5130) \([emoral435](https://github.com/emoral435)\)
* fix(fields): adjust label line-height [\#5133](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5133) \([ShGKme](https://github.com/ShGKme)\)
* fix(header): width regression fixed [\#5129](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5129) \([emoral435](https://github.com/emoral435)\)
* fix(NcCheckboxRadioSwitch): Make sure to include current value in checked array [\#5150](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5150) \([susnux](https://github.com/susnux)\)
* fix: Ensure no double scrollbars for NcDialog and NcAppNavigationSettings [\#5139](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5139) \([susnux](https://github.com/susnux)\)

### Other Changes
* Updated translation
* chore: Fix missing PR from changelog [\#5125](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5125) \([Pytal](https://github.com/Pytal)\)
* chore: Migrate cypress config to vite instead of webpack [\#4961](https://github.com/nextcloud-libraries/nextcloud-vue/pull/4961) \([susnux](https://github.com/susnux)\)
* chore(styleguide): set line-height from server styles [\#5132](https://github.com/nextcloud-libraries/nextcloud-vue/pull/5132) \([ShGKme](https://github.com/ShGKme)\)

## [v8.5.0](https://github.com/nextcloud-libraries/nextcloud-vue/tree/v8.5.0) (2024-01-23)
[Full Changelog](https://github.com/nextcloud-libraries/nextcloud-vue/compare/v8.5.0...v8.4.0)
[Full Changelog](https://github.com/nextcloud-libraries/nextcloud-vue/compare/v8.4.0...v8.5.0)

### 🚀 Enhancements
* enh(NcSelect): Add visible input label by @Pytal in https://github.com/nextcloud-libraries/nextcloud-vue/pull/4963
Expand All @@ -112,6 +130,7 @@ All notable changes to this project will be documented in this file.
* feat(NcReferenceList): Add support for a fallback reference widget by @mejo- in https://github.com/nextcloud-libraries/nextcloud-vue/pull/5092
* enh(NcEmojiPicker): Always show skin tone selector + save selection by @susnux in https://github.com/nextcloud-libraries/nextcloud-vue/pull/5103
* feat(NcActionButton): Allow pressed state on NcActionButton - similar to NcButton by @susnux in https://github.com/nextcloud-libraries/nextcloud-vue/pull/4744
* feat(`NcRichText`) add support of GFM (extended markdown) by @Antreesy in https://github.com/nextcloud-libraries/nextcloud-vue/pull/4365

### 🐛 Fixed bugs
* fix(NcCheckboxRadioSwitch): fix shift+click on firefox by @skjnldsv in https://github.com/nextcloud-libraries/nextcloud-vue/pull/4999
Expand Down
17 changes: 8 additions & 9 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from 'cypress'
import getCompareSnapshotsPlugin from 'cypress-visual-regression/dist/plugin'
import { configureVisualRegression } from 'cypress-visual-regression'

export default defineConfig({
projectId: '3paxvy',
Expand All @@ -8,19 +8,18 @@ export default defineConfig({
defaultCommandTimeout: 6000,

env: {
failSilently: false,
type: 'actual',
SNAPSHOT_BASE_DIRECTORY: './cypress/snapshots/base',
SNAPSHOT_DIFF_DIRECTORY: './cypress/snapshots/diff',
INTEGRATION_FOLDER: 'cypress/visual/',
trashAssetsBeforeRuns: true,
visualRegression: {
type: 'regression',
baseDirectory: './cypress/snapshots/base',
diffDirectory: './cypress/snapshots/diff',
},
},

screenshotsFolder: './cypress/snapshots/actual',

component: {
setupNodeEvents(on, config) {
getCompareSnapshotsPlugin(on, config)
setupNodeEvents(on) {
configureVisualRegression(on)

// Disable spell checking to prevent rendering differences
on('before:browser:launch', (browser, launchOptions) => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/component/richtext.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ describe('NcRichText', () => {
cy.get('li').should('have.length', testCases.length)
cy.get('li').each((item, index) => {
// Vue 2.7 renders three non-breaking spaces here for some reason
expect(item).have.text(' ' + testCases[index].output)
expect(item).contain(testCases[index].output)
})
cy.get('input:checked').should('have.length', testCases.filter(test => test.checked).length)
})
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
4 changes: 2 additions & 2 deletions cypress/support/commands.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import compareSnapshotCommand from 'cypress-visual-regression/dist/command'
import { addCompareSnapshotCommand } from 'cypress-visual-regression/dist/command'

compareSnapshotCommand()
addCompareSnapshotCommand()
3 changes: 0 additions & 3 deletions l10n/cs_CZ.pot
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,6 @@ msgstr "Olivínová"
msgid "online"
msgstr "online"

msgid "Open contact menu"
msgstr "Otevřít nabídku kontaktů"

msgid "Open link to \"{resourceName}\""
msgstr "Otevřít odkaz na „{resourceName}“"

Expand Down
3 changes: 0 additions & 3 deletions l10n/de_DE.pot
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,6 @@ msgstr "Olivin"
msgid "online"
msgstr "Online"

msgid "Open contact menu"
msgstr "Kontaktmenü öffnen"

msgid "Open link to \"{resourceName}\""
msgstr "Link zu \"{resourceName}“ öffnen"

Expand Down
3 changes: 0 additions & 3 deletions l10n/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,6 @@ msgstr ""
msgid "online"
msgstr ""

msgid "Open contact menu"
msgstr ""

msgid "Open link to \"{resourceName}\""
msgstr ""

Expand Down
42 changes: 39 additions & 3 deletions l10n/sv.pot
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ msgstr "Blåviolett"
msgid "Boston Blue"
msgstr "Bostonblå"

msgid "busy"
msgstr "upptagen"

msgid "Cancel changes"
msgstr "Avbryt ändringar"

Expand Down Expand Up @@ -102,12 +105,18 @@ msgstr "Stäng Smart Picker"
msgid "Collapse menu"
msgstr "Komprimera menyn"

msgid "Color picker"
msgstr "Färgväljare"

msgid "Confirm changes"
msgstr "Bekräfta ändringar"

msgid "Custom"
msgstr "Anpassad"

msgid "Dark skin tone"
msgstr "Mörk hudton"

#. TRANSLATORS: A color name for RGB(136, 85, 168)
msgid "Deluge"
msgstr "Skyfallsblå"
Expand All @@ -121,6 +130,9 @@ msgstr "stör ej"
msgid "Edit item"
msgstr "Ändra"

msgid "Emoji picker"
msgstr "Emoji-väljare"

msgid "Enter link"
msgstr "Ange länk"

Expand Down Expand Up @@ -165,13 +177,28 @@ msgstr "Göm lössenordet"
msgid "invisible"
msgstr "osynlig"

msgid "Keyboard navigation help"
msgstr "Hjälp med tangentbordsnavigering"

msgid "Light skin tone"
msgstr "Ljus hudton"

msgid "Load more \"{options}\""
msgstr "Ladda fler \"{options}\""

#. TRANSLATORS: A color name for RGB(45, 115, 190)
msgid "Mariner"
msgstr "Marinblå"

msgid "Medium dark skin tone"
msgstr "Medium mörk hudton"

msgid "Medium light skin tone"
msgstr "Medium ljus hudton"

msgid "Medium skin tone"
msgstr "Medium hudton"

msgid "Message limit of {count} characters reached"
msgstr "Meddelandegräns {count} tecken används"

Expand All @@ -181,6 +208,9 @@ msgstr "Fler objekt"
msgid "More options"
msgstr "Fler alternativ"

msgid "Neutral skin color"
msgstr "Neutral hudfärg"

msgid "Next"
msgstr "Nästa"

Expand Down Expand Up @@ -209,9 +239,6 @@ msgstr "Olivin"
msgid "online"
msgstr "online"

msgid "Open contact menu"
msgstr "Öppna kontaktmenyn"

msgid "Open link to \"{resourceName}\""
msgstr "Öppna länken till \"{resourceName}\""

Expand Down Expand Up @@ -318,6 +345,15 @@ msgstr "Inställningsmeny"
msgid "Show password"
msgstr "Visa lössenordet"

msgid "Skin tone"
msgstr "Hudton"

msgid "Skip to app navigation"
msgstr "Hoppa till appnavigering"

msgid "Skip to main content"
msgstr "Hoppa till huvudinnehåll"

msgid "Smart Picker"
msgstr "Smart Picker"

Expand Down
3 changes: 0 additions & 3 deletions l10n/tr.pot
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,6 @@ msgstr "Zeytinlik"
msgid "online"
msgstr "Çevrim içi"

msgid "Open contact menu"
msgstr "İletişim menüsünü aç"

msgid "Open link to \"{resourceName}\""
msgstr "{resourceName} bağlantısını aç"

Expand Down
Loading

0 comments on commit 58c6481

Please sign in to comment.