Merge pull request #1 from ether/develop

Update to most recent etherpad-lite version

README.md

@@ -4,7 +4,7 @@
 # About
 Etherpad is a really-real time collaborative editor maintained by the Etherpad Community.
 
-Etherpad is written in JavaScript(99.9%) on both the server and client so it's easy for developers to maintain and add new features. Because of this Etherpad has tons of customizations that you can leverage.
+Etherpad is written in JavaScript (99.9%) on both the server and client so it's easy for developers to maintain and add new features. Because of this Etherpad has tons of customizations that you can leverage.
 
 Etherpad is designed to be easily embeddable and provides a [HTTP API](https://github.com/ether/etherpad-lite/wiki/HTTP-API)
 that allows your web application to manage pads, users and groups. It is recommended to use the [available client implementations](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) in order to interact with this API. 

bin/installDeps.sh

@@ -46,13 +46,14 @@ fi
 #check node version
 NODE_VERSION=$(node --version)
 NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2)
+NODE_V_MAIN=$(echo $NODE_VERSION | cut -d "." -f 1)
 #iojs version checking added
 if hash iojs 2>/dev/null; then
  IOJS_VERSION=$(iojs --version)
 fi
-if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ]; then
+if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ] && [ ! $NODE_V_MAIN = "v4" ] && [ ! $NODE_V_MAIN = "v5" ]; then
  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.10.x, v0.11.x or v0.12.x" >&2
+ echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need node v0.10.x or higher" >&2
  exit 1
  fi
 fi

bin/installOnWindows.bat

@@ -6,11 +6,6 @@ cd /D "%~dp0\.."
 :: Is node installed?
 cmd /C node -e "" || ( echo "Please install node.js ( http://nodejs.org )" && exit /B 1 )
 
-echo _
-echo Checking node version...
-set check_version="if(['10','11','12'].indexOf(process.version.split('.')[1]) === -1 && process.version.split('.')[0] !== '1') { console.log('You are running a wrong version of Node. Etherpad requires v0.10+'); process.exit(1) }"
-cmd /C node -e %check_version% || exit /B 1
-
 echo _
 echo Ensure that all dependencies are up to date... If this is the first time you have run Etherpad please be patient.
 cmd /C npm install src/ --loglevel warn || exit /B 1

bin/rebuildPad.js

