v0.13.5-cryptowarning.2

Prepare changelog for v0.13.5-cryptowarning.2
2018-03-26 15:48:45 +01:00 · 2018-03-26 15:48:45 +01:00 · 2018-03-26 15:47:39 +01:00 · 2018-03-26 15:44:45 +01:00 · 2018-03-26 14:30:41 +01:00 · 2018-03-26 14:30:41 +01:00
3 changed files with 16 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,15 @@
+Changes in [0.13.5-cryptowarning.2](https://github.com/vector-im/riot-web/releases/tag/v0.13.5-cryptowarning.2) (2018-03-26)
+============================================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.5-cryptowarning.1...v0.13.5-cryptowarning.2)
+
+ * Fix strings file
+
+Changes in [0.13.5-cryptowarning.1](https://github.com/vector-im/riot-web/releases/tag/v0.13.5-cryptowarning.1) (2018-03-26)
+============================================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.5...v0.13.5-cryptowarning.1)
+
+ * Disable e2e crypto with a big warning if the database schema is newer than we expect.
+
 Changes in [0.13.5](https://github.com/vector-im/riot-web/releases/tag/v0.13.5) (2018-02-09)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.4...v0.13.5)
--- a/electron_app/package.json
+++ b/electron_app/package.json
@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "src/electron-main.js",
-  "version": "0.13.5",
+  "version": "0.13.5-cryptowarning.2",
  "description": "A feature-rich client for Matrix.org",
  "author": "Vector Creations Ltd.",
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron_app/src/electron-main.js",
-  "version": "0.13.5",
+  "version": "0.13.5-cryptowarning.2",
  "description": "A feature-rich client for Matrix.org",
  "author": "Vector Creations Ltd.",
  "repository": {
@ -68,8 +68,8 @@
    "gfm.css": "^1.1.1",
    "highlight.js": "^9.0.0",
    "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.9.2",
-    "matrix-react-sdk": "0.11.4",
+    "matrix-js-sdk": "0.9.2-cryptowraning.1",
+    "matrix-react-sdk": "0.11.4-cryptowarning.2",
    "modernizr": "^3.1.0",
    "pako": "^1.0.5",
    "prop-types": "^15.5.10",
Author	SHA1	Message	Date
David Baker	fc5a43814e	v0.13.5-cryptowarning.2	2018-03-26 15:48:45 +01:00
David Baker	6e3c7937ee	Prepare changelog for v0.13.5-cryptowarning.2	2018-03-26 15:48:45 +01:00
David Baker	1c214b3791	v0.13.5-cryptowarning.2	2018-03-26 15:47:39 +01:00
David Baker	9e4ca9353f	Bump react-sdk version	2018-03-26 15:44:45 +01:00
David Baker	ac39a2bc40	v0.13.5-cryptowarning.1	2018-03-26 14:30:41 +01:00
David Baker	231b9e91a7	Prepare changelog for v0.13.5-cryptowarning.1	2018-03-26 14:30:41 +01:00
David Baker	c33a22e71b	v0.13.5-cryptowarning.1	2018-03-26 14:28:28 +01:00
David Baker	0701d9a204	Bump react-sdk & js-sdk versions	2018-03-26 14:25:22 +01:00