Merge pull request #2495 from ether/release/1.5.1

Release/1.5.1

Author: JohnMcLear

CHANGELOG.md

@@ -1,3 +1,28 @@
+# 1.5.1
+ * NEW: High resolution Icon
+ * NEW: Use HTTPS for plugins.json download
+ * NEW: Add 'last update' column
+ * NEW: Show users and chat at the same time
+ * NEW: Support io.js
+ * Fix: removeAttributeOnLine now works properly
+ * Fix: Plugin search and list
+ * Fix: Issue where unauthed request could cause error
+ * Fix: Privacy issue with .etherpad export
+ * Fix: Freeze deps to improve bisectability
+ * Fix: IE, everything. IE is so broken.
+ * Fix: Timeslider proxy
+ * Fix: All backend tests pass
+ * Fix: Better support for Export into HTML
+ * Fix: Timeslider stars
+ * Fix: Translation update
+ * Fix: Check filesystem if Abiword exists
+ * Fix: Docs formatting
+ * Fix: Move Save Revision notification to a gritter message
+ * Fix: UeberDB MySQL Timeout issue
+ * Fix: Indented +9 list items
+ * Fix: Don't paste on middle click of link
+ * SECURITY Fix: Issue where a malformed URL could cause EP to disclose installation location
+
 # 1.5.0
  * NEW: Lots of performance improvements for page load times
  * NEW: Hook for adding CSS to Exports

CONTRIBUTING.md