@@ -79,6 +79,9 @@ async.series([
  newPad.pool.numToAttrib = oldPad.pool.numToAttrib;
  for(var curRevNum = 0; curRevNum <= newRevHead; curRevNum++) {
  db.db.get("pad:" + padId + ":revs:" + curRevNum, function(err, rev) {
+ if (rev.meta) {
+ throw "The specified revision number could not be found.";
+ }
  var newRevNum = ++newPad.head;
  var newRevId = "pad:" + newPad.id + ":revs:" + newRevNum;
  db.db.set(newRevId, rev);

doc/api/hooks_client-side.md

@@ -339,3 +339,14 @@ Things in context:
 
 This hook is provided to allow author highlight style to be modified.
 Registered hooks should return 1 if the plugin handles highlighting. If no plugin returns 1, the core will use the default background-based highlighting.
+
+## aceSelectionChanged
+Called from: src/static/js/ace2_inner.js
+
+Things in context:
+
+1. rep - information about where the user's cursor is
+2. documentAttributeManager - information about attributes in the document
+
+This hook allows a plugin to react to a cursor or selection change,
+perhaps to update a UI element based on the style at the cursor location.

doc/api/hooks_server-side.md

@@ -81,7 +81,7 @@ Available blocks in `pad.html` are:
  * `modals` - Contains all connectivity messages
  * `embedPopup` - the embed dropdown
  * `scripts` - Add your script tags here, if you really have to (consider use client-side hooks instead)
- 
+
 `timeslider.html` blocks:
 
  * `timesliderStyles`
@@ -90,9 +90,9 @@ Available blocks in `pad.html` are:
  * `timesliderTop`
  * `timesliderEditbarRight`
  * `modals`
- 
+
  `index.html` blocks:
- 
+
  * `indexWrapper` - contains the form for creating new pads
 
 ## padInitToolbar
@@ -334,7 +334,7 @@ exports.aceAttribClasses = function(hook_name, attr, cb){
 ```
 
 ## exportFileName
-Called from src/node/handler/ExportHandler.js 
+Called from src/node/handler/ExportHandler.js
 
 Things in context:
 
@@ -357,7 +357,7 @@ Things in context:
 
 1. Pad object
 
-This hook will allow a plug-in developer to include more properties and attributes to support during HTML Export. An Array should be returned.
+This hook will allow a plug-in developer to include more properties and attributes to support during HTML Export. If tags are stored as `['color', 'red']` on the attribute pool, use `exportHtmlAdditionalTagsWithData` instead. An Array should be returned.
 
 Example:
 ```
@@ -368,6 +368,24 @@ exports.exportHtmlAdditionalTags = function(hook, pad, cb){
 };
 ```
 
+## exportHtmlAdditionalTagsWithData
+Called from src/node/utils/ExportHtml.js
+
+Things in context:
+
+1. Pad object
+
+Identical to `exportHtmlAdditionalTags`, but for tags that are stored with an specific value (not simply `true`) on the attribute pool. For example `['color', 'red']`, instead of `['bold', true]`. This hook will allow a plug-in developer to include more properties and attributes to support during HTML Export. An Array of arrays should be returned. The exported HTML will contain tags like `<span data-color="red">` for the content where attributes are `['color', 'red']`.
+
+Example:
+```
+// Add the props to be supported in export
+exports.exportHtmlAdditionalTagsWithData = function(hook, pad, cb){
+ var padId = pad.id;
+ cb([["color", "red"], ["color", "blue"]]);
+};
+```
+
 ## userLeave
 Called from src/node/handler/PadMessageHandler.js
 
@@ -384,3 +402,20 @@ exports.userLeave = function(hook, session, callback) {
  console.log('%s left pad %s', session.author, session.padId);
 };
 ```
+
+### clientReady
+Called from src/node/handler/PadMessageHandler.js
+
+This in context:
+
+1. message
+
+This hook gets called when handling a CLIENT_READY which is the first message from the client to the server.
+
+Example:
+
+```
+exports.clientReady = function(hook, message) {
+ console.log('Client has entered the pad' + message.padId);
+};
+```

settings.json.template

@@ -86,10 +86,14 @@
  may cause problems during deployment. Set to 0 to disable caching */
  "maxAge" : 21600, // 60 * 60 * 6 = 6 hours
 
- /* This is the path to the Abiword executable. Setting it to null, disables abiword.
+ /* This is the absolute path to the Abiword executable. Setting it to null, disables abiword.
  Abiword is needed to advanced import/export features of pads*/
  "abiword" : null,
 
+ /* This is the absolute path to the soffice executable. Setting it to null, disables LibreOffice exporting.
+ LibreOffice can be used in lieu of Abiword to export pads */
+ "soffice" : null,
+
  /* This is the path to the Tidy executable. Setting it to null, disables Tidy.
  Tidy is used to improve the quality of exported pads*/
  "tidyHtml" : null,
@@ -131,6 +135,11 @@
  // Allow Load Testing tools to hit the Etherpad Instance. Warning this will disable security on the instance.
  "loadTest": false,
 
+ // Disable indentation on new line when previous line ends with some special chars (':', '[', '(', '{')
+ /*
+ "indentationOnNewLine": false,
+ */
+
  /* The toolbar buttons configuration.
  "toolbar": {
  "left": [

src/locales/ar.json

@@ -6,7 +6,8 @@
  "Alami",
  "Meno25",
  "Test Create account",
- "محمد أحمد عبد الفتاح"
+ "محمد أحمد عبد الفتاح",
+ "Haytham morsy"
  ]
  },
  "index.newPad": "باد جديد",
@@ -97,6 +98,9 @@
  "timeslider.exportCurrent": "تصدير النسخة الحالية ك:",
  "timeslider.version": "إصدار {{version}}",
  "timeslider.saved": "محفوظ {{month}} {{day}}, {{year}}",
+ "timeslider.playPause": "تشغيل / إيقاف مؤقت محتويات الباد",
+ "timeslider.backRevision": "عد إلى مراجعة في هذه الباد",
+ "timeslider.forwardRevision": "انطلق إلى مراجعة في هذه الباد",
  "timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
  "timeslider.month.january": "يناير",
  "timeslider.month.february": "فبراير",

src/locales/es.json

@@ -132,7 +132,7 @@
  "pad.impexp.confirmimport": "Al importar un archivo se borrará el contenido actual del pad. ¿Estás seguro de que quieres continuar?",
  "pad.impexp.convertFailed": "No pudimos importar este archivo. Inténtalo con un formato diferente o copia y pega manualmente.",
  "pad.impexp.padHasData": "No hemos podido importar este archivo porque este pad ya ha tenido cambios. Importa a un nuevo pad.",
- "pad.impexp.uploadFailed": "El envío falló. Intentalo de nuevo.",
+ "pad.impexp.uploadFailed": "El envío falló. Inténtalo de nuevo.",
  "pad.impexp.importfailed": "Fallo al importar",
  "pad.impexp.copypaste": "Intenta copiar y pegar",
  "pad.impexp.exportdisabled": "La exportación al formato {{type}} está desactivada. Contacta a tu administrador de sistemas."

src/locales/olo.json

@@ -2,7 +2,8 @@
  "@metadata": {
  "authors": [
  "Denö",
- "Mashoi7"
+ "Mashoi7",
+ "Ilja.mos"
  ]
  },
  "pad.toolbar.underline.title": "Alleviivua (Ctrl+U)",
@@ -36,7 +37,7 @@
  "timeslider.month.january": "pakkaskuudu",
  "timeslider.month.february": "tuhukuudu",
  "timeslider.month.march": "kevätkuudu",
- "timeslider.month.april": "kevätkuudu",
+ "timeslider.month.april": "sulakuudu",
  "timeslider.month.may": "oraskuudu",
  "timeslider.month.june": "kezäkuudu",
  "timeslider.month.july": "heinykuudu",

src/locales/pa.json

@@ -2,37 +2,40 @@
  "@metadata": {
  "authors": [
  "Aalam",
- "Babanwalia"
+ "Babanwalia",
+ "ਪ੍ਰਚਾਰਕ"
  ]
  },
  "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.strikethrough.title": "ਵਿੰਨ੍ਹੋ (Ctrl+5)",
+ "pad.toolbar.ol.title": "ਲੜੀਵਾਰ ਸੂਚੀ",
  "pad.toolbar.ul.title": "ਬਿਨ-ਲੜੀਬੱਧ ਸੂਚੀ",
  "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": "ਰੀਵਿਜ਼ਨ ਸੰਭਾਲੋ",
  "pad.toolbar.settings.title": "ਸੈਟਿੰਗ",
  "pad.toolbar.embed.title": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਤੇ ਇੰਬੈੱਡ ਕਰੋ",
  "pad.toolbar.showusers.title": "ਇਹ ਪੈਡ ਉੱਤੇ ਯੂਜ਼ਰ ਵੇਖਾਓ",
- "pad.colorpicker.save": "ਸਾਂਭੋ",
+ "pad.colorpicker.save": "ਸੰਭਾਲੋ",
  "pad.colorpicker.cancel": "ਰੱਦ ਕਰੋ",
  "pad.loading": "…ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+ "pad.noCookie": "ਕੂਕੀਜ਼ ਨਹੀਂ ਲੱਭੀਅਾਂ। ਕਿਰਪਾ ਕਰਕੇ ਬ੍ਰਾੳੂਜ਼ਰ ਵਿੱਚ ਕੂਕੀਜ਼ ਲਾਗੂ ਕਰੋ।",
  "pad.passwordRequired": "ਇਹ ਪੈਡ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ",
  "pad.permissionDenied": "ਇਹ ਪੈਡ ਵਰਤਨ ਲਈ ਤੁਹਾਨੂੰ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ",
  "pad.wrongPassword": "ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਗਲਤੀ ਸੀ",
  "pad.settings.padSettings": "ਪੈਡ ਸੈਟਿੰਗ",
  "pad.settings.myView": "ਮੇਰੀ ਝਲਕ",
  "pad.settings.stickychat": "ਹਮੇਸ਼ਾ ਸਕਰੀਨ ਉੱਤੇ ਗੱਲ ਕਰੋ",
+ "pad.settings.chatandusers": "ਗੱਲ-ਬਾਤ ਅਤੇ ਵਰਤੋਂਕਾਰ ਦਿਖਾਵੋ",
  "pad.settings.colorcheck": "ਲੇਖਕੀ ਰੰਗ",
  "pad.settings.linenocheck": "ਲਾਈਨ ਨੰਬਰ",
  "pad.settings.rtlcheck": "ਸਮੱਗਰੀ ਸੱਜੇ ਤੋਂ ਖੱਬੇ ਪੜ੍ਹਨੀ ਹੈ?",
@@ -45,10 +48,11 @@
  "pad.importExport.import": "ਕੋਈ ਵੀ ਟੈਕਸਟ ਫਾਇਲ ਜਾਂ ਦਸਤਾਵੇਜ਼ ਅੱਪਲੋਡ ਕਰੋ",
  "pad.importExport.importSuccessful": "ਸਫ਼ਲ!",
  "pad.importExport.export": "ਮੌਜੂਦਾ ਪੈਡ ਨੂੰ ਐਕਸਪੋਰਟ ਕਰੋ:",
+ "pad.importExport.exportetherpad": "ੲੈਥਰਪੈਡ",
  "pad.importExport.exporthtml": "HTML",
  "pad.importExport.exportplain": "ਸਧਾਰਨ ਟੈਕਸਟ",
  "pad.importExport.exportword": "ਮਾਈਕਰੋਸਾਫਟ ਵਰਡ",
- "pad.importExport.exportpdf": "ਪੀਡੀਐਫ",
+ "pad.importExport.exportpdf": "PDF",
  "pad.importExport.exportopen": "ODF (ਓਪਨ ਡੌਕੂਮੈਂਟ ਫਾਰਮੈਟ)",
  "pad.importExport.abiword.innerHTML": "ਤੁਸੀਂ ਸਿਰਫ਼ ਸਾਦੀਆਂ ਲਿਖਤੀ ਜਾਂ ਐੱਚ.ਟੀ.ਐੱਮ.ਐੱਲ. ਰੂਪ-ਰੇਖਾਵਾਂ ਤੋਂ ਦਰਾਮਦ ਕਰ ਸਕਦੇ ਹੋ। ਹੋਰ ਉੱਨਤ ਦਰਾਮਦੀ ਗੁਣਾਂ ਵਾਸਤੇ ਮਿਹਰਬਾਨੀ ਕਰਕੇ <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">ਐਬੀਵਰਡ ਥਾਪੋ</a>।",
  "pad.modals.connected": "ਕੁਨੈਕਟ ਹੈ।",
@@ -88,8 +92,11 @@
  "timeslider.toolbar.authorsList": "ਕੋਈ ਲੇਖਕ ਨਹੀਂ",
  "timeslider.toolbar.exportlink.title": "ਐਕਸਪੋਰਟ",
  "timeslider.exportCurrent": "ਮੌਜੂਦਾ ਵਰਜਨ ਇੰਝ ਐਕਸਪੋਰਟ ਕਰੋ:",
- "timeslider.version": "ਵਰਜਨ {{version}}",
+ "timeslider.version": "ਵਰਜ਼ਨ {{version}}",
  "timeslider.saved": "{{day}} {{month}} {{year}} ਨੂੰ ਸੰਭਾਲਿਆ",
+ "timeslider.playPause": "ਪੈਡ ਸਮੱਗਰੀ ਚਲਾਓ / ਵਿਰਾਮ ਕਰੋ",
+ "timeslider.backRevision": "ਇਸ ਪੈਡ ਵਿੱਚ ਪਿਛਲੇ ਰੀਵਿਜ਼ਨ ਤੇ ਜਾਓ",
+ "timeslider.forwardRevision": "ਇਸ ਪੈਡ ਵਿੱਚ ਅਗਲੇ ਰੀਵਿਜ਼ਨ ਤੇ ਜਾਓ",
  "timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
  "timeslider.month.january": "ਜਨਵਰੀ",
  "timeslider.month.february": "ਫ਼ਰਵਰੀ",
@@ -118,5 +125,5 @@
  "pad.impexp.uploadFailed": "ਅੱਪਲੋਡ ਲਈ ਫੇਲ੍ਹ ਹੈ, ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।",
  "pad.impexp.importfailed": "ਇੰਪੋਰਟ ਫੇਲ੍ਹ ਹੈ",
  "pad.impexp.copypaste": "ਕਾਪੀ ਕਰੋ ਚੇਪੋ ਜੀ",
- "pad.impexp.exportdisabled": "{{type}} ਰੂਪ-ਰੇਖਾ ਵਜੋਂ ਬਰਾਮਦ ਕਰਨਾ ਬੰਦ ਹੈ। ਵੇਰਵੇ ਵਾਸਤੇ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪ੍ਰਬੰਧਕ ਨਾਲ਼ ਰਾਬਤਾ ਬਣਾਉ।"
+ "pad.impexp.exportdisabled": "{{type}} ਫਾਰਮੈਟ ਵਜੋਂ ਬਰਾਮਦ ਕਰਨਾ ਬੰਦ ਹੈ। ਵੇਰਵੇ ਵਾਸਤੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪਰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 }

src/locales/ro.json

@@ -4,7 +4,8 @@
  "Hedwig",
  "ImGelu",
  "Minisarm",
- "Strainu"
+ "Strainu",
+ "Wintereu"
  ]
  },
  "index.newPad": "Pad nou",
@@ -21,6 +22,7 @@
  "pad.toolbar.import_export.title": "Importă/Exportă din/în diferite formate",
  "pad.toolbar.savedRevision.title": "Salvează revizia",
  "pad.toolbar.settings.title": "Setări",
+ "pad.toolbar.showusers.title": "Arată utilizatorii de pe acest pad",
  "pad.colorpicker.save": "Salvează",
  "pad.colorpicker.cancel": "Anulează",
  "pad.loading": "Se încarcă...",
@@ -46,10 +48,10 @@
  "pad.importExport.exportpdf": "PDF",
  "pad.importExport.exportopen": "ODF (Open Document Format)",
  "pad.modals.connected": "Conectat.",
- "pad.modals.reconnecting": "Se reconectează la pad-ul tău..",
+ "pad.modals.reconnecting": "Se reconectează la pad-ul dumneavoastră..",
  "pad.modals.forcereconnect": "Forțează reconectarea",
  "pad.modals.userdup": "Deschis în altă fereastră",
- "pad.modals.userdup.advice": "Reconectează pentru a folosi această fereastră în schimb",
+ "pad.modals.userdup.advice": "Reconectați-vă dacă doriți să utilizați această fereastră.",
  "pad.modals.unauth": "Nu ești autorizat",
  "pad.modals.initsocketfail": "Serverul nu este disponibil.",
  "pad.modals.initsocketfail.explanation": "Nu s-a putut conecta la serverul de sincronizare.",
@@ -61,12 +63,12 @@
  "pad.share": "Distribuie acest pad",
  "pad.share.readonly": "Doar în citire",
  "pad.share.link": "Legătură",
- "pad.share.emebdcode": "Încorporează URL-ul",
+ "pad.share.emebdcode": "Adresa URL încorporată",
  "pad.chat": "Chat",
  "pad.chat.title": "Deschide chat-ul pentru acest pad.",
  "pad.chat.loadmessages": "Încarcă mai multe mesaje",
  "timeslider.toolbar.returnbutton": "Înapoi la pad",
- "timeslider.toolbar.authors": "Aurori:",
+ "timeslider.toolbar.authors": "Autori:",
  "timeslider.toolbar.authorsList": "Niciun autor",
  "timeslider.toolbar.exportlink.title": "Exportă",
  "timeslider.exportCurrent": "Exportă versiunea curentă ca:",
@@ -85,7 +87,7 @@
  "timeslider.month.october": "octombrie",
  "timeslider.month.november": "noiembrie",
  "timeslider.month.december": "decembrie",
- "pad.userlist.entername": "Introdu numele tău",
+ "pad.userlist.entername": "Introduceți numele dumneavoastră",
  "pad.userlist.unnamed": "fără nume",
  "pad.userlist.guest": "Oaspete",
  "pad.userlist.deny": "Respinge",