Skip to content

Commit

Permalink
Migrate to Nextcloud Vue 8
Browse files Browse the repository at this point in the history
Signed-off-by: ScratchX98 <[email protected]>

Change title to name and other small fixes for migration

Signed-off-by: Grigory V <[email protected]>

Migrate/calendar availability

Signed-off-by: Grigory V <[email protected]>

Fix/update Select form, still with some bugs

Signed-off-by: Grigory V <[email protected]>

Fix/update Select form, still with some bugs

Signed-off-by: Grigory V <[email protected]>

Fix/Satisfy ESLint

Signed-off-by: Grigory V <[email protected]>

fix Circular structure in calendar object

Signed-off-by: hamza mahjoubi <[email protected]>

Enh/Update webpack vue config to fix NcInputField not being found warning

Signed-off-by: Grigory V <[email protected]>

Fix/Satisfy ESLint and remove not anymore used props

Signed-off-by: Grigory V <[email protected]>

Fix/Select bugs

Signed-off-by: Grigory V <[email protected]>

Fix/Satisfy ESLint

Signed-off-by: Grigory V <[email protected]>

Fix category selector in edit sidebar

Signed-off-by: Grigory V <[email protected]>

Attempt fixing conflicting calendar picker in appointments config modal

Signed-off-by: Grigory V <[email protected]>

Replace title with name in css

Signed-off-by: Grigory V <[email protected]>

Make NcSelects full width

Signed-off-by: Grigory V <[email protected]>

Hide title submit button

Never shrink property icons to fix vertical alignment

Adjust select styling overwrites to new NcSelect component

Make InviteesListSearch options display

Signed-off-by: Grigory V <[email protected]>

Adjust invitees and resource list search css

Needed because new NcSelect selection modal lives outside its parent

Signed-off-by: Grigory V <[email protected]>

Fix NcSelect resource searching

Signed-off-by: Grigory V <[email protected]>

Correct NcInputField import

Signed-off-by: Grigory V <[email protected]>

Fix too small width for NcSelect in repeat end

Signed-off-by: Grigory V <[email protected]>

Set clearable to false in NcSelects where it makes sense

Signed-off-by: Grigory V <[email protected]>

Fix PropertySelectMultiple.vue giving console errors because of undefined options

and attempt to remove already selected options from the vue select dropdown options, although they do not update, but I hope that this will work in Vue 3

Signed-off-by: Grigory V <[email protected]>

implement deselectFromDropdown and block multiple selection of the same element in PropertySelectMultiple

Signed-off-by: Grigory V <[email protected]>

Implement deselect icon for PropertySelectMultipleColoredOption

Signed-off-by: Grigory V <[email protected]>

Fix calendar picker options wrapping and overflowing

Signed-off-by: Richard Steinmetz <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

