diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /web/package.json | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
Diffstat (limited to 'web/package.json')
| -rw-r--r-- | web/package.json | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/web/package.json b/web/package.json index 14a31f48..e55081a3 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.2" + }, + "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": "" + } } |