Skip to content

Commit

Permalink
Merge branch hotfix/v8.0.1 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
papacarlo committed Feb 26, 2024
2 parents 07727fb + e30723b commit 157f57e
Show file tree
Hide file tree
Showing 334 changed files with 10,475 additions and 8,883 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
8 changes: 8 additions & 0 deletions apps/common/main/lib/util/htmlutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ if ( ui_rtl && !isIE ) {
document.body.classList.add('rtl');
}

var isLangRtl = function (lang) {
return lang.lastIndexOf('ar', 0) === 0;
}

if ( isLangRtl(window.lang || lang) ) {
document.body.classList.add('rtl-font');
}

function checkScaling() {
var matches = {
'pixel-ratio__1_25': "screen and (-webkit-min-device-pixel-ratio: 1.25) and (-webkit-max-device-pixel-ratio: 1.49), " +
Expand Down
4 changes: 4 additions & 0 deletions apps/common/main/resources/less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
// Typography
// -------------------------

.rtl-font {
--font-family-base-custom: system-ui, -apple-system, "Geeza Pro", "Segoe UI", "Traditional Arabic", "Noto Sans";
}

@font-family-sans-serif: Arial, Helvetica, "Helvetica Neue", sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
Expand Down
30 changes: 13 additions & 17 deletions apps/common/mobile/lib/controller/Plugins.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,18 @@ const PluginsController = inject('storeAppOptions')(observer(props => {
iframe;

useEffect(() => {
const onDocumentReady = () => {
Common.Notifications.on('engineCreated', api => {
api.asc_registerCallback("asc_onPluginShow", showPluginModal);
api.asc_registerCallback("asc_onPluginClose", pluginClose);
api.asc_registerCallback("asc_onPluginResize", pluginResize);
api.asc_registerCallback('asc_onPluginsInit', onPluginsInit);

if(!storeAppOptions.customization || storeAppOptions.plugins !== false) {
loadPlugins();
}
});

Common.Gateway.on('init', loadConfig);
};
Common.Notifications.on('engineCreated', api => {
api.asc_registerCallback("asc_onPluginShow", showPluginModal);
api.asc_registerCallback("asc_onPluginClose", pluginClose);
api.asc_registerCallback("asc_onPluginResize", pluginResize);
api.asc_registerCallback('asc_onPluginsInit', onPluginsInit);

if(!storeAppOptions.customization || storeAppOptions.plugins !== false) {
loadPlugins();
}
});

onDocumentReady();
Common.Gateway.on('init', loadConfig);

return () => {
const api = Common.EditorApi.get();
Expand Down Expand Up @@ -190,8 +186,8 @@ const PluginsController = inject('storeAppOptions')(observer(props => {
const parsePlugins = pluginsdata => {
let isEdit = storeAppOptions.isEdit;

if ( pluginsdata instanceof Array ) {
let lang = storeAppOptions.lang.split(/[\-_]/)[0];
if (pluginsdata instanceof Array) {
let lang = storeAppOptions.lang ? storeAppOptions.lang.split(/[\-_]/)[0] : 'en';
pluginsdata.forEach((item) => {
item.variations.forEach( (itemVar) => {
let description = itemVar.description;
Expand Down
2 changes: 1 addition & 1 deletion apps/common/mobile/resources/less/colors-table.less
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
// Canvas

--canvas-background: #eee;
--canvas-content-background: #232323;
--canvas-content-background: #fff;
--canvas-page-border: #ccc;

--canvas-ruler-background: #fff;
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 @@ -476,7 +476,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
24 changes: 12 additions & 12 deletions apps/documenteditor/embed/locale/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"common.view.modals.txtHeight": "ارتفاع",
"common.view.modals.txtIncorrectPwd": "كلمة المرور غير صحيحة",
"common.view.modals.txtOpenFile": "أدخل كلمة المرور لفتح الملف",
"common.view.modals.txtShare": "مشاركة رابط",
"common.view.modals.txtShare": "مشاركة الرابط",
"common.view.modals.txtTitleProtected": "ملف محمي",
"common.view.modals.txtWidth": "العرض",
"common.view.SearchBar.textFind": "بحث",
"common.view.modals.txtWidth": "عرض",
"common.view.SearchBar.textFind": "إيجاد",
"DE.ApplicationController.convertationErrorText": "فشل التحويل.",
"DE.ApplicationController.convertationTimeoutText": "استغرق التحويل وقتا طويلا تم تجاوز المهلة",
"DE.ApplicationController.criticalErrorTitle": "خطأ",
"DE.ApplicationController.downloadErrorText": "فشل التنزيل",
"DE.ApplicationController.downloadTextText": "يتم تنزيل المستند...",
"DE.ApplicationController.downloadErrorText": "فشل التحميل",
"DE.ApplicationController.downloadTextText": "يتم تحميل المستند...",
"DE.ApplicationController.errorAccessDeny": "أنت تحاول تنفيذ إجراء ليس لديك صلاحيات القيام به.<br> الرجاء الاتصال بمسؤول خادم المستندات.",
"DE.ApplicationController.errorDefaultMessage": "رمز الخطأ: 1%",
"DE.ApplicationController.errorEditingDownloadas": "حدث خطأ أثناء العمل مع المستند.<br>استخدم خيار 'التنزيل كـ'لحفظ نسخة احتياطية من الملف على جهازك الشخصي.",
Expand All @@ -33,29 +33,29 @@
"DE.ApplicationController.openErrorText": "حدث خطأ أثناء فتح الملف.",
"DE.ApplicationController.scriptLoadError": "الاتصال بطيء جدًا ولا يمكن تحميل بعض المكونات. يُرجى إعادة تحميل الصفحة.",
"DE.ApplicationController.textAnonymous": "مجهول",
"DE.ApplicationController.textClear": "مسح جميع الحقول",
"DE.ApplicationController.textClear": "مسح كافة الحقول",
"DE.ApplicationController.textCtrl": "Ctrl",
"DE.ApplicationController.textGotIt": "حسناً",
"DE.ApplicationController.textGuest": "ضيف",
"DE.ApplicationController.textLoadingDocument": "يتم تحميل المستند",
"DE.ApplicationController.textLoadingDocument": " يتم تحميل المستند",
"DE.ApplicationController.textNext": "الحقل التالي",
"DE.ApplicationController.textOf": "من",
"DE.ApplicationController.textRequired": "قم بملء كل الحقول المطلوبة لارسال الاستمارة.",
"DE.ApplicationController.textSubmit": "إرسال",
"DE.ApplicationController.textSubmited": "<b>تم إرسال الاستمارة بنجاح</b><br>اضغط لغلق التلميح",
"DE.ApplicationController.titleLicenseExp": "الترخيص منتهي الصلاحية",
"DE.ApplicationController.titleLicenseExp": "إنتهت صلاحية الترخيص",
"DE.ApplicationController.titleLicenseNotActive": "الترخيص غير مُفعّل",
"DE.ApplicationController.txtClose": "إغلاق",
"DE.ApplicationController.txtEmpty": "(فارغ)",
"DE.ApplicationController.txtPressLink": "ثم قم بالنقر على الرابط %1 اضغط",
"DE.ApplicationController.unknownErrorText": "خطأ غير معروف.",
"DE.ApplicationController.unsupportedBrowserErrorText": "المتصفح المستخدم غير مدعوم.",
"DE.ApplicationController.waitText": "الرجاء الانتظار...",
"DE.ApplicationController.unsupportedBrowserErrorText": "متصفحك غير مدعوم.",
"DE.ApplicationController.waitText": "يُرجى الانتظار...",
"DE.ApplicationController.warnLicenseBefore": "الترخيص غير مُفعّل، يُرجى التواصل مع مسؤول الخادم.",
"DE.ApplicationController.warnLicenseExp": "إنتهت صلاحية الترخيص. قم بتحديث الترخيص وبعدها قم بتحديث الصفحة.",
"DE.ApplicationView.txtDownload": "تنزيل",
"DE.ApplicationView.txtDownload": "تحميل",
"DE.ApplicationView.txtDownloadDocx": "تنزيل بصيغة docx",
"DE.ApplicationView.txtDownloadPdf": "تنزيل بصيغة pdf",
"DE.ApplicationView.txtDownloadPdf": "التحميل كملف pdf",
"DE.ApplicationView.txtEmbed": "تضمين",
"DE.ApplicationView.txtFileLocation": "فتح موقع الملف",
"DE.ApplicationView.txtFullScreen": "ملء الشاشة",
Expand Down
6 changes: 6 additions & 0 deletions apps/documenteditor/embed/locale/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"common.view.modals.txtCopy": "Копиране в клипборда",
"common.view.modals.txtEmbed": "Вграждане",
"common.view.modals.txtHeight": "Височина",
"common.view.modals.txtOpenFile": "Въведете парола, за да отворите файла",
"common.view.modals.txtShare": "Споделяне на връзка",
"common.view.modals.txtTitleProtected": "Защитен файл",
"common.view.modals.txtWidth": "Широчина",
"DE.ApplicationController.convertationErrorText": "Конвертирането е неуспешно.",
"DE.ApplicationController.convertationTimeoutText": "Превишава се времето на изтичане на реализациите.",
Expand All @@ -13,10 +15,12 @@
"DE.ApplicationController.errorDefaultMessage": "Код на грешка: %1",
"DE.ApplicationController.errorFilePassProtect": "Файлът е защитен с парола и не може да бъде отворен.",
"DE.ApplicationController.errorFileSizeExceed": "Размерът на файла надвишава ограничението, зададено за вашия сървър.<br> Моля, свържете се с вашия администратор на Document Server за подробности.",
"DE.ApplicationController.errorTokenExpire": "Токенът за защита на документа е изтекъл. <br> Моля, свържете се с администратора на документа.",
"DE.ApplicationController.errorUpdateVersionOnDisconnect": "Интернет връзката е възстановена и версията на файла е променена.<br> Преди да продължите да работите, трябва да изтеглите файла или да копирате съдържанието му, за да сте сигурни, че нищо не е загубено, и след това да презаредите тази страница.",
"DE.ApplicationController.errorUserDrop": "Файлът не може да бъде достъпен в момента.",
"DE.ApplicationController.notcriticalErrorTitle": "Внимание",
"DE.ApplicationController.scriptLoadError": "Връзката е твърде бавна, някои от компонентите не могат да бъдат заредени. Моля, презаредете страницата.",
"DE.ApplicationController.textClear": "Изчисти всички полета",
"DE.ApplicationController.textGuest": "Гост",
"DE.ApplicationController.textLoadingDocument": "Зареждане на документ",
"DE.ApplicationController.textNext": "Следващо поле",
Expand All @@ -26,6 +30,8 @@
"DE.ApplicationController.unsupportedBrowserErrorText": "Вашият браузър не се поддържа.",
"DE.ApplicationController.waitText": "Моля изчакай...",
"DE.ApplicationView.txtDownload": "Изтегли",
"DE.ApplicationView.txtDownloadDocx": "Изтеглете като DOCX",
"DE.ApplicationView.txtDownloadPdf": "Изтеглете като PDF",
"DE.ApplicationView.txtEmbed": "Вграждане",
"DE.ApplicationView.txtFileLocation": "Mестоположението на файла",
"DE.ApplicationView.txtFullScreen": "Цял екран",
Expand Down
4 changes: 2 additions & 2 deletions apps/documenteditor/embed/locale/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"DE.ApplicationController.warnLicenseBefore": "Η άδεια χρήσης δεν είναι ενεργή. Επικοινωνήστε με το διαχειριστή σας.",
"DE.ApplicationController.warnLicenseExp": "Η άδεια χρήσης σας έχει λήξει. Ενημερώστε την άδειά σας και ανανεώστε τη σελίδα.",
"DE.ApplicationView.txtDownload": "Λήψη",
"DE.ApplicationView.txtDownloadDocx": "Λήψη ως docx",
"DE.ApplicationView.txtDownloadPdf": "Λήψη ως pdf",
"DE.ApplicationView.txtDownloadDocx": "Λήψη ως DOCX",
"DE.ApplicationView.txtDownloadPdf": "Λήψη ως PDF",
"DE.ApplicationView.txtEmbed": "Ενσωμάτωση",
"DE.ApplicationView.txtFileLocation": "Άνοιγμα θέσης αρχείου",
"DE.ApplicationView.txtFullScreen": "Πλήρης οθόνη",
Expand Down
12 changes: 6 additions & 6 deletions apps/documenteditor/embed/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"common.view.modals.txtHeight": "Height",
"common.view.modals.txtIncorrectPwd": "Password is incorrect",
"common.view.modals.txtOpenFile": "Enter a password to open the file",
"common.view.modals.txtShare": "Share Link",
"common.view.modals.txtShare": "Share link",
"common.view.modals.txtTitleProtected": "Protected file",
"common.view.modals.txtWidth": "Width",
"common.view.SearchBar.textFind": "Find",
Expand Down Expand Up @@ -33,12 +33,12 @@
"DE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
"DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"DE.ApplicationController.textAnonymous": "Anonymous",
"DE.ApplicationController.textClear": "Clear All Fields",
"DE.ApplicationController.textClear": "Clear all fields",
"DE.ApplicationController.textCtrl": "Ctrl",
"DE.ApplicationController.textGotIt": "Got it",
"DE.ApplicationController.textGuest": "Guest",
"DE.ApplicationController.textLoadingDocument": "Loading document",
"DE.ApplicationController.textNext": "Next Field",
"DE.ApplicationController.textNext": "Next field",
"DE.ApplicationController.textOf": "of",
"DE.ApplicationController.textRequired": "Fill all required fields to send form.",
"DE.ApplicationController.textSubmit": "Submit",
Expand All @@ -54,11 +54,11 @@
"DE.ApplicationController.warnLicenseBefore": "License not active. Please contact your administrator.",
"DE.ApplicationController.warnLicenseExp": "Your license has expired. Please update your license and refresh the page.",
"DE.ApplicationView.txtDownload": "Download",
"DE.ApplicationView.txtDownloadDocx": "Download as docx",
"DE.ApplicationView.txtDownloadPdf": "Download as pdf",
"DE.ApplicationView.txtDownloadDocx": "Download as DOCX",
"DE.ApplicationView.txtDownloadPdf": "Download as PDF",
"DE.ApplicationView.txtEmbed": "Embed",
"DE.ApplicationView.txtFileLocation": "Open file location",
"DE.ApplicationView.txtFullScreen": "Full Screen",
"DE.ApplicationView.txtFullScreen": "Full screen",
"DE.ApplicationView.txtPrint": "Print",
"DE.ApplicationView.txtSearch": "Search",
"DE.ApplicationView.txtShare": "Share"
Expand Down
Loading

0 comments on commit 157f57e

Please sign in to comment.