From 705cc6f5e42254195fbf37a3f2b06cc02276da0a Mon Sep 17 00:00:00 2001 From: muxator Date: Tue, 16 Apr 2019 00:54:54 +0200 Subject: [PATCH] Change everywhere the link to https://etherpad.org (it was plain http) --- CHANGELOG.md | 2 +- README.md | 4 ++-- doc/api/http_api.md | 2 +- src/node/hooks/express.js | 2 +- src/package.json | 2 +- tests/frontend/specs/urls_become_clickable.js | 14 +++++++------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c767223..709c4f5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # 1.7.5 -* FEATURE: introduced support for multiple skins. See http://etherpad.org/doc/v1.7.5/#index_skins +* FEATURE: introduced support for multiple skins. See https://etherpad.org/doc/v1.7.5/#index_skins * FEATURE: added a new, optional skin. It can be activated choosing `skinName: "colibris"` in `settings.json` * FEATURE: allow file import using LibreOffice * SECURITY: updated many dependencies. No known high or moderate risk dependencies remain. diff --git a/README.md b/README.md index 3b8ff618..6205ae3c 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ To update to the latest released version, execute `git pull origin`. The next st ### Prebuilt Windows package This package works out of the box on any windows machine, but it's not very useful for developing purposes... -1. [Download the latest Windows package](http://etherpad.org/#download) +1. [Download the latest Windows package](https://etherpad.org/#download) 2. Extract the folder Now, run `start.bat` and open in your browser. You like it? [Next steps](#next-steps). @@ -124,7 +124,7 @@ Visit the **[FAQ](https://github.com/ether/etherpad-lite/wiki/FAQ)**. # Donate! * [Flattr](https://flattr.com/thing/71378/Etherpad-Foundation) -* Paypal - Press the donate button on [etherpad.org](http://etherpad.org) +* Paypal - Press the donate button on [etherpad.org](https://etherpad.org) * [Bitcoin](https://coinbase.com/checkouts/1e572bf8a82e4663499f7f1f66c2d15a) All donations go to the Etherpad foundation which is part of Software Freedom Conservency diff --git a/doc/api/http_api.md b/doc/api/http_api.md index 59008743..7599fae0 100644 --- a/doc/api/http_api.md +++ b/doc/api/http_api.md @@ -349,7 +349,7 @@ get the changeset at a given revision, or last revision if 'rev' is not defined. *Example returns:* * `{ "code" : 0, "message" : "ok", - "data" : "Z:1>6b|5+6b$Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http://etherpad.org\n" + "data" : "Z:1>6b|5+6b$Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at https://etherpad.org\n" }` * `{"code":1,"message":"padID does not exist","data":null}` * `{"code":1,"message":"rev is higher than the head revision of the pad","data":null}` diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js index ed5cafb7..7b45ccf6 100644 --- a/src/node/hooks/express.js +++ b/src/node/hooks/express.js @@ -12,7 +12,7 @@ var serverName; exports.createServer = function () { console.log("Report bugs at https://github.com/ether/etherpad-lite/issues") - serverName = `Etherpad ${settings.getGitCommit()} (http://etherpad.org)`; + serverName = `Etherpad ${settings.getGitCommit()} (https://etherpad.org)`; console.log(`Your Etherpad version is ${settings.getEpVersion()} (${settings.getGitCommit()})`); diff --git a/src/package.json b/src/package.json index 2b5eb5c1..d8d792b2 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "name": "ep_etherpad-lite", "description": "A Etherpad based on node.js", - "homepage": "http://etherpad.org", + "homepage": "https://etherpad.org", "keywords": [ "etherpad", "realtime", diff --git a/tests/frontend/specs/urls_become_clickable.js b/tests/frontend/specs/urls_become_clickable.js index b989717e..7f5e3067 100644 --- a/tests/frontend/specs/urls_become_clickable.js +++ b/tests/frontend/specs/urls_become_clickable.js @@ -6,16 +6,16 @@ describe("urls", function(){ }); it("when you enter an url, it becomes clickable", function(done) { - var inner$ = helper.padInner$; - var chrome$ = helper.padChrome$; - + var inner$ = helper.padInner$; + var chrome$ = helper.padChrome$; + //get the first text element out of the inner iframe var firstTextElement = inner$("div").first(); - + // simulate key presses to delete content firstTextElement.sendkeys('{selectall}'); // select all firstTextElement.sendkeys('{del}'); // clear the first line - firstTextElement.sendkeys('http://etherpad.org'); // insert a URL + firstTextElement.sendkeys('https://etherpad.org'); // insert a URL helper.waitFor(function(){ return inner$("div").first().find("a").length === 1; @@ -28,7 +28,7 @@ describe("urls", function(){ //get the first text element out of the inner iframe var firstTextElement = inner$("div").first(); - var url = "http://etherpad.org/!foo"; + var url = "https://etherpad.org/!foo"; // simulate key presses to delete content firstTextElement.sendkeys('{selectall}'); // select all @@ -50,7 +50,7 @@ describe("urls", function(){ //get the first text element out of the inner iframe var firstTextElement = inner$("div").first(); - var url = "http://etherpad.org/"; + var url = "https://etherpad.org/"; // simulate key presses to delete content firstTextElement.sendkeys('{selectall}'); // select all