fix(deps): bump webdav from 5.3.0 to ^5.3.1 (main) (#5624)

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore(deps): bump vimeo/psalm from 5.15.0 to ^5.17.0 (main) (#5625)

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

fix(deps): bump core-js from 3.33.3 to ^3.34.0 (main) (#5626)

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

fix(sidebar): hide alarm actions menu when starting to edit

Signed-off-by: Richard Steinmetz <[email protected]>

use two different entry points

Signed-off-by: escoand <[email protected]>

add validity check

Signed-off-by: escoand <[email protected]>

add empty content

Signed-off-by: escoand <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

chore(deps): bump vimeo/psalm from 5.17.0 to ^5.18.0 (main) (#5633)

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Fix: translate month in year view

Signed-off-by: hamza mahjoubi <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

fix(deps): bump vue monorepo from 2.7.15 to ^2.7.16 (main) (#5623)

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

fix(attachments): Convert FileList to array

Firefox does not have FileList.forEach

Signed-off-by: Christoph Wurst <[email protected]>

chore: move some attachment logic to global state

Signed-off-by: Richard Steinmetz <[email protected]>

fix(deps): bump core-js from 3.34.0 to ^3.35.0 (main) (#5661)

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore: forward port changelogs from 4.6.x

Signed-off-by: Richard Steinmetz <[email protected]>

fix(attachments): folder picker opening twice

Signed-off-by: Richard Steinmetz <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>

Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <[email protected]>
  • Loading branch information
GVodyanov committed Feb 19, 2024
1 parent 981a826 commit ee615dd
Show file tree
Hide file tree
Showing 138 changed files with 6,390 additions and 2,085 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@

# Changelog

## 4.6.0 - unreleased
## 4.6.2 - 2024-01-03
### Fixed
- Uploading attachments in Firefox

## 4.6.1 - 2023-12-21
### Fixed
- Localisation for month view
- From/To order in booking emails
- Alarm not editable when menu is open

## 4.6.0 - 2023-11-30
### Added
- v2 for widget API
- PHP8.3 support
Expand Down
8 changes: 4 additions & 4 deletions css/app-navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
}

.app-navigation-entry-wrapper.deleted {
.app-navigation-entry__title {
.app-navigation-entry__name {
text-decoration: line-through;
}
}
Expand All @@ -163,7 +163,7 @@
}

.app-navigation-entry-wrapper.disabled {
.app-navigation-entry__title {
.app-navigation-entry__name {
color: var(--color-text-lighter) !important;
}
}
Expand Down Expand Up @@ -208,13 +208,13 @@
}

.app-navigation-entry-new-calendar {
.app-navigation-entry__title {
.app-navigation-entry__name {
color: var(--color-text-maxcontrast) !important;
}

&:hover,
&--open {
.app-navigation-entry__title {
.app-navigation-entry__name{
color: var(--color-text-light) !important;
}
}
Expand Down
108 changes: 60 additions & 48 deletions css/app-sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,9 @@
}

/** Hide the submit button for the title, because it does not trigger a save */
.app-sidebar-header__desc {
.app-sidebar-header__maintitle-form {
button {
display: none;
}
.app-sidebar-header__mainname-form {
button {
display: none;
}
}

Expand Down Expand Up @@ -141,7 +139,7 @@
display: flex;
align-items: center;

.multiselect {
.v-select {
width: 100%;
min-width: 100px !important; // Set a lower min-width
}
Expand Down Expand Up @@ -202,7 +200,7 @@
&__label,
&__end-type-select {
display: block;
min-width: 75px;
min-width: 160px;
width: 25%;
}

Expand Down Expand Up @@ -446,45 +444,6 @@
}
}

.resource-search__multiselect,
.invitees-search__multiselect {
width: 100%;

.resource-search-list-item,
.invitees-search-list-item {
display: flex;
align-items: center;
width: 100%;

// Account for avatar width (because it is position: relative)
padding-right: 32px;

&__label {
width: 100%;
padding: 0 8px;

&__availability {
color: var(--color-text-maxcontrast);
}

div {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

div:nth-child(1) {
color: var(--color-main-text)
}

div:nth-child(2) {
color: var(--color-text-lighter);
line-height: 1;
}
}
}
}

.resource-list-item,
.invitees-list-item {
display: flex;
Expand Down Expand Up @@ -585,6 +544,7 @@
}

&__icon {
flex-shrink: 0;
margin-left: -5px;
margin-right: 5px;
}
Expand All @@ -594,7 +554,7 @@

textarea,
input,
div.multiselect {
div.v-select {
width: 100%;
}

Expand Down Expand Up @@ -639,9 +599,15 @@

.property-select,
.property-select-multiple {
.multiselect {
align-items: center;

.v-select {
min-width: unset !important;
}

&__input {
width: 100%;
}
}

.property-color {
Expand Down Expand Up @@ -808,6 +774,7 @@
.calendar-picker-option {
display: flex;
align-items: center;
overflow: hidden;

&__color-indicator {
width: 12px;
Expand All @@ -822,6 +789,7 @@
&__label {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
flex-grow: 1;
}

Expand All @@ -843,6 +811,11 @@
border: none;
margin-right: 8px;
}

.icon {
margin-left: 4px;
scale: 0.8;
}
}

.resource-list-button-group,
Expand All @@ -853,3 +826,42 @@
align-items: center;
margin-top: 20px;
}

.resource-search-list-item,
.invitees-search-list-item {
display: flex;
align-items: center;
width: 100%;

// Account for avatar width (because it is position: relative)
padding-right: 32px;

&__label {
width: 100%;
padding: 0 8px;

&__availability {
color: var(--color-text-maxcontrast);
}

div {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

div:nth-child(1) {
color: var(--color-main-text)
}

div:nth-child(2) {
color: var(--color-text-lighter);
line-height: 1;
}
}
}

.resource-search__multiselect,
.invitees-search__multiselect {
width: 100%;
}
9 changes: 8 additions & 1 deletion l10n/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ OC.L10N.register(
"New subscription from link (read-only)" : "إشتراك جديد عن طريق رابط (للقراءة فقط)",
"Creating subscription …" : "جارٍ إنشاء اشتراك …",
"Add public holiday calendar" : "أضف تقويم العطلات العامة",
"Add custom public calendar" : "أضِف تقويماً عمومياً مُخصّصاً",
"An error occurred, unable to create the calendar." : "حدث خطأ، يتعذّر إنشاء التقويم.",
"Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "يرجى ادخال رابطٍ صحيحٍ (يبدأ بـ https://, http://, webcals://, webcal://)",
"Copy subscription link" : "نسخ رابط الاشتراك",
Expand Down Expand Up @@ -266,6 +267,7 @@ OC.L10N.register(
"Choose a file to add as attachment" : "إختر ملفّاً لإضافته كمرفق",
"Choose a file to share as a link" : "إختر ملفاً لمشاركته كرابط",
"Attachment {name} already exist!" : "المُرفَق {name} موجودٌ سلفاً!",
"Could not upload attachment(s)" : "يتعذّر رفع المرفقـ(ات)",
"_{count} attachment_::_{count} attachments_" : ["{count} مرفقات","{count} مرفق","{count} مرفقات","{count} مرفقات","{count} مرفقات","{count} مرفقات"],
"Invitation accepted" : "تمّ قبول الدعوة",
"Available" : "مُتوفر",
Expand Down Expand Up @@ -383,12 +385,17 @@ OC.L10N.register(
"Type to search time zone" : "أكتب للبحث في المنطقة الزمنية ",
"Global" : "عالمي",
"Public holiday calendars" : "تقاويم العطلات العامة",
"Public calendars" : "التقاويم العمومية",
"No valid public calendars configured" : "لا توجد أيّ تقاويم عمومية مُهيّأة بالشكل الصحيح",
"Speak to the server administrator to resolve this issue." : "تحدّث مع مشرف الخادوم لحل هذا الإشكال.",
"Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "يتم توفير تقاويم العطلات العامة من موقع ثندربرد Thunderbird. سوف يتم تنزيل بيانات التقويم من {website}",
"These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "هذه التقاويم العمومية تمّ اقتراحها من قِبل مشرف الخادوم. بيانات التقويم سيتم تحميلها من موقع الوب المعنِي.",
"By {authors}" : "من قِبَل {authors}",
"Subscribed" : "مُشترِك subscribed",
"Subscribe" : "إشترك subscribe",
"Holidays in {region}" : "العطلات الرسمية في {region}",
"An error occurred, unable to create the public holiday calendar." : "حدث خطأ، غير قادر على إنشاء تقويم العطللات العامة.",
"An error occurred, unable to read public calendars." : "حدث خطأ؛ تعذّرت قراءة التقاويم العمومية.",
"An error occurred, unable to subscribe to calendar." : "حدث خطأ؛ تعذّر الاشتراك في التقويم.",
"Select date" : "إختر التاريخ",
"Select slot" : "إختر الفُرضة الزمنية",
"No slots available" : "لا توجد أي فُرَضةٍ slot مٌتاحةٍ",
Expand Down
9 changes: 8 additions & 1 deletion l10n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"New subscription from link (read-only)" : "إشتراك جديد عن طريق رابط (للقراءة فقط)",
"Creating subscription …" : "جارٍ إنشاء اشتراك …",
"Add public holiday calendar" : "أضف تقويم العطلات العامة",
"Add custom public calendar" : "أضِف تقويماً عمومياً مُخصّصاً",
"An error occurred, unable to create the calendar." : "حدث خطأ، يتعذّر إنشاء التقويم.",
"Please enter a valid link (starting with http://, https://, webcal://, or webcals://)" : "يرجى ادخال رابطٍ صحيحٍ (يبدأ بـ https://, http://, webcals://, webcal://)",
"Copy subscription link" : "نسخ رابط الاشتراك",
Expand Down Expand Up @@ -264,6 +265,7 @@
"Choose a file to add as attachment" : "إختر ملفّاً لإضافته كمرفق",
"Choose a file to share as a link" : "إختر ملفاً لمشاركته كرابط",
"Attachment {name} already exist!" : "المُرفَق {name} موجودٌ سلفاً!",
"Could not upload attachment(s)" : "يتعذّر رفع المرفقـ(ات)",
"_{count} attachment_::_{count} attachments_" : ["{count} مرفقات","{count} مرفق","{count} مرفقات","{count} مرفقات","{count} مرفقات","{count} مرفقات"],
"Invitation accepted" : "تمّ قبول الدعوة",
"Available" : "مُتوفر",
Expand Down Expand Up @@ -381,12 +383,17 @@
"Type to search time zone" : "أكتب للبحث في المنطقة الزمنية ",
"Global" : "عالمي",
"Public holiday calendars" : "تقاويم العطلات العامة",
"Public calendars" : "التقاويم العمومية",
"No valid public calendars configured" : "لا توجد أيّ تقاويم عمومية مُهيّأة بالشكل الصحيح",
"Speak to the server administrator to resolve this issue." : "تحدّث مع مشرف الخادوم لحل هذا الإشكال.",
"Public holiday calendars are provided by Thunderbird. Calendar data will be downloaded from {website}" : "يتم توفير تقاويم العطلات العامة من موقع ثندربرد Thunderbird. سوف يتم تنزيل بيانات التقويم من {website}",
"These public calendars are suggested by the sever administrator. Calendar data will be downloaded from the respective website." : "هذه التقاويم العمومية تمّ اقتراحها من قِبل مشرف الخادوم. بيانات التقويم سيتم تحميلها من موقع الوب المعنِي.",
"By {authors}" : "من قِبَل {authors}",
"Subscribed" : "مُشترِك subscribed",
"Subscribe" : "إشترك subscribe",
"Holidays in {region}" : "العطلات الرسمية في {region}",
"An error occurred, unable to create the public holiday calendar." : "حدث خطأ، غير قادر على إنشاء تقويم العطللات العامة.",
"An error occurred, unable to read public calendars." : "حدث خطأ؛ تعذّرت قراءة التقاويم العمومية.",
"An error occurred, unable to subscribe to calendar." : "حدث خطأ؛ تعذّر الاشتراك في التقويم.",
"Select date" : "إختر التاريخ",
"Select slot" : "إختر الفُرضة الزمنية",
"No slots available" : "لا توجد أي فُرَضةٍ slot مٌتاحةٍ",
Expand Down
9 changes: 9 additions & 0 deletions l10n/ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@ OC.L10N.register(
"More events" : "Más eventos",
"Calendar" : "Calendariu",
"%1$s - %2$s" : "%1$s - %2$s",
"Confirm" : "Confirmar",
"Date:" : "Data:",
"Today" : "Güei",
"Year" : "Añu",
"Edit" : "Editar",
"Delete" : "Desaniciar",
"Export" : "Esportar",
"Trash bin" : "Papelera",
"Name" : "Nome",
"Internal link" : "Enllaz internu",
"A private link that can be used with external clients" : "Un enllaz priváu que se pue usar con veceros esternos",
"Copy public link" : "Copiar l'enllaz públicu",
"An error occurred while unsharing the calendar." : "Prodúxose un error mentanto se dexaba de compartir el calendariu.",
"Save" : "Guardar",
"Cancel" : "Encaboxar",
Expand All @@ -39,14 +42,17 @@ OC.L10N.register(
"Friday" : "Vienres",
"Saturday" : "Sábadu",
"Sunday" : "Domingu",
"Update" : "Anovar",
"Notification" : "Avisu",
"_second_::_seconds_" : ["segundu","segundos"],
"_minute_::_minutes_" : ["minutu","minutos"],
"_hour_::_hours_" : ["hora","hores"],
"_day_::_days_" : ["día","díes"],
"_week_::_weeks_" : ["selmana","selmanes"],
"Out of office" : "Fuera de la oficina",
"Accept" : "Aceptar",
"Decline" : "Refugar",
"Send email" : "Unviar un corréu electrónicu",
"_month_::_months_" : ["mes","meses"],
"_year_::_years_" : ["añu","años"],
"Suggestions" : "Suxerencies",
Expand All @@ -72,7 +78,9 @@ OC.L10N.register(
"_Every %n year_::_Every %n years_" : ["Cada %n añu","Cada %n años"],
"%n more" : "%n más",
"Status" : "Estáu",
"Categories" : "Categories",
"Meditation" : "Meditación",
"Commuting" : "En desplazamientu",
"Dog" : "Perru",
"Concert" : "Conciertu",
"Festival" : "Festival",
Expand All @@ -85,6 +93,7 @@ OC.L10N.register(
"Cinema" : "Cine",
"Graduation" : "Graduación",
"Inspection" : "Inspeición",
"Mail" : "Corréu electrónicu",
"Soccer" : "Fútbol",
"Basketball" : "Baloncestu",
"Museum" : "Muséu",
Expand Down
Loading

0 comments on commit ee615dd

Please sign in to comment.