From 336d717c67d14e1250ea26df4e7d8332ff686dc8 Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 31 Jan 2018 15:29:57 +0100 Subject: [PATCH 01/47] fix text --- customize.dist/translations/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 32c61825f..1ec8d708e 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -475,7 +475,7 @@ define(function () { out.register_mustAcceptTerms = "You must accept the terms of service."; out.register_mustRememberPass = "We cannot reset your password if you forget it. It's very important that you remember it! Please check the checkbox to confirm."; - out.register_whyRegister = "Why signing up?"; + out.register_whyRegister = "Why sign up?"; out.register_header = "Welcome to CryptPad"; out.register_explanation = [ "

Lets go over a couple things first:

", From be0842c66dbc731eb7215a6bfab2a00f5f5fd7e6 Mon Sep 17 00:00:00 2001 From: Sven Neuhaus Date: Wed, 14 Feb 2018 15:47:17 +0100 Subject: [PATCH 02/47] add license to package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b9cac6c82..624e45aec 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", "version": "1.25.0", + "license": "AGPL-3.0-only", "dependencies": { "chainpad-server": "^2.0.0", "express": "~4.10.1", From 766fa728411fa807e675ff23407ce2e42663876f Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 19 Feb 2018 14:07:21 +0100 Subject: [PATCH 03/47] Fix initial value of the preview link in the share modal --- www/common/common-ui-elements.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 8e4fce0e4..1d41d8308 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -283,10 +283,11 @@ define([ present: present }); }; - var getLinkValue = function () { - var edit = $(link).find('#cp-share-editable-true').is(':checked'); - var embed = $(link).find('#cp-share-embed').is(':checked'); - var present = $(link).find('#cp-share-present').is(':checked'); + var getLinkValue = function (initValue) { + var val = initValue || {}; + var edit = initValue ? val.edit : $(link).find('#cp-share-editable-true').is(':checked'); + var embed = initValue ? val.embed : $(link).find('#cp-share-embed').is(':checked'); + var present = initValue ? val.present : $(link).find('#cp-share-present').is(':checked'); var hash = (edit && hashes.editHash) ? hashes.editHash : hashes.viewHash; var href = origin + pathname + '#' + hash; @@ -375,6 +376,7 @@ define([ } if (val.embed) { $(link).find('#cp-share-embed').attr('checked', true); } if (val.present) { $(link).find('#cp-share-present').attr('checked', true); } + $(link).find('#cp-share-link-preview').val(getLinkValue(val)); }); return tabs; }; From 2eef1e96e60f9104d9c8213aa94e1a1f40c7c0a9 Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 20 Feb 2018 10:21:15 +0100 Subject: [PATCH 04/47] Remove invalid error reports --- www/common/outer/userObject.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js index 12d6d225e..dadbfb463 100644 --- a/www/common/outer/userObject.js +++ b/www/common/outer/userObject.js @@ -104,9 +104,13 @@ define([ fd.owners && fd.owners.indexOf(edPublic) !== -1 && channelId) { removeOwnedChannel(channelId, function (obj) { if (obj && obj.error) { - console.error(obj.error); + // If the error is that the file is already removed, nothing to + // report, it's a normal behavior (pad expired probably) + if (obj.error.code === 'ENOENT') { return; } + // RPC may not be responding // Send a report that can be handled manually + console.error(obj.error); Feedback.send('ERROR_DELETING_OWNED_PAD=' + channelId, true); } }); From 15a81960373ba66ff855385ec6e49d0c5173f8a6 Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 20 Feb 2018 10:39:02 +0100 Subject: [PATCH 05/47] Enable pad creation screen --- www/common/application_config_internal.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js index 91520c99a..f6760f897 100644 --- a/www/common/application_config_internal.js +++ b/www/common/application_config_internal.js @@ -83,8 +83,9 @@ define(function() { contacts: 'fa-users', }; - // EXPERIMENTAL: Enabling "displayCreationScreen" may cause UI issues and possible loss of data - config.displayCreationScreen = false; + // Ability to create owned pads and expiring pads through a new pad creation screen. + // The new screen can be disabled by the users in their settings page + config.displayCreationScreen = true; // Prevent anonymous users from storing pads in their drive config.disableAnonymousStore = false; From 5f50bedce2a5b24b1ff6f25d248d9dd74d1aae70 Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 20 Feb 2018 14:42:11 +0100 Subject: [PATCH 06/47] Fix empty properties for readonly pads --- www/common/common-ui-elements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 1d41d8308..462c806fb 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -141,7 +141,7 @@ define([ }; var getPadProperties = function (common, data, cb) { var $d = $('
'); - if (!data || !data.href) { return void cb(void 0, $d); } + if (!data || (!data.href && !data.roHref)) { return void cb(void 0, $d); } if (data.href) { $('