Skip to content

Commit

Permalink
Merge branch 'hotfix/v8.0.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
JuliaRadzhabova committed Feb 19, 2024
2 parents 5e4cdeb + e30723b commit 163b7f2
Show file tree
Hide file tree
Showing 78 changed files with 1,084 additions and 953 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: "CodeQL"

on:
push:
branches:
- 'master'
- 'hotfix/**'
- 'release/**'
paths-ignore:
- '**/README.md'
- '**/LICENSE'
- '.github/**'

schedule:
- cron: '0 0 * * 6'

jobs:
analyze:
name: Analyze
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript-typescript' ]

steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion apps/common/checkExtendedPDF.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function downloadPartialy(url, limit, postData, callback) {
var xhr = new XMLHttpRequest();
//value of responseText always has the current content received from the server, even if it's incomplete
// xhr.responseType = "json"; it raises an IE error. bug 66160
xhr.overrideMimeType('text/xml; charset=iso-8859-1');
xhr.overrideMimeType('text/plain; charset=iso-8859-1');
xhr.onreadystatechange = function () {
if (callbackCalled) {
return;
Expand Down
2 changes: 1 addition & 1 deletion apps/common/mobile/resources/less/common-ios.less
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@
line-height: 18px;
right: 26px;
color: @text-tertiary;
top: 5px;
top: 4.5px;
z-index: 100;
}
}
Expand Down
20 changes: 16 additions & 4 deletions apps/common/mobile/resources/less/common-rtl.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
[dir="rtl"].device-android {
.app-layout {
.searchbar input {
padding-right: 24px;
padding-left: 36px;
background-position: right;
.searchbar {
input {
padding-right: 24px;
padding-left: 36px;
background-position: right;
}

.number-search-results {
right: auto;
left: 26px;
}
}
}

Expand Down Expand Up @@ -47,6 +54,11 @@
}
}

.searchbar .number-search-results {
right: auto;
left: 26px;
}

.popover {
li:last-child, li:first-child {
.segmented a:first-child {
Expand Down
2 changes: 1 addition & 1 deletion apps/documenteditor/embed/locale/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@
"DE.ApplicationView.txtFileLocation": "Ouvrir l'emplacement du fichier",
"DE.ApplicationView.txtFullScreen": "Plein écran",
"DE.ApplicationView.txtPrint": "Imprimer",
"DE.ApplicationView.txtSearch": "Recherche",
"DE.ApplicationView.txtSearch": "Rechercher",
"DE.ApplicationView.txtShare": "Partager"
}
4 changes: 2 additions & 2 deletions apps/documenteditor/embed/locale/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"DE.ApplicationController.downloadErrorText": "下載失敗。",
"DE.ApplicationController.downloadTextText": "正在下載文件...",
"DE.ApplicationController.errorAccessDeny": "您正試圖執行您無權限的操作。<br>請聯繫您的文件伺服器管理員。",
"DE.ApplicationController.errorDefaultMessage": "錯誤編號:%1",
"DE.ApplicationController.errorDefaultMessage": "錯誤碼:%1",
"DE.ApplicationController.errorEditingDownloadas": "在處理文件時發生錯誤。<br>使用「另存為...」選項將檔案備份保存到您的電腦硬碟。",
"DE.ApplicationController.errorFilePassProtect": "該文件已被密碼保護,無法打開。",
"DE.ApplicationController.errorFileSizeExceed": "文件大小超出了伺服器設置的限制。<br>詳細請聯繫管理員。",
Expand Down Expand Up @@ -53,6 +53,6 @@
"DE.ApplicationView.txtFileLocation": "打開檔案位置",
"DE.ApplicationView.txtFullScreen": "全螢幕",
"DE.ApplicationView.txtPrint": "列印",
"DE.ApplicationView.txtSearch": "搜索",
"DE.ApplicationView.txtSearch": "搜尋",
"DE.ApplicationView.txtShare": "分享"
}
2 changes: 1 addition & 1 deletion apps/documenteditor/forms/locale/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
"DE.Views.ApplicationView.txtFileLocation": "Ouvrir l'emplacement du fichier",
"DE.Views.ApplicationView.txtFullScreen": "Plein écran",
"DE.Views.ApplicationView.txtPrint": "Imprimer",
"DE.Views.ApplicationView.txtSearch": "Recherche",
"DE.Views.ApplicationView.txtSearch": "Rechercher",
"DE.Views.ApplicationView.txtShare": "Partager",
"DE.Views.ApplicationView.txtTheme": "Thème d’interface"
}
4 changes: 2 additions & 2 deletions apps/documenteditor/forms/locale/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Common.UI.Window.yesButtonText": "Igen",
"Common.Views.CopyWarningDialog.textDontShow": "Ne mutassa újra ezt az üzenetet",
"Common.Views.CopyWarningDialog.textMsg": "A helyi menüvel végzett másolási, kivágási és beillesztési műveletek csak ezen a szerkesztőlapon hajthatók végre.<br><br>A szerkesztő lapon kívüli alkalmazásokba vagy alkalmazásokból történő másoláshoz vagy beillesztéshez használja a következő billentyűkombinációkat:",
"Common.Views.CopyWarningDialog.textTitle": "Másolás, kivágás és beillesztés",
"Common.Views.CopyWarningDialog.textTitle": "Másolás, kivágás és beillesztés műveletek",
"Common.Views.CopyWarningDialog.textToCopy": "Másolásra",
"Common.Views.CopyWarningDialog.textToCut": "Kivágásra",
"Common.Views.CopyWarningDialog.textToPaste": "Beillesztésre",
Expand Down Expand Up @@ -115,7 +115,7 @@
"DE.Controllers.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem elérhető.",
"DE.Controllers.ApplicationController.errorViewerDisconnect": "A kapcsolat megszakadt. Továbbra is megtekinthető a dokumentum,<br>de a kapcsolat helyreálltáig és az oldal újratöltéséig nem lehet letölteni.",
"DE.Controllers.ApplicationController.mniImageFromFile": "Kép fájlból",
"DE.Controllers.ApplicationController.mniImageFromStorage": "Kép a tárolóból",
"DE.Controllers.ApplicationController.mniImageFromStorage": "Kép tárhelyből",
"DE.Controllers.ApplicationController.mniImageFromUrl": "Kép hivatkozásból",
"DE.Controllers.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés",
"DE.Controllers.ApplicationController.openErrorText": "Hiba történt a fájl megnyitásakor.",
Expand Down
18 changes: 9 additions & 9 deletions apps/documenteditor/forms/locale/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"Common.UI.Calendar.textShortOctober": "十月",
"Common.UI.Calendar.textShortSaturday": "Sa",
"Common.UI.Calendar.textShortSeptember": "9月",
"Common.UI.Calendar.textShortSunday": "Su",
"Common.UI.Calendar.textShortSunday": "次方,上標",
"Common.UI.Calendar.textShortThursday": "Th",
"Common.UI.Calendar.textShortTuesday": "Tu",
"Common.UI.Calendar.textShortWednesday": "We",
"Common.UI.Calendar.textShortWednesday": "我們",
"Common.UI.Calendar.textYears": "年份",
"Common.UI.SearchBar.textFind": "尋找",
"Common.UI.SearchBar.tipCloseSearch": "關閉搜尋",
Expand Down Expand Up @@ -101,7 +101,7 @@
"DE.Controllers.ApplicationController.errorInconsistentExtPdf": "在打開檔案時發生錯誤。<br>檔案內容對應以下格式之一:pdf/djvu/xps/oxps,但檔案的副檔名矛盾:%1。",
"DE.Controllers.ApplicationController.errorInconsistentExtPptx": "開啟檔案時發生錯誤。<br>檔案內容對應於簡報(例如 pptx),但檔案的副檔名不一致:%1。",
"DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "開啟檔案時發生錯誤。<br>檔案內容對應於試算表(例如 xlsx),但檔案的副檔名不一致:%1。",
"DE.Controllers.ApplicationController.errorLoadingFont": "字型未載入。<br>請聯絡您的文件伺服器管理員。",
"DE.Controllers.ApplicationController.errorLoadingFont": "字型未載入。請聯絡您的文件伺服器管理員。",
"DE.Controllers.ApplicationController.errorServerVersion": "編輯器版本已更新。將重新載入頁面以更新改動。",
"DE.Controllers.ApplicationController.errorSessionAbsolute": "文件編輯會話已過期。請重新加載頁面。",
"DE.Controllers.ApplicationController.errorSessionIdle": "該文件已經有一段時間未編輯。請重新載入頁面。",
Expand All @@ -111,9 +111,9 @@
"DE.Controllers.ApplicationController.errorToken": "文件安全令牌格式不正確。<br>請聯繫您的相關管理員。",
"DE.Controllers.ApplicationController.errorTokenExpire": "文件安全令牌已過期。<br> 請聯繫相關管理員。",
"DE.Controllers.ApplicationController.errorUpdateVersion": "文件版本已更改。將重新載入頁面。",
"DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "連線已恢復,且檔案版本已更改。<br>在您繼續工作之前,您需要下載該檔案或複製其內容以確保不會遺失任何內容,然後重新載入此頁面。",
"DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "連線已恢復,且檔案版本已更改。&lt;br&gt;在您繼續工作之前,您需要下載該檔案或複製其內容以確保不會遺失任何內容,然後重新載入此頁面。",
"DE.Controllers.ApplicationController.errorUserDrop": "目前無法存取該檔案。",
"DE.Controllers.ApplicationController.errorViewerDisconnect": "連線已中斷。您仍然可以檢視文件,<br>但在連線恢復並重新載入頁面之前,將無法下載或列印文件。",
"DE.Controllers.ApplicationController.errorViewerDisconnect": "連線已中斷。您仍然可以檢視文件,&lt;br&gt;但在連線恢復並重新載入頁面之前,將無法下載或列印文件。",
"DE.Controllers.ApplicationController.mniImageFromFile": "從檔案插入圖片",
"DE.Controllers.ApplicationController.mniImageFromStorage": "從儲存空間插入圖片",
"DE.Controllers.ApplicationController.mniImageFromUrl": "從網址插入圖片",
Expand Down Expand Up @@ -154,13 +154,13 @@
"DE.Controllers.ApplicationController.waitText": "請稍候...",
"DE.Controllers.ApplicationController.warnLicenseAnonymous": "拒絕匿名使用者存取。<br>此文件只能以檢視模式開啟。",
"DE.Controllers.ApplicationController.warnLicenseBefore": "授權證書未啟用。<br>請聯繫您的管理員。",
"DE.Controllers.ApplicationController.warnLicenseExceeded": "您已達到同時連接 %1 編輯器的限制。此文件將僅以檢視模式開啟。<br>請聯繫您的管理員以了解詳情。",
"DE.Controllers.ApplicationController.warnLicenseExceeded": "您已達到同時連接 %1 編輯器的限制。此文件將僅以檢視模式開啟。&lt;br&gt;請聯繫您的管理員以了解詳情。",
"DE.Controllers.ApplicationController.warnLicenseExp": "您的許可證已過期。<br>請更新您的許可證並刷新頁面。",
"DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "授權過期<br>您已沒有編輯文件功能的授權<br> 請與您的管理者聯繫。",
"DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "授權證書需要更新<br> 您只有部分的文件編輯功能的存取權限<br>請與您的管理者聯繫來取得完整的存取權限。",
"DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "您已達到 %1 編輯器的使用者限制。請聯繫您的管理員以了解詳情",
"DE.Controllers.ApplicationController.warnNoLicense": "您已達到同時連接 %1 編輯器的限制。此文件將僅以檢視模式開啟。<br>請聯繫 %1 的銷售團隊了解個人升級條款。",
"DE.Controllers.ApplicationController.warnNoLicenseUsers": "您已達到%1個編輯器的用戶限制。與%1銷售團隊聯繫以了解個人升級條款",
"DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "您已達到%1個編輯器限制。請聯絡你的帳號管理員以了解更多資訊",
"DE.Controllers.ApplicationController.warnNoLicense": "您已達到同時連接 %1 編輯器的限制。此文件將僅以檢視模式開啟。&lt;br&gt;請聯繫 %1 的銷售團隊了解個人升級條款。",
"DE.Controllers.ApplicationController.warnNoLicenseUsers": "您已達到編輯器的使用者限制",
"DE.Views.ApplicationView.textClear": "清除所有欄位",
"DE.Views.ApplicationView.textClearField": "清除欄位",
"DE.Views.ApplicationView.textCopy": "複製",
Expand Down
6 changes: 3 additions & 3 deletions apps/documenteditor/main/locale/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"Common.define.smartArt.textBendingPictureBlocks": "Blocs d'imatges corbes",
"Common.define.smartArt.textBendingPictureCaption": "Llegenda d'imatge corba",
"Common.define.smartArt.textBendingPictureCaptionList": "Llista de llegendes d'imatges corba",
"Common.define.smartArt.textBendingPictureSemiTranparentText": "Text d'imatge semitransparent corb",
"Common.define.smartArt.textBendingPictureSemiTranparentText": "Text semitransparent d'imatge corba",
"Common.define.smartArt.textBlockCycle": "Cicle de blocs",
"Common.define.smartArt.textBubblePictureList": "Llista d'imatges de bombolla",
"Common.define.smartArt.textCaptionedPictures": "Imatges amb llegenda",
Expand Down Expand Up @@ -1627,7 +1627,7 @@
"DE.Views.ChartSettings.textWrap": "Estil d'ajustament",
"DE.Views.ChartSettings.textX": "Rotació X",
"DE.Views.ChartSettings.textY": "Rotació Y",
"DE.Views.ChartSettings.txtBehind": "Darrere el text",
"DE.Views.ChartSettings.txtBehind": "Darrere del text",
"DE.Views.ChartSettings.txtInFront": "Davant del text",
"DE.Views.ChartSettings.txtInline": "En línia amb el text",
"DE.Views.ChartSettings.txtSquare": "Quadrat",
Expand Down Expand Up @@ -2903,7 +2903,7 @@
"DE.Views.ShapeSettings.textWrap": "Estil d'ajustament",
"DE.Views.ShapeSettings.tipAddGradientPoint": "Afegeix un punt de degradat",
"DE.Views.ShapeSettings.tipRemoveGradientPoint": "Suprimir el punt de degradat",
"DE.Views.ShapeSettings.txtBehind": "Darrere el text",
"DE.Views.ShapeSettings.txtBehind": "Darrere del text",
"DE.Views.ShapeSettings.txtBrownPaper": "Paper marró",
"DE.Views.ShapeSettings.txtCanvas": "Llenç",
"DE.Views.ShapeSettings.txtCarton": "Cartró",
Expand Down
6 changes: 3 additions & 3 deletions apps/documenteditor/main/locale/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@
"Common.Views.Header.tipPrintQuick": "Impression rapide",
"Common.Views.Header.tipRedo": "Rétablir",
"Common.Views.Header.tipSave": "Enregistrer",
"Common.Views.Header.tipSearch": "Recherche",
"Common.Views.Header.tipSearch": "Rechercher",
"Common.Views.Header.tipUndo": "Annuler",
"Common.Views.Header.tipUsers": "Afficher les utilisateurs",
"Common.Views.Header.tipViewSettings": "Paramètres d'affichage",
Expand Down Expand Up @@ -2799,7 +2799,7 @@
"DE.Views.PrintWithPreview.txtPageSize": "Taille de page",
"DE.Views.PrintWithPreview.txtPortrait": "Portrait",
"DE.Views.PrintWithPreview.txtPrint": "Imprimer",
"DE.Views.PrintWithPreview.txtPrintPdf": "Imprimer au PDF",
"DE.Views.PrintWithPreview.txtPrintPdf": "Imprimer en PDF",
"DE.Views.PrintWithPreview.txtPrintRange": "Zone d'impression",
"DE.Views.PrintWithPreview.txtPrintSides": "Impression sur les deux côtés",
"DE.Views.PrintWithPreview.txtRight": "Droite",
Expand Down Expand Up @@ -3495,4 +3495,4 @@
"DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné",
"DE.Views.WatermarkSettingsDialog.tipFontName": "Nom de la police",
"DE.Views.WatermarkSettingsDialog.tipFontSize": "Taille de police"
}
}
2 changes: 1 addition & 1 deletion apps/documenteditor/main/locale/ro.json
Original file line number Diff line number Diff line change
Expand Up @@ -1849,7 +1849,7 @@
"DE.Views.DocumentHolder.textRemField": "Eliminare control câmp text",
"DE.Views.DocumentHolder.textRemove": "Ștergere",
"DE.Views.DocumentHolder.textRemoveControl": "Eliminare control de conținut",
"DE.Views.DocumentHolder.textRemPicture": "Eliminare control imagine",
"DE.Views.DocumentHolder.textRemPicture": "Ștergere imagine",
"DE.Views.DocumentHolder.textRemRadioBox": "Eliminare control buton de opțiune",
"DE.Views.DocumentHolder.textReplace": "Înlocuire imagine",
"DE.Views.DocumentHolder.textRotate": "Rotire",
Expand Down
Loading

0 comments on commit 163b7f2

Please sign in to comment.