summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2013-01-18 13:29:43 +0000
committerJohn McLear <john@mclear.co.uk>2013-01-18 13:29:43 +0000
commit292db5fc44d30ca25463522156e91ea771638464 (patch)
tree49f6248f0c973ddc6a2a96d11bd33ccbac7259fb
parent344e8be32829a06c80b0479323fecd957e95e17b (diff)
downloadetherpad-lite-292db5fc44d30ca25463522156e91ea771638464.zip
prepare for release
-rw-r--r--CHANGELOG.md11
-rw-r--r--src/package.json4
2 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80a6148f..7e471f00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 1.2.5
+ * Create timeslider EEJS blocks for plugins
+ * Allow for "more messages" to be loaded in chat
+ * Introduce better logging
+ * API endpoint for "listAllPads"
+ * Fix: Stop highlight of timeslider when dragging mouse
+ * Fix: Time Delta on Timeslider make date update properly
+ * Fix: Prevent empty chat messages from being sent
+ * Fix: checkPad script
+ * Fix: IE onLoad listener for i18n
+
# 1.2.4
* Fix IE console issue created in 1.2.3
* Allow CI Tests to pass by ignoring timeslider test
diff --git a/src/package.json b/src/package.json
index 826db97b..81e6ff16 100644
--- a/src/package.json
+++ b/src/package.json
@@ -16,7 +16,7 @@
"require-kernel" : "1.0.5",
"resolve" : "0.2.x",
"socket.io" : "0.9.x",
- "ueberDB" : "0.1.8",
+ "ueberDB" : "0.1.x",
"async" : "0.1.x",
"express" : "3.x",
"connect" : "2.4.x",
@@ -46,5 +46,5 @@
"engines" : { "node" : ">=0.6.0",
"npm" : ">=1.0"
},
- "version" : "1.2.4"
+ "version" : "1.2.5"
}