Merge pull request #2424 from ether/release/1.5.0

Release/1.5.0

Author: JohnMcLear

CHANGELOG.md

@@ -1,3 +1,34 @@
+# 1.5.0
+ * NEW: Lots of performance improvements for page load times
+ * NEW: Hook for adding CSS to Exports
+ * NEW: Allow shardable socket io
+ * NEW: Allow UI to show when attr/prop is applied (CSS)
+ * NEW: Various scripts
+ * NEW: Export full fidelity pads (including authors etc.)
+ * NEW: Various front end tests
+ * NEW: Backend tests
+ * NEW: switchPad hook to instantly switch between pads
+ * NEW: Various translations
+ * NEW: Icon sets instead of images to provide quality high DPI experience
+ * Fix: HTML Import blocking / hanging server
+ * Fix: Export Bullet / Numbered lists HTML
+ * Fix: Swagger deprecated warning
+ * Fix: Bad session from crashing server
+ * Fix: Allow relative settings path
+ * Fix: Stop attributes being improperly assigned between 2 lines
+ * Fix: Copy / Move Pad API race condition
+ * Fix: Save all user preferences
+ * Fix: Upgrade majority of dependency inc upgrade to SocketIO1+
+ * Fix: Provide UI button to restore maximized chat window
+ * Fix: Timeslider UI Fix
+ * Fix: Remove Dokuwiki
+ * Fix: Remove long paths from windows build (stops error during extract)
+ * Fix: Various globals remvoed
+ * Fix: Move all scripts into bin/
+ * Fix: Various CSS bugfixes for Mobile devices
+ * Fix: Overflow Toolbar
+ * Fix: Line Attribute management
+
 # 1.4.1
  * NEW: Translations
  * NEW: userLeave Hook

Makefile

@@ -14,7 +14,7 @@ out/doc/assets/%: doc/assets/%
 
 out/doc/%.html: doc/%.md
 	mkdir -p $(@D)
-	node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
+	node bin/doc/generate.js --format=html --template=doc/template.html $< > $@
 ifeq ($(UNAME),Darwin)
 	sed -i '' 's/__VERSION__/${VERSION}/' $@
 else

README.md

@@ -11,7 +11,7 @@ that allows your web application to manage pads, users and groups. It is recomme
 
 There is also a [jQuery plugin](https://github.com/ether/etherpad-lite-jquery-plugin) that helps you to embed Pads into your website.
 
-There's also a full-featured plugin framework, allowing you to easily add your own features.  By default your Etherpad is rather sparce and because Etherpad takes a lot of it's inspiration from Wordpress plugins are really easy to install and update.  Once you have Etherpad installed you should visit the plugin page and take control.
+There's also a full-featured plugin framework, allowing you to easily add your own features.  By default your Etherpad is rather sparse and because Etherpad takes a lot of it's inspiration from Wordpress plugins are really easy to install and update.  Once you have Etherpad installed you should visit the plugin page and take control.
 
 Finally, Etherpad comes with translations into most languages!  Users are automatically delivered the correct language for their local settings.
 
@@ -50,9 +50,9 @@ Update to the latest version with `git pull origin`, then run `bin\installOnWind
 
 ## GNU/Linux and other UNIX-like systems
 You'll need gzip, git, curl, libssl develop libraries, python and gcc.  
-*For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential`  
-*For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"`
-*For FreeBSD*: `portinstall node, npm, git (optional)`
+- *For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential`  
+- *For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"`
+- *For FreeBSD*: `portinstall node, npm, git (optional)`
 
 Additionally, you'll need [node.js](http://nodejs.org) installed, Ideally the latest stable version, we recommend installing/compiling nodejs from source (avoiding apt).
 
@@ -74,6 +74,10 @@ You can initially modify the settings in `settings.json`. (If you need to handle
 
 You should use a dedicated database such as "mysql", if you are planning on using etherpad-in a production environment, since the "dirtyDB" database driver is only for testing and/or development purposes.
 
+## Plugins and themes
+
+Etherpad is very customizable through plugins. Instructions for installing themes and plugins can be found in [the plugin wiki article](https://github.com/ether/etherpad-lite/wiki/Available-Plugins).
+
 ## Helpful resources
 The [wiki](https://github.com/ether/etherpad-lite/wiki) is your one-stop resource for Tutorials and How-to's, really check it out! Also, feel free to improve these wiki pages.
 

bin/backendTests.sh

@@ -0,0 +1 @@
+src/node_modules/mocha/bin/mocha --timeout 5000 --reporter nyan tests/backend/specs/api

bin/buildForWindows.sh

@@ -58,6 +58,8 @@ rm -rf .git/objects
 echo "remove windows jsdom-nocontextify/test folder"
 rm -rf /tmp/etherpad-lite-win/node_modules/ep_etherpad-lite/node_modules/jsdom-nocontextifiy/test/
 rm -rf /tmp/etherpad-lite-win/src/node_modules/jsdom-nocontextifiy/test/
+rm -rf /tmp/etherpad-lite-win/src/node_modules/wd/node_modules/request/node_modules/form-data/node_modules/combined-stream/test
+rm -rf /tmp/etherpad-lite-win/src/node_modules/nodemailer/node_modules/mailcomposer/node_modules/mimelib/node_modules/encoding/node_modules/iconv-lite/encodings/tables
 
 echo "create the zip..."
 cd /tmp

bin/dirty-db-cleaner.py

@@ -0,0 +1,45 @@
+#!/usr/bin/python -u
+#
+# Created by Bjarni R. Einarsson, placed in the public domain. Go wild!
+#
+import json
+import os
+import sys
+
+try:
+    dirtydb_input = sys.argv[1]
+    dirtydb_output = '%s.new' % dirtydb_input
+    assert(os.path.exists(dirtydb_input))
+    assert(not os.path.exists(dirtydb_output))
+except:
+    print 
+    print 'Usage: %s /path/to/dirty.db' % sys.argv[0]
+    print 
+    print 'Note: Will create a file named dirty.db.new in the same folder,'
+    print '      please make sure permissions are OK and a file by that'
+    print '      name does not exist already. This script works by omitting'
+    print '      duplicate lines from the dirty.db file, keeping only the'
+    print '      last (latest) instance. No revision data should be lost,'
+    print '      but be careful, make backups. If it breaks you get to keep'
+    print '      both pieces!'
+    print
+    sys.exit(1)
+
+dirtydb = {}
+lines = 0
+with open(dirtydb_input, 'r') as fd:
+    print 'Reading %s' % dirtydb_input
+    for line in fd:
+        lines += 1
+        data = json.loads(line)
+        dirtydb[data['key']] = line
+        if lines % 10000 == 0:
+            sys.stderr.write('.')
+print
+print 'OK, found %d unique keys in %d lines' % (len(dirtydb), lines)
+
+with open(dirtydb_output, 'w') as fd:
+    for data in dirtydb.values():
+        fd.write(data)
+
+print 'Wrote data to %s. All done!' % dirtydb_output