From 9c2da10d790297ac5eb47d81a84869a047ed838e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 25 Apr 2017 11:01:19 +0200
Subject: [PATCH 1/2] bump version to 1.5.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 48aed5d0d..ed76592b6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "dependencies": {
     "express": "~4.10.1",
     "ws": "^1.0.1",

From a840fb9e85095c54bfab2b92b1050d9d267c1b5d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 25 Apr 2017 14:33:53 +0200
Subject: [PATCH 2/2] add example hashes and start working on hash v2

---
 www/common/common-hash.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index 034ee5bbb..40fe6bc7b 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -117,6 +117,9 @@ define([
                             throw new Error("The channel key is invalid");
                         }
                     }
+                } else if (version === "2") {
+                    // version 2 hashes are to be used for encrypted blobs
+                    // TODO
                 }
             }
         }
@@ -150,6 +153,15 @@ define([
         return '/1/edit/' + [channelId, key].join('/');
     };
 
+/*
+Version 0
+    /pad/#67b8385b07352be53e40746d2be6ccd7XAYSuJYYqa9NfmInyHci7LNy
+Version 1
+    /code/#/1/edit/3Ujt4F2Sjnjbis6CoYWpoQ/usn4+9CqVja8Q7RZOGTfRgqI
+Version 2
+    /file/<fileId>/#/2/<cryptKey>/<contentType>
+    /file/<fileId>/#/2/ajExFODrFH4lVBwxxsrOKw/pdf
+*/
     var parseHash = Hash.parseHash = function (hash) {
         var parsed = {};
         if (hash.slice(0,1) !== '/' && hash.length >= 56) {