@@ -1,6 +1,31 @@
 # Developer Guidelines
 (Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad-lite#get-in-touch))
 
+## How to write a bug report
+
+* Please be polite, we all are humans and problems can occur.
+* Please add as much information as possible, for example
+  * client os(s) and version(s)
+    * browser(s) and version(s), is the problem reproduceable on different clients
+    * special environments like firewalls or antivirus
+  * host os and version
+    * npm and nodejs version
+    * Logfiles if available
+  * steps to reproduce
+  * what you expected to happen
+  * what actually happened
+* Please format logfiles and code examples with markdown see github Markdown help below the issue textarea for more information.
+
+If you send logfiles, please set the loglevel switch DEBUG in your settings.json file:
+
+```
+/* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */
+  "loglevel": "DEBUG",
+```
+
+The logfile location is defined in startup script or the log is directly shown in the commandline after you have started etherpad.
+
+
 ## Important note for pull requests
 **Pull requests should be issued against the develop branch**.  We never pull directly into master.
 

bin/installDeps.sh

@@ -10,44 +10,51 @@ fi
 
 #Is gnu-grep (ggrep) installed on SunOS (Solaris)
 if [ $(uname) = "SunOS" ]; then
-  hash ggrep > /dev/null 2>&1 || { 
+  hash ggrep > /dev/null 2>&1 || {
     echo "Please install ggrep (pkg install gnu-grep)" >&2
-    exit 1 
+    exit 1
   }
 fi
 
 #Is curl installed?
-hash curl > /dev/null 2>&1 || { 
+hash curl > /dev/null 2>&1 || {
   echo "Please install curl" >&2
-  exit 1 
+  exit 1
 }
 
 #Is node installed?
-hash node > /dev/null 2>&1 || { 
+#not checking io.js, default installation creates a symbolic link to node
+hash node > /dev/null 2>&1 || {
   echo "Please install node.js ( http://nodejs.org )" >&2
-  exit 1 
+  exit 1
 }
 
 #Is npm installed?
-hash npm > /dev/null 2>&1 || { 
+hash npm > /dev/null 2>&1 || {
   echo "Please install npm ( http://npmjs.org )" >&2
-  exit 1 
+  exit 1
 }
 
 #check npm version
 NPM_VERSION=$(npm --version)
 NPM_MAIN_VERSION=$(echo $NPM_VERSION | cut -d "." -f 1)
 if [ $(echo $NPM_MAIN_VERSION) = "0" ]; then
   echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x or higher" >&2
-  exit 1 
+  exit 1
 fi
 
 #check node version
 NODE_VERSION=$(node --version)
 NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2)
+#iojs version checking added
+if hash iojs 2>/dev/null; then
+  IOJS_VERSION=$(iojs --version)
+fi
 if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ]; then
-  echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.8.x, v0.10.x or v0.11.x" >&2
-  exit 1 
+  if [ ! $IOJS_VERSION ]; then
+    echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need v0.8.x, v0.10.x or v0.11.x" >&2
+    exit 1
+  fi
 fi
 
 #Get the name of the settings file
@@ -71,19 +78,19 @@ echo "Ensure that all dependencies are up to date...  If this is the first time
   [ -e ep_etherpad-lite ] || ln -s ../src ep_etherpad-lite
   cd ep_etherpad-lite
   npm install --loglevel warn
-) || { 
+) || {
   rm -rf node_modules
-  exit 1 
+  exit 1
 }
 
 echo "Ensure jQuery is downloaded and up to date..."
 DOWNLOAD_JQUERY="true"
 NEEDED_VERSION="1.9.1"
 if [ -f "src/static/js/jquery.js" ]; then
   if [ $(uname) = "SunOS" ]; then
-    VERSION=$(cat src/static/js/jquery.js | head -n 3 | ggrep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?");
+    VERSION=$(head -n 3 src/static/js/jquery.js | ggrep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?")
   else
-    VERSION=$(cat src/static/js/jquery.js | head -n 3 | grep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?");
+    VERSION=$(head -n 3 src/static/js/jquery.js | grep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?")
   fi
 
   if [ ${VERSION#v} = $NEEDED_VERSION ]; then
@@ -106,7 +113,7 @@ do
   if [ ! -f "src/static/custom/$f.js" ]; then
     cp "src/static/custom/js.template" "src/static/custom/$f.js" || exit 1
   fi
-  
+
   if [ ! -f "src/static/custom/$f.css" ]; then
     cp "src/static/custom/css.template" "src/static/custom/$f.css" || exit 1
   fi

doc/api/hooks_server-side.md

@@ -247,6 +247,30 @@ Things in context:
 
 This hook will allow a plug-in developer to re-write each line when exporting to HTML.
 
+Example:
+```
+var Changeset = require("ep_etherpad-lite/static/js/Changeset");
+
+exports.getLineHTMLForExport = function (hook, context) {
+  var header = _analyzeLine(context.attribLine, context.apool);
+  if (header) {
+    return "<" + header + ">" + context.lineContents + "</" + header + ">";
+  }
+}
+
+function _analyzeLine(alineAttrs, apool) {
+  var header = null;
+  if (alineAttrs) {
+    var opIter = Changeset.opIterator(alineAttrs);
+    if (opIter.hasNext()) {
+      var op = opIter.next();
+      header = Changeset.opAttributeValue(op, 'heading', apool);
+    }
+  }
+  return header;
+}
+```
+
 ## stylesForExport
 Called from: src/node/utils/ExportHtml.js
 
@@ -314,7 +338,7 @@ exports.exportHtmlAdditionalTags = function(hook, pad, cb){
   var padId = pad.id;
   cb(["massive","jugs"]);
 };
-
+```
 
 ## userLeave
 Called from src/node/handler/PadMessageHandler.js

src/etherpad_icon.svg

@@ -3,22 +3,23 @@
 		"authors": [
 			"Ali1",
 			"Tux-tn",
-			"Alami"
+			"Alami",
+			"Meno25"
 		]
 	},
 	"index.newPad": "باد جديد",
 	"index.createOpenPad": "أو صنع/فتح باد بوضع إسمه:",
 	"pad.toolbar.bold.title": "سميك (Ctrl-B)",
 	"pad.toolbar.italic.title": "مائل (Ctrl-I)",
 	"pad.toolbar.underline.title": "تسطير (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "شطب",
-	"pad.toolbar.ol.title": "قائمة مرتبة",
-	"pad.toolbar.ul.title": "قائمة غير مرتبة",
+	"pad.toolbar.strikethrough.title": "شطب (Ctrl+5)",
+	"pad.toolbar.ol.title": "قائمة مرتبة (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "قائمة غير مرتبة (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "إزاحة",
 	"pad.toolbar.unindent.title": "حذف الإزاحة",
 	"pad.toolbar.undo.title": "فك (Ctrl-Z)",
 	"pad.toolbar.redo.title": "تكرار (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "مسح ألوان التأليف",
+	"pad.toolbar.clearAuthorship.title": "مسح ألوان التأليف (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "استيراد/تصدير من/إلى تنسيقات ملفات مختلفة",
 	"pad.toolbar.timeslider.title": "متصفح التاريخ",
 	"pad.toolbar.savedRevision.title": "حفظ المراجعة",
@@ -46,6 +47,7 @@
 	"pad.importExport.import": "تحميل أي ملف نصي أو وثيقة",
 	"pad.importExport.importSuccessful": "ناجح!",
 	"pad.importExport.export": "تصدير الباد الحالي بصفة:",
+	"pad.importExport.exportetherpad": "إيثرباد",
 	"pad.importExport.exporthtml": "إتش تي إم إل",
 	"pad.importExport.exportplain": "نص عادي",
 	"pad.importExport.exportword": "مايكروسوفت وورد",