Merge branch 'release/v1.2.0'

1 files changed, 8 insertions, 7 deletions

diff --git a/package.json b/package.json
index d4076612e..0cf39c7ee 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube",
   "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "licence": "AGPLv3",
   "engines": {
@@ -104,7 +104,7 @@
     "cli-table": "^0.3.1",
     "commander": "^2.13.0",
     "concurrently": "^4.0.1",
-    "config": "^2.0.1",
+    "config": "^3.0.0",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.1",
     "create-torrent": "^3.24.5",
@@ -127,7 +127,6 @@
     "jsonld-signatures": "https://github.com/Chocobozzz/jsonld-signatures#rsa2017",
     "lodash": "^4.17.10",
     "magnet-uri": "^5.1.4",
-    "marked-man": "^0.2.1",
     "memoizee": "^0.4.14",
     "morgan": "^1.5.3",
     "multer": "^1.1.0",
@@ -138,16 +137,16 @@
     "pem": "^1.12.3",
     "pfeed": "^1.1.6",
     "pg": "^7.4.1",
-    "pg-hstore": "^2.3.2",
     "prompt": "^1.0.0",
     "redis": "^2.8.0",
-    "reflect-metadata": "^0.1.10",
+    "reflect-metadata": "^0.1.12",
     "request": "^2.81.0",
-    "safe-buffer": "^5.0.1",
     "scripty": "^1.5.0",
     "sequelize": "4.41.2",
     "sequelize-typescript": "0.6.6",
     "sharp": "^0.21.0",
+    "sitemap": "^2.1.0",
+    "socket.io": "^2.2.0",
     "srt-to-vtt": "^1.1.2",
     "summon-install": "^0.4.3",
     "useragent": "^2.3.0",
@@ -165,7 +164,7 @@
     "@types/bcrypt": "^3.0.0",
     "@types/bluebird": "3.5.21",
     "@types/body-parser": "^1.16.3",
-    "@types/bull": "^3.3.12",
+    "@types/bull": "3.4.0",
     "@types/bytes": "^3.0.0",
     "@types/chai": "^4.0.4",
     "@types/chai-json-schema": "^1.4.3",
@@ -191,6 +190,7 @@
     "@types/redis": "^2.8.5",
     "@types/request": "^2.0.3",
     "@types/sharp": "^0.21.0",
+    "@types/socket.io": "^2.1.2",
     "@types/supertest": "^2.0.3",
     "@types/validator": "^9.4.0",
     "@types/webtorrent": "^0.98.4",
@@ -202,6 +202,7 @@
     "libxmljs": "0.19.5",
     "lint-staged": "^8.0.4",
     "maildev": "^1.0.0-rc3",
+    "marked-man": "^0.2.1",
     "mocha": "^5.0.0",
     "nodemon": "^1.18.6",
     "sass-lint": "^1.12.1",