Merge pull request #1336 from nextcloud/release/0.9.18

Security release 0.9.18
nextcloud · Nov 9, 2022 · 0e30ec0 · 0e30ec0
2 parents 9abd742 + 43cda61
commit 0e30ec0
Show file tree

Hide file tree

Showing 27 changed files with 1,807 additions and 2,333 deletions.
diff --git a/.github/actions/deploy/create-version.sh b/.github/actions/deploy/create-version.sh
@@ -10,7 +10,7 @@ fi
 deploy_path='.github/actions/deploy'
 
 stable_branch=$(cat "$deploy_path/stable_name")
-master_branch=master
+master_branch=main-0.9.x
 
 major=$(cat "$deploy_path/major")
 minor=$(cat "$deploy_path/minor")

diff --git a/.github/actions/deploy/stable_name b/.github/actions/deploy/stable_name
@@ -1 +1 @@
-stable
+stable-0.9.x
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml
@@ -10,7 +10,7 @@ on:
     branches:
       - main
       - master
-      - stable*
+      - main-*
 
 permissions:
   contents: read

diff --git a/.tx/backport b/.tx/backport
@@ -1 +1 @@
-
+main-0.9.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ## [Unreleased]
 
 
+## 0.9.18 - 2022-11-09
+
+### Fixed
+- Critical security issue fixed related to vue-loader
+
 
 ## 0.9.17 - 2022-10-31
 

diff --git a/README.md b/README.md
@@ -5,7 +5,8 @@
     <img src="https://img.shields.io/matrix/nextcloud-cookbook:matrix.org?logo=matrix&label=Join%20the%20discussion&style=flat" alt="Join us on Matrix" >
 </a>
 
-![CI-tests](https://github.com/nextcloud/cookbook/workflows/CI-tests/badge.svg) 
+![CI-tests](https://github.com/nextcloud/cookbook/workflows/CI-tests/badge.svg)
+[![codecov](https://codecov.io/gh/nextcloud/cookbook/branch/master/graph/badge.svg?token=J1DI0KGEX3)](https://codecov.io/gh/nextcloud/cookbook)
 ![GitHub](https://img.shields.io/github/license/nextcloud/cookbook)
 ![GitHub language count](https://img.shields.io/github/languages/count/nextcloud/cookbook)
 ![GitHub Repo stars](https://img.shields.io/github/stars/nextcloud/cookbook?logo=github)
@@ -54,4 +55,4 @@ The parser is far from perfect. If you can help out in any way, please [have a l
 
 #### All of the text is in English?
 This app uses the [Transifex](https://www.transifex.com/nextcloud/nextcloud/cookbook/) translation system.
-You might want to register there to help translating the app to new languages or report errors in existing translations.
+You might want to register there to help translating the app to new languages or report errors in existing translations.
diff --git a/l10n/cs.js b/l10n/cs.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "Nepodařilo se načíst výsledky vyhledávání",
     "Dismiss" : "Zahodit",
     "Cancel" : "Storno",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Přerušit úpravy"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
diff --git a/l10n/cs.json b/l10n/cs.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "Nepodařilo se načíst výsledky vyhledávání",
     "Dismiss" : "Zahodit",
     "Cancel" : "Storno",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Přerušit úpravy"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
diff --git a/l10n/de.js b/l10n/de.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "Fehler beim Laden der Suchergebnisse",
     "Dismiss" : "Verwerfen",
     "Cancel" : "Abbrechen",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Bearbeitung abbrechen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "Fehler beim Laden der Suchergebnisse",
     "Dismiss" : "Verwerfen",
     "Cancel" : "Abbrechen",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Bearbeitung abbrechen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "Fehler beim Laden der Suchergebnisse",
     "Dismiss" : "Ablehnen",
     "Cancel" : "Abbrechen",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Bearbeitung abbrechen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "Fehler beim Laden der Suchergebnisse",
     "Dismiss" : "Ablehnen",
     "Cancel" : "Abbrechen",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Bearbeitung abbrechen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/es.js b/l10n/es.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "Fallo al cargar los resultados de la búsqueda",
     "Dismiss" : "Descartar",
     "Cancel" : "Cancelar",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Abortar edición"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/l10n/es.json b/l10n/es.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "Fallo al cargar los resultados de la búsqueda",
     "Dismiss" : "Descartar",
     "Cancel" : "Cancelar",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Abortar edición"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
diff --git a/l10n/hu.js b/l10n/hu.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "Nem sikerült betölteni a találatokat",
     "Dismiss" : "Eltüntetés",
     "Cancel" : "Mégse",
-    "OK" : "Rendben"
+    "OK" : "Rendben",
+    "Abort editing" : "Szerkesztés megszakítása"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/hu.json b/l10n/hu.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "Nem sikerült betölteni a találatokat",
     "Dismiss" : "Eltüntetés",
     "Cancel" : "Mégse",
-    "OK" : "Rendben"
+    "OK" : "Rendben",
+    "Abort editing" : "Szerkesztés megszakítása"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/pl.js b/l10n/pl.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "Nie udało się załadować wyników wyszukiwania",
     "Dismiss" : "Odrzuć",
     "Cancel" : "Anuluj",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Przerwij edycję"
 },
 "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
diff --git a/l10n/pl.json b/l10n/pl.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "Nie udało się załadować wyników wyszukiwania",
     "Dismiss" : "Odrzuć",
     "Cancel" : "Anuluj",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Przerwij edycję"
 },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }
diff --git a/l10n/sk.js b/l10n/sk.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "Zlyhalo načítavanie výsledkov vyhľadávania",
     "Dismiss" : "Odmietnuť",
     "Cancel" : "Zrušiť",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Zrušiť úpravu"
 },
 "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/l10n/sk.json b/l10n/sk.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "Zlyhalo načítavanie výsledkov vyhľadávania",
     "Dismiss" : "Odmietnuť",
     "Cancel" : "Zrušiť",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "Zrušiť úpravu"
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"
 }
diff --git a/l10n/tr.js b/l10n/tr.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "Arama sonuçları yüklenemedi",
     "Dismiss" : "Yok say",
     "Cancel" : "İptal",
-    "OK" : "Tamam"
+    "OK" : "Tamam",
+    "Abort editing" : "Düzenlemekten vazgeç"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/l10n/tr.json b/l10n/tr.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "Arama sonuçları yüklenemedi",
     "Dismiss" : "Yok say",
     "Cancel" : "İptal",
-    "OK" : "Tamam"
+    "OK" : "Tamam",
+    "Abort editing" : "Düzenlemekten vazgeç"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
@@ -110,6 +110,9 @@ OC.L10N.register(
     "Search recipes with this keyword" : "用这个关键词搜索菜谱",
     "Date created" : "创建日期",
     "Last modified" : "最后更改",
+    "Preparation time (H:MM)" : "准备时间 (H:MM)",
+    "Cooking time (H:MM)" : "烹饪时间 (H:MM)",
+    "Total time (H:MM)" : "总时间 (H:MM)",
     "Serving Size" : "食用份量",
     "Energy" : "能量",
     "Sugar" : "糖",

diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
@@ -108,6 +108,9 @@
     "Search recipes with this keyword" : "用这个关键词搜索菜谱",
     "Date created" : "创建日期",
     "Last modified" : "最后更改",
+    "Preparation time (H:MM)" : "准备时间 (H:MM)",
+    "Cooking time (H:MM)" : "烹饪时间 (H:MM)",
+    "Total time (H:MM)" : "总时间 (H:MM)",
     "Serving Size" : "食用份量",
     "Energy" : "能量",
     "Sugar" : "糖",

diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
@@ -186,6 +186,7 @@ OC.L10N.register(
     "Failed to load search results" : "無法加載搜尋結果",
     "Dismiss" : "撤銷",
     "Cancel" : "取消",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "中止編輯"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
@@ -184,6 +184,7 @@
     "Failed to load search results" : "無法加載搜尋結果",
     "Dismiss" : "撤銷",
     "Cancel" : "取消",
-    "OK" : "OK"
+    "OK" : "OK",
+    "Abort editing" : "中止編輯"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ on: @@
         branches:
           - main
           - master
-          - stable*
+          - main-*
     permissions:
       contents: read
@@ Expand Down @@