From 8be6c84e2f5aebbf58384b5b6b440e11c12e1d64 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 8 Jul 2019 12:10:57 +0200 Subject: [PATCH 1/8] guard against null elements in the drive --- www/common/outer/userObject.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js index e12883eb5..3aab20a1d 100644 --- a/www/common/outer/userObject.js +++ b/www/common/outer/userObject.js @@ -506,8 +506,14 @@ define([ var fixRoot = function (elem) { if (typeof(files[ROOT]) !== "object") { debug("ROOT was not an object"); files[ROOT] = {}; } var element = elem || files[ROOT]; + if (!element) { return console.error("Invalid element in root"); var nbMetadataFolders = 0; for (var el in element) { + if (element[el] === null) { + console.error('element[%s] is null', el); + delete element[el]; + continue; + } if (exp.isFolderData(element[el])) { if (nbMetadataFolders !== 0) { debug("Multiple metadata files in folder"); From 5f5cd1e04504f9b4c6b007ae97558a55046f8158 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 8 Jul 2019 12:12:42 +0200 Subject: [PATCH 2/8] oups, add a missing closing brace --- www/common/outer/userObject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js index 3aab20a1d..4f235366a 100644 --- a/www/common/outer/userObject.js +++ b/www/common/outer/userObject.js @@ -506,7 +506,7 @@ define([ var fixRoot = function (elem) { if (typeof(files[ROOT]) !== "object") { debug("ROOT was not an object"); files[ROOT] = {}; } var element = elem || files[ROOT]; - if (!element) { return console.error("Invalid element in root"); + if (!element) { return console.error("Invalid element in root"); } var nbMetadataFolders = 0; for (var el in element) { if (element[el] === null) { From 677a1594a5561e022733076beebebbdbc4ca69ee Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 10 Jul 2019 10:25:40 +0200 Subject: [PATCH 3/8] wrap long lines in the support page --- customize.dist/src/less2/include/support.less | 1 + 1 file changed, 1 insertion(+) diff --git a/customize.dist/src/less2/include/support.less b/customize.dist/src/less2/include/support.less index 56dcccd8f..0a352ec32 100644 --- a/customize.dist/src/less2/include/support.less +++ b/customize.dist/src/less2/include/support.less @@ -44,6 +44,7 @@ } pre { margin-bottom: 0; + white-space: pre-wrap; &.cp-support-message-content { margin-top: 10px; margin-bottom: 10px; From 9f2355e95b8f686bfa17b9f15ce72d6778d3ff20 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 10 Jul 2019 13:34:55 +0200 Subject: [PATCH 4/8] Fix scrollbar issue in spreadsheets --- www/common/onlyoffice/app-oo.less | 1 + 1 file changed, 1 insertion(+) diff --git a/www/common/onlyoffice/app-oo.less b/www/common/onlyoffice/app-oo.less index 60510914d..c7bd64e01 100644 --- a/www/common/onlyoffice/app-oo.less +++ b/www/common/onlyoffice/app-oo.less @@ -44,6 +44,7 @@ body.cp-app-sheet, body.cp-app-oodoc, body.cp-app-ooslide { height: 100%; background-color: lightgrey; display: flex; + min-height: 0; } #cp-app-oo-editor { flex: 1; From 44e57619d024b937f7c482b74d65029f9f6bc273 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 10 Jul 2019 12:32:38 +0000 Subject: [PATCH 5/8] Translated using Weblate (Russian) Currently translated at 40.3% (410 of 1017 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/ --- www/common/translations/messages.ru.json | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.ru.json b/www/common/translations/messages.ru.json index e8f61dfe2..98fe7eb64 100644 --- a/www/common/translations/messages.ru.json +++ b/www/common/translations/messages.ru.json @@ -389,5 +389,27 @@ "fc_empty": "Удалить корзину", "fc_prop": "Свойства", "fc_hashtag": "Теги", - "fc_sizeInKilobytes": "Размер в килобайтах" + "fc_sizeInKilobytes": "Размер в килобайтах", + "poll_title": "Приватный выбор даты", + "fm_moveNestedSF": "Нельзя помещать одну общую папку в другую. Папка {0} не была перемещена.", + "fc_color": "Изменить цвет", + "fc_expandAll": "Расширить все", + "fc_collapseAll": "Скрыть все", + "fc_remove": "Удалить из вашего CryptDrive", + "fo_moveUnsortedError": "Вы не можете переместить папку в список черновиков", + "fo_existingNameError": "Это имя уже используется в данной директории. Пожалуйста выберите другое.", + "fo_unableToRestore": "Невозможно восстановить этот файл в исходное местоположение. Вы можете попытаться переместить его в другое место.", + "login_login": "Войти", + "login_makeAPad": "Создать анонимный пэд", + "login_nologin": "Просмотреть локальные пэды", + "login_register": "Зарегистрироваться", + "logoutButton": "Выйти", + "settingsButton": "Настройки", + "login_username": "Имя пользователя", + "login_password": "Пароль", + "login_confirm": "Подтвердите ваш пароль", + "login_remember": "Запомнить меня", + "login_hashing": "Ваш пароль хэшируется, это может занять некое время.", + "login_hello": "Привет {0},", + "login_helloNoName": "Привет," } From 1143ee3974e1e0fc998b0d0c1cb7d6f6d4d871ff Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 11 Jul 2019 09:55:54 +0200 Subject: [PATCH 6/8] fix typeError when subscribing to mailboxes from the profile page --- www/profile/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/profile/inner.js b/www/profile/inner.js index 8f589107f..75f1022f8 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -559,7 +559,7 @@ define([ lm.proxy.on('ready', function () { updateValues(lm.proxy); UI.removeLoadingScreen(); - common.mailbox.subscribe({ + common.mailbox.subscribe(["notifications"], { onMessage: function () { refreshFriendRequest(lm.proxy); }, From ffd630455f404d5539d10ebda86ecde819d9b034 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 10 Jul 2019 13:34:55 +0200 Subject: [PATCH 7/8] Fix scrollbar issue in spreadsheets --- www/common/onlyoffice/app-oo.less | 1 + 1 file changed, 1 insertion(+) diff --git a/www/common/onlyoffice/app-oo.less b/www/common/onlyoffice/app-oo.less index 60510914d..c7bd64e01 100644 --- a/www/common/onlyoffice/app-oo.less +++ b/www/common/onlyoffice/app-oo.less @@ -44,6 +44,7 @@ body.cp-app-sheet, body.cp-app-oodoc, body.cp-app-ooslide { height: 100%; background-color: lightgrey; display: flex; + min-height: 0; } #cp-app-oo-editor { flex: 1; From b1f0ca366413a6e11037c8c456ef4471f67ed14a Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 11 Jul 2019 10:27:08 +0200 Subject: [PATCH 8/8] update jshint --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 30b43f03e..bb7701b84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cryptpad", - "version": "2.23.0", + "version": "2.25.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -573,16 +573,16 @@ "dev": true }, "jshint": { - "version": "2.9.7", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz", - "integrity": "sha512-Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==", + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz", + "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==", "dev": true, "requires": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", - "lodash": "~4.17.10", + "lodash": "~4.17.11", "minimatch": "~3.0.2", "shelljs": "0.3.x", "strip-json-comments": "1.0.x" @@ -697,9 +697,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", "dev": true }, "lodash.clonedeep": { diff --git a/package.json b/package.json index 1a6462d84..585e8b8fc 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "flow-bin": "^0.59.0", - "jshint": "~2.9.1", + "jshint": "^2.10.2", "less": "2.7.1", "lesshint": "^4.5.0", "selenium-webdriver": "^3.6.0"