From cf9f91b0b4abe2020c544981d6dc2e2e85f4b4bd Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Sun, 22 Mar 2015 14:33:42 +0100
Subject: web: upgrade to react 0.13

---
 web/package.json | 100 +++++++++++++++++++++++++++----------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

(limited to 'web/package.json')

diff --git a/web/package.json b/web/package.json
index 14a31f48..5b15f695 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,52 +1,52 @@
 {
-    "name": "mitmproxy",
-    "private": true,
-    "scripts": {
-        "test": "jest ./src/js"
-    },
-    "jest": {
-        "testPathDirs": [
-            "./src/js"
-        ],
-        "testPathIgnorePatterns": [
-            "/node_modules/",
-            "testutils.js"
-        ],
-        "testDirectoryName": "tests"
-    },
-    "dependencies": {
-        "jquery": "",
-        "lodash": "",
-        "react": "0.12.x",
-        "react-router": "",
-        "bootstrap": "",
-        "flux": ""
-    },
-    "devDependencies": {
-        "browserify": "=8.0.1",
-        "gulp": "",
-        "gulp-concat": "",
-        "gulp-connect": "",
-        "gulp-jshint": "",
-        "gulp-less": "",
-        "gulp-livereload": "",
-        "gulp-minify-css": "",
-        "gulp-notify": "",
-        "gulp-peg": "",
-        "gulp-plumber": "",
-        "gulp-react": "",
-        "gulp-rename": "",
-        "gulp-replace": "",
-        "gulp-rev": "",
-        "gulp-sourcemaps": "",
-        "gulp-uglify": "",
-        "jest-cli": "^0.1.18",
-        "jshint-stylish": "",
-        "lodash": "",
-        "map-stream": "",
-        "reactify": "",
-        "vinyl-buffer": "",
-        "vinyl-source-stream": "",
-        "vinyl-transform": ""
-    }
+  "name": "mitmproxy",
+  "private": true,
+  "scripts": {
+    "test": "jest ./src/js"
+  },
+  "jest": {
+    "testPathDirs": [
+      "./src/js"
+    ],
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "testutils.js"
+    ],
+    "testDirectoryName": "tests"
+  },
+  "dependencies": {
+    "bootstrap": "^3.3.4",
+    "flux": "",
+    "jquery": "",
+    "lodash": "",
+    "react": "^0.13.1",
+    "react-router": "^0.13.1"
+  },
+  "devDependencies": {
+    "browserify": "=8.0.1",
+    "gulp": "",
+    "gulp-concat": "",
+    "gulp-connect": "",
+    "gulp-jshint": "",
+    "gulp-less": "",
+    "gulp-livereload": "",
+    "gulp-minify-css": "",
+    "gulp-notify": "",
+    "gulp-peg": "",
+    "gulp-plumber": "",
+    "gulp-react": "",
+    "gulp-rename": "",
+    "gulp-replace": "",
+    "gulp-rev": "",
+    "gulp-sourcemaps": "",
+    "gulp-uglify": "",
+    "jest-cli": "^0.1.18",
+    "jshint-stylish": "",
+    "lodash": "",
+    "map-stream": "",
+    "reactify": "",
+    "vinyl-buffer": "",
+    "vinyl-source-stream": "",
+    "vinyl-transform": ""
+  }
 }
-- 
cgit v1.2.3


From d65a4b610007c0ca60fa3f9ac9df06e74d6beb99 Mon Sep 17 00:00:00 2001
From: vzvu3k6k <vzvu3k6k@gmail.com>
Date: Fri, 27 Mar 2015 04:18:02 +0900
Subject: web: upgrade to react-router 0.13.2

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

(limited to 'web/package.json')

diff --git a/web/package.json b/web/package.json
index 5b15f695..e55081a3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,7 +20,7 @@
     "jquery": "",
     "lodash": "",
     "react": "^0.13.1",
-    "react-router": "^0.13.1"
+    "react-router": "^0.13.2"
   },
   "devDependencies": {
     "browserify": "=8.0.1",
-- 
cgit v1.2.3