Commit 797e3c3f authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'main' of https://github.com/nextcloud/calendar into main

parents 03006185 cb9590cb
Pipeline #198238 passed with stages
in 4 minutes and 53 seconds
......@@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2']
php-versions: ['7.4', '8.0', '8.1', '8.2']
name: php${{ matrix.php-versions }} lint
steps:
- name: Checkout
......
......@@ -11,11 +11,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.3', '7.4']
nextcloud-versions: ['stable21', 'stable22', 'stable23']
php-versions: ['7.4']
nextcloud-versions: ['stable22', 'stable23']
include:
- php-versions: '7.3'
nextcloud-versions: 'stable20'
- php-versions: '7.4'
nextcloud-versions: 'stable24'
- php-versions: '8.0'
......
......@@ -26,6 +26,7 @@ phpunit.unit.xml
README.md
screenshots
src
stylelint.config.js
tests
timezones
webpack.*
# Changelog
## 3.4.0 - 2022-07-20
### Added
- Visually distinguish events with attendees from ones without
- Visually distinguish events with reminders from ones without
- More key events on the simple editor
### Changed
- Drop PHP7.3 support (EOL)
- Drop Nextcloud 21 support (EOL)
- Event rendering now uses Vue
- Appointment booking message
### Fixed
- Logic to extract avatar link from inivitees list
- Missing stylelint
- Hide 3-dot menu button
- Attendee search
## 3.3.2 – 2022-06-02
### Fixed
- Squished settings checkbox label
......
......@@ -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.
]]></description>
<version>3.4.0-alpha.1</version>
<version>3.5.0-alpha.1</version>
<licence>agpl</licence>
<author>Anna Larch</author>
<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
......@@ -32,8 +32,8 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/calendar/main/screenshots/week_room_suggestion.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/calendar/main/screenshots/week_sidebar.png</screenshot>
<dependencies>
<php min-version="7.3" max-version="8.1" />
<nextcloud min-version="21" max-version="25" />
<php min-version="7.4" max-version="8.1" />
<nextcloud min-version="22" max-version="25" />
</dependencies>
<background-jobs>
<job>OCA\Calendar\BackgroundJob\CleanUpOutdatedBookingsJob</job>
......
{
"config": {
"platform": {
"php": "7.3"
"php": "7.4"
},
"sort-packages": true
},
"require": {
"php": ">=7.3 <=8.1"
"php": ">=7.4 <=8.1"
},
"require-dev": {
"christophwurst/nextcloud_testing": "0.12.4",
......
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "bbde2eca49163a0f4852b85fb25d6040",
"content-hash": "e72161d7f75deb29b6e198bd88015401",
"packages": [],
"packages-dev": [
{
......@@ -4285,7 +4285,7 @@
},
"platform-dev": [],
"platform-overrides": {
"php": "7.3"
"php": "7.4"
},
"plugin-api-version": "2.2.0"
"plugin-api-version": "2.3.0"
}
......@@ -243,7 +243,7 @@
}
.fc-event-title {
white-space: initial;
white-space: inherit;
}
}
......
[package]
before_cmds = [
"composer install --no-dev",
"composer install --no-dev -o",
"npm install",
"npm run build",
]
......@@ -348,6 +348,7 @@ OC.L10N.register(
"Relaxing" : "Relax",
"Relax" : "Relax",
"Commuting" : "Trajecte",
"Invoice" : "Factura",
"Presentation" : "Presentació",
"Talk" : "Parla",
"Camping" : "Acampada",
......
......@@ -346,6 +346,7 @@
"Relaxing" : "Relax",
"Relax" : "Relax",
"Commuting" : "Trajecte",
"Invoice" : "Factura",
"Presentation" : "Presentació",
"Talk" : "Parla",
"Camping" : "Acampada",
......
......@@ -9,6 +9,7 @@ OC.L10N.register(
"We wanted to inform you that %s has published the calendar »%s«." : "Vi ønkser at informerer dig om at %s har oprettet en begivenhed i kalenderen »%s«.",
"Open »%s«" : "Åbn »%s«",
"Cheers!" : "Hav en fortsat god dag.",
"Upcoming events" : "Kommende begivenheder",
"Appointments" : "Aftaler",
"Confirm" : "Bekræft",
"Date:" : "Dato:",
......@@ -150,6 +151,7 @@ OC.L10N.register(
"Global" : "Global",
"Time:" : "Tid:",
"Personal" : "Personlig",
"No upcoming events" : "Ingen kommende begivenheder",
"Details" : "Detaljer",
"Attendees" : "Deltagere",
"Resources" : "Resourcer",
......@@ -169,6 +171,7 @@ OC.L10N.register(
"Confirmed" : "Bekræftet",
"Canceled" : "Annulleret",
"Categories" : "Kategorier",
"Commuting" : "Pendler",
"Presentation" : "Præsentation",
"Talk" : "Snak",
"Movie" : "Film",
......
......@@ -7,6 +7,7 @@
"We wanted to inform you that %s has published the calendar »%s«." : "Vi ønkser at informerer dig om at %s har oprettet en begivenhed i kalenderen »%s«.",
"Open »%s«" : "Åbn »%s«",
"Cheers!" : "Hav en fortsat god dag.",
"Upcoming events" : "Kommende begivenheder",
"Appointments" : "Aftaler",
"Confirm" : "Bekræft",
"Date:" : "Dato:",
......@@ -148,6 +149,7 @@
"Global" : "Global",
"Time:" : "Tid:",
"Personal" : "Personlig",
"No upcoming events" : "Ingen kommende begivenheder",
"Details" : "Detaljer",
"Attendees" : "Deltagere",
"Resources" : "Resourcer",
......@@ -167,6 +169,7 @@
"Confirmed" : "Bekræftet",
"Canceled" : "Annulleret",
"Categories" : "Kategorier",
"Commuting" : "Pendler",
"Presentation" : "Præsentation",
"Talk" : "Snak",
"Movie" : "Film",
......
......@@ -292,6 +292,7 @@ OC.L10N.register(
"Meditation" : "مراقبه",
"Relaxing" : "آرامش بخش",
"Relax" : "آروم باش",
"Commuting" : "رفت و آمد",
"Presentation" : "ارائه",
"Talk" : "گفتگو",
"Camping" : "چادر زدن",
......
......@@ -290,6 +290,7 @@
"Meditation" : "مراقبه",
"Relaxing" : "آرامش بخش",
"Relax" : "آروم باش",
"Commuting" : "رفت و آمد",
"Presentation" : "ارائه",
"Talk" : "گفتگو",
"Camping" : "چادر زدن",
......
......@@ -213,6 +213,7 @@ OC.L10N.register(
"Save time" : "時刻を保存",
"Remove reminder" : "リマインダーを削除",
"on" : "曜日",
"at" : "",
"+ Add reminder" : "+ リマインダーを追加",
"Add reminder" : "リマインダーを追加",
"_second_::_seconds_" : [""],
......@@ -380,6 +381,7 @@ OC.L10N.register(
"Election" : "選挙",
"Voting" : "投票",
"Vote" : "投票",
"Garden" : "花園",
"Movie" : "ムービー",
"Cinema" : "映画館",
"Graduation" : "卒業式",
......@@ -387,16 +389,19 @@ OC.L10N.register(
"Review" : "レビュー",
"Baseball" : "野球",
"Meet" : "打ち合わせ",
"Planning" : "計画",
"Office" : "オフィス",
"Mail" : "メール",
"Soccer" : "サッカー",
"Football" : "フットボール",
"Gaming" : "ゲーム",
"Drive" : "ドライブ",
"Driving" : "運転",
"Bicycle" : "自転車",
"Cycle" : "自転車",
"Cycling" : "サイクリング",
"Biking" : "サイクリング",
"Bike" : "バイク",
"Podcast" : "生放送",
"Basketball" : "バスケットボール",
"Fishing" : "釣り",
......
......@@ -211,6 +211,7 @@
"Save time" : "時刻を保存",
"Remove reminder" : "リマインダーを削除",
"on" : "曜日",
"at" : "で",
"+ Add reminder" : "+ リマインダーを追加",
"Add reminder" : "リマインダーを追加",
"_second_::_seconds_" : ["秒"],
......@@ -378,6 +379,7 @@
"Election" : "選挙",
"Voting" : "投票",
"Vote" : "投票",
"Garden" : "花園",
"Movie" : "ムービー",
"Cinema" : "映画館",
"Graduation" : "卒業式",
......@@ -385,16 +387,19 @@
"Review" : "レビュー",
"Baseball" : "野球",
"Meet" : "打ち合わせ",
"Planning" : "計画",
"Office" : "オフィス",
"Mail" : "メール",
"Soccer" : "サッカー",
"Football" : "フットボール",
"Gaming" : "ゲーム",
"Drive" : "ドライブ",
"Driving" : "運転",
"Bicycle" : "自転車",
"Cycle" : "自転車",
"Cycling" : "サイクリング",
"Biking" : "サイクリング",
"Bike" : "バイク",
"Podcast" : "生放送",
"Basketball" : "バスケットボール",
"Fishing" : "釣り",
......
......@@ -90,6 +90,7 @@ OC.L10N.register(
"Restore" : "Врати",
"Delete permanently" : "Избриши",
"Empty trash bin" : "Испразни ја корпата со отпадоци",
"Unknown calendar" : "Непознат календар",
"Could not update calendar order." : "Неможе да се ажурира редоследот на календарите.",
"Import calendars" : "Увези календари",
"Please select a calendar to import into …" : "Изберете календар за да направите увоз во него …",
......
......@@ -88,6 +88,7 @@
"Restore" : "Врати",
"Delete permanently" : "Избриши",
"Empty trash bin" : "Испразни ја корпата со отпадоци",
"Unknown calendar" : "Непознат календар",
"Could not update calendar order." : "Неможе да се ажурира редоследот на календарите.",
"Import calendars" : "Увези календари",
"Please select a calendar to import into …" : "Изберете календар за да направите увоз во него …",
......
......@@ -127,6 +127,7 @@ OC.L10N.register(
"{filename} could not be parsed" : "{filename} kon niet worden geanalyseerd",
"No valid files found, aborting import" : "Geen geldige bestand gevonden, import afgebroken",
"Import partially failed. Imported {accepted} out of {total}." : "Import is gedeeltelijk gelukt. Geïmporteerd {accepted} van de {total}.",
"_Successfully imported %n event_::_Successfully imported %n events_" : ["%nafspraak succesvol geïmporteerd","%n afspraken succesvol geïmporteerd"],
"Automatic" : "Automatisch",
"Automatic ({detected})" : "Automatisch ({detected})",
"New setting was not saved successfully." : "De nieuwe instelling is niet goed opgeslagen.",
......@@ -143,6 +144,8 @@ OC.L10N.register(
"Actions" : "Acties",
"Create event" : "Creëer afspraak",
"Show shortcuts" : "Toon sneltoetsen",
"Save edited event" : "Aangepaste afspraak opslaan",
"Delete edited event" : "Aangepaste afspraak verwijderen",
"Enable birthday calendar" : "Verjaardagskalender inschakelen",
"Show tasks in calendar" : "Toon taken in agenda",
"Enable simplified editor" : "Eenvoudige editor inschakelen",
......@@ -448,6 +451,7 @@ OC.L10N.register(
"Relaxing" : "Relaxen",
"Relax" : "Relax",
"Break" : "Pauze",
"Commute" : "Woon-werk",
"Commuting" : "Woon-werk",
"Shuttle" : "Shuttle",
"Invoice" : "Factuur",
......@@ -459,10 +463,20 @@ OC.L10N.register(
"Concert" : "Concert",
"Festival" : "Festival",
"Theater" : "Theater",
"Theatre" : "Theater",
"Presentation" : "Presentatie",
"Talk" : "Talk",
"Speech" : "Speech",
"Deadline" : "Deadline",
"Submission" : "Aanlevering",
"Reporting" : "Rapportage",
"Camping" : "Camping",
"Camp" : "Kamp",
"Election" : "Verkiezing",
"Voting" : "Stemming",
"Vote" : "Stemmen",
"Barbecue" : "Barbecue",
"Barbeque" : "Barbeque",
"Garden" : "Tuin",
"Farm" : "Boerderij",
"Movie" : "Film",
......@@ -472,6 +486,7 @@ OC.L10N.register(
"Review" : "Voorbeeld",
"Audit" : "Audit",
"Inspection" : "Inspectie",
"Proofreading" : "Proofreading",
"Baseball" : "Baseball",
"Meet" : "Afspraak",
"Planning" : "Planning",
......@@ -516,6 +531,7 @@ OC.L10N.register(
"Gym" : "Turnles",
"Barber" : "Kapper",
"Haircut" : "Kapper",
"Hairdresser" : "Kapper",
"Exam" : "Examen",
"Written test" : "Schrifteleijke overhoring",
"Oral test" : "Mondelinge overhoring",
......@@ -543,6 +559,7 @@ OC.L10N.register(
"Pair" : "Paar",
"Lecture" : "Lezing",
"Seminar" : "Seminarie",
"Teaching" : "Lesgeven",
"Photograph" : "Foto",
"Party" : "Party",
"Celebration" : "Viering",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment