merge with ether/etherpad-lite develop branch

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.6.6
+ * FIX: line numbers are aligned with text again (broken in 1.6.4)
+ * FIX: text entered between connection loss and reconnection was not saved
+ * FIX: diagnostic call failed when etherpad was exposed in a subdirectory
+
 # 1.6.5
  * SECURITY: Escape data when listing available plugins
  * FIX: Fix typo in apicalls.js which prevented importing isValidJSONPName
@@ -6,9 +11,9 @@
  * FIX: unbreak Safari iOS line wrapping
 
 # 1.6.4
- * SECURITY: exploitable /admin access - CVE-2018-9845
+ * SECURITY: Access Control bypass on /admin - CVE-2018-9845
- * SECURITY: DoS with pad exports - CVE-2018-9327
+ * SECURITY: Remote Code Execution through pad export - CVE-2018-9327
- * SECURITY: Remote Code Execution - CVE-2018-9326
+ * SECURITY: Remote Code Execution through JSONP handling - CVE-2018-9326
  * SECURITY: Pad data leak - CVE-2018-9325
  * Fix: Admin redirect URL
  * Fix: Various script Fixes

bin/createRelease.sh

@@ -65,9 +65,21 @@ function check_api_token {
 
 function modify_files {
   # Add changelog text to first line of CHANGELOG.md
-  sed -i "1s/^/${changelogText}\n/" CHANGELOG.md
+
+  msg=""
+  # source: https://unix.stackexchange.com/questions/9784/how-can-i-read-line-by-line-from-a-variable-in-bash#9789
+  while IFS= read -r line
+  do
+    # replace newlines with literal "\n" for using with sed
+    msg+="$line\n"
+  done < <(printf '%s\n' "${changelogText}")
+
+  sed -i "1s/^/${msg}\n/" CHANGELOG.md
+  [[ $? != 0 ]] && echo "Aborting: Error modifying CHANGELOG.md" && exit 1
+
   # Replace version number of etherpad in package.json
   sed -i -r "s/(\"version\"[ ]*: \").*(\")/\1$VERSION\2/" src/package.json
+  [[ $? != 0 ]] && echo "Aborting: Error modifying package.json" && exit 1
 }
 
 function create_release_branch {

settings.json.template

@@ -45,12 +45,14 @@
                  },
 
   /* An Example of MySQL Configuration
+     See https://github.com/ether/etherpad-lite/wiki/How-to-use-Etherpad-Lite-with-MySQL
+   
    "dbType" : "mysql",
    "dbSettings" : {
-                    "user"    : "root",
+                    "user"    : "etherpaduser",
                     "host"    : "localhost",
-                    "password": "",
+                    "password": "PASSWORD",
-                    "database": "store",
+                    "database": "etherpad_lite_db",
                     "charset" : "utf8mb4"
                   },
   */

src/node/utils/ExportHtml.js

@@ -371,11 +371,7 @@ function getHTMLFromAtext(pad, atext, authorColors)
         if (!exists) {
           var prevLevel = 0;
           if (prevLine && prevLine.listLevel) {
-<<<<<<< HEAD
             prevLevel = prevLine.listLevel;
-=======
-            prevlevel = prevLine.listLevel;
->>>>>>> develop
           }
           if (prevLine && line.listTypeName !== prevLine.listTypeName)
           {

src/package.json

@@ -55,6 +55,6 @@
   "repository"     : { "type" : "git",
                        "url" : "http://github.com/ether/etherpad-lite.git"
                      },
-  "version"        : "1.6.5",
+  "version"        : "1.6.6",
   "license"        : "Apache-2.0"
 }