web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
ansuz 2019-07-11 10:28:20 +02:00
commit b149d6e139
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/src/less2/include/support.less
View File

@ -44,6 +44,7 @@
} }
pre { pre {
margin-bottom: 0; margin-bottom: 0;
white-space: pre-wrap;
&.cp-support-message-content { &.cp-support-message-content {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;

16
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "cryptpad", "name": "cryptpad",
"version": "2.23.0", "version": "2.25.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -573,16 +573,16 @@
"dev": true "dev": true
}, },
"jshint": { "jshint": {
"version": "2.9.7", "version": "2.10.2",
"resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz", "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz",
"integrity": "sha512-Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==", "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==",
"dev": true, "dev": true,
"requires": { "requires": {
"cli": "~1.0.0", "cli": "~1.0.0",
"console-browserify": "1.1.x", "console-browserify": "1.1.x",
"exit": "0.1.x", "exit": "0.1.x",
"htmlparser2": "3.8.x", "htmlparser2": "3.8.x",
"lodash": "~4.17.10", "lodash": "~4.17.11",
"minimatch": "~3.0.2", "minimatch": "~3.0.2",
"shelljs": "0.3.x", "shelljs": "0.3.x",
"strip-json-comments": "1.0.x" "strip-json-comments": "1.0.x"
@ -697,9 +697,9 @@
} }
}, },
"lodash": { "lodash": {
"version": "4.17.11", "version": "4.17.14",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
"dev": true "dev": true
}, },
"lodash.clonedeep": { "lodash.clonedeep": {

2
package.json
View File

@ -23,7 +23,7 @@
}, },
"devDependencies": { "devDependencies": {
"flow-bin": "^0.59.0", "flow-bin": "^0.59.0",
"jshint": "~2.9.1", "jshint": "^2.10.2",
"less": "2.7.1", "less": "2.7.1",
"lesshint": "^4.5.0", "lesshint": "^4.5.0",
"selenium-webdriver": "^3.6.0" "selenium-webdriver": "^3.6.0"

6
www/common/outer/userObject.js
View File

@ -506,8 +506,14 @@ define([
var fixRoot = function (elem) { var fixRoot = function (elem) {
if (typeof(files[ROOT]) !== "object") { debug("ROOT was not an object"); files[ROOT] = {}; } if (typeof(files[ROOT]) !== "object") { debug("ROOT was not an object"); files[ROOT] = {}; }
var element = elem || files[ROOT]; var element = elem || files[ROOT];
if (!element) { return console.error("Invalid element in root"); }
var nbMetadataFolders = 0; var nbMetadataFolders = 0;
for (var el in element) { 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 (exp.isFolderData(element[el])) {
if (nbMetadataFolders !== 0) { if (nbMetadataFolders !== 0) {
debug("Multiple metadata files in folder"); debug("Multiple metadata files in folder");

2
www/profile/inner.js
View File

@ -559,7 +559,7 @@ define([
lm.proxy.on('ready', function () { lm.proxy.on('ready', function () {
updateValues(lm.proxy); updateValues(lm.proxy);
UI.removeLoadingScreen(); UI.removeLoadingScreen();
common.mailbox.subscribe({ common.mailbox.subscribe(["notifications"], {
onMessage: function () { onMessage: function () {
refreshFriendRequest(lm.proxy); refreshFriendRequest(lm.proxy);
}, },