diff --git a/.snyk b/.snyk index 04cf470d..25ac42d1 100644 --- a/.snyk +++ b/.snyk @@ -5,14 +5,14 @@ ignore: 'npm:marked:20170112': - simplemde > marked: reason: None given - expires: '2017-06-15T01:17:20.759Z' + expires: '2017-06-18T00:34:26.984Z' - fuse-box > marked: reason: None given expires: '2017-06-08T23:50:56.093Z' 'npm:shelljs:20140723': - pm2 > shelljs: reason: None given - expires: '2017-06-15T01:17:20.763Z' + expires: '2017-06-18T00:34:26.985Z' 'npm:qs:20170213': - chokidar > fsevents > node-pre-gyp > request > qs: reason: None given @@ -24,30 +24,57 @@ ignore: - serve-favicon > ms: reason: None given expires: '2017-06-15T01:17:20.759Z' + mongoose > ms: + reason: None given + expires: '2017-06-18T00:34:26.984Z' - express-session > debug > ms: reason: None given expires: '2017-06-15T01:17:20.759Z' + express-brute-mongoose > mongoose > ms: + reason: None given + expires: '2017-06-18T00:34:26.984Z' - follow-redirects > debug > ms: reason: None given expires: '2017-06-15T01:17:20.759Z' + socket.io > socket.io-adapter > debug > ms: + reason: None given + expires: '2017-06-18T00:34:26.984Z' - axios > follow-redirects > debug > ms: reason: None given expires: '2017-06-15T01:17:20.759Z' + compression > debug > ms: + reason: None given + expires: '2017-06-18T00:34:26.985Z' - pm2 > debug > ms: reason: None given expires: '2017-06-15T01:17:20.759Z' + mongoose > mquery > debug > ms: + reason: None given + expires: '2017-06-18T00:34:26.985Z' - body-parser > debug > ms: reason: None given expires: '2017-06-15T01:17:20.759Z' + express-brute-mongoose > mongoose > mquery > debug > ms: + reason: None given + expires: '2017-06-18T00:34:26.985Z' - express > debug > ms: reason: None given expires: '2017-06-15T01:17:20.759Z' + pm2 > pm2-axon > debug > ms: + reason: None given + expires: '2017-06-18T00:34:26.985Z' - express > send > debug > ms: reason: None given expires: '2017-06-15T01:17:20.759Z' + socket.io > socket.io-client > debug > ms: + reason: None given + expires: '2017-06-18T00:34:26.985Z' - express > serve-static > send > debug > ms: reason: None given expires: '2017-06-15T01:17:20.761Z' + socket.io > socket.io-client > engine.io-client > debug > ms: + reason: None given + expires: '2017-06-18T00:34:26.985Z' - express > send > ms: reason: None given expires: '2017-06-15T01:17:20.761Z' diff --git a/config.sample.yml b/config.sample.yml index a432c59d..e13abea8 100644 --- a/config.sample.yml +++ b/config.sample.yml @@ -43,7 +43,7 @@ uploads: # --------------------------------------------------------------------- # Site Language # --------------------------------------------------------------------- -# Possible values: en, de, es, fr, ko, pt or ru +# Possible values: en, es, fr, ko, ru or zh lang: en diff --git a/npm/configs/config.docker.yml b/npm/configs/config.docker.yml index ba1820b3..4d1f1d91 100644 --- a/npm/configs/config.docker.yml +++ b/npm/configs/config.docker.yml @@ -42,7 +42,7 @@ uploads: # --------------------------------------------------------------------- # Site Language # --------------------------------------------------------------------- -# Possible values: en, de, es, fr, ko, pt or ru +# Possible values: en, es, fr, ko, ru or zh lang: en diff --git a/npm/configs/config.heroku.yml b/npm/configs/config.heroku.yml index b427046c..f2bc5ff7 100644 --- a/npm/configs/config.heroku.yml +++ b/npm/configs/config.heroku.yml @@ -42,7 +42,7 @@ uploads: # --------------------------------------------------------------------- # Site Language # --------------------------------------------------------------------- -# Possible values: en, de, es, fr, ko, pt or ru +# Possible values: en, es, fr, ko, ru or zh lang: $(WIKI_LANG) diff --git a/package.json b/package.json index b51121f0..8b328ec4 100644 --- a/package.json +++ b/package.json @@ -40,10 +40,10 @@ }, "dependencies": { "auto-load": "^2.1.0", - "axios": "^0.16.1", + "axios": "0.16.1", "bcryptjs-then": "^1.0.1", "bluebird": "^3.5.0", - "body-parser": "^1.17.1", + "body-parser": "^1.17.2", "bunyan": "^1.8.10", "cheerio": "^0.22.0", "child-process-promise": "^2.2.1", @@ -55,13 +55,13 @@ "cron": "^1.2.1", "diff2html": "^2.3.0", "execa": "^0.6.3", - "express": "^4.15.2", - "express-brute": "^1.0.1", + "express": "^4.15.3", + "express-brute": "1.0.1", "express-brute-mongoose": "0.0.8", - "express-session": "^1.15.2", + "express-session": "^1.15.3", "file-type": "^4.3.0", "filesize.js": "^1.0.2", - "follow-redirects": "^1.2.3", + "follow-redirects": "1.2.3", "fs-extra": "^3.0.1", "git-wrapper2-promise": "^0.2.9", "highlight.js": "^9.11.0", @@ -71,7 +71,7 @@ "image-size": "^0.5.4", "jimp": "https://github.com/ngpixel/jimp.git", "js-yaml": "^3.8.4", - "jsonwebtoken": "^7.4.0", + "jsonwebtoken": "^7.4.1", "klaw": "^1.3.1", "levelup": "^1.3.5", "lodash": "^4.17.4", @@ -90,7 +90,7 @@ "moment": "^2.18.1", "moment-timezone": "^0.5.13", "mongodb": "^2.2.26", - "mongoose": "^4.9.9", + "mongoose": "^4.10.0", "multer": "^1.3.0", "node-graceful": "^0.2.3", "ora": "^1.2.0", @@ -104,7 +104,7 @@ "passport-slack": "0.0.7", "passport-windowslive": "^1.0.2", "passport.socketio": "^3.7.0", - "pm2": "^2.4.6", + "pm2": "2.4.6", "pug": "^2.0.0-rc.1", "read-chunk": "^2.0.0", "remove-markdown": "^0.1.0", @@ -112,9 +112,9 @@ "search-index-adder": "https://github.com/ngpixel/search-index-adder.git", "search-index-searcher": "https://github.com/ngpixel/search-index-searcher.git", "semver": "^5.3.0", - "serve-favicon": "^2.4.2", + "serve-favicon": "^2.4.3", "simplemde": "^1.11.2", - "socket.io": "^2.0.1", + "socket.io": "2.0.1", "stopword": "^0.1.1", "stream-to-promise": "^2.2.0", "tar": "^3.1.3", @@ -166,4 +166,4 @@ "verbose": true }, "snyk": true -} +} \ No newline at end of file diff --git a/server/app/data.yml b/server/app/data.yml index 620838e5..40b07881 100644 --- a/server/app/data.yml +++ b/server/app/data.yml @@ -66,15 +66,9 @@ langs: - id: fr name: French - Français - - - id: de - name: German - Deutsch - id: ko name: Korean - 한국어 - - - id: pt - name: Portuguese - Português - id: ru name: Russian - Русский diff --git a/server/locales/de/admin.json b/server/locales/de/admin.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/de/admin.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/de/auth.json b/server/locales/de/auth.json deleted file mode 100644 index ebff1baf..00000000 --- a/server/locales/de/auth.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "providers": { - "local": "Lokal", - "windowslive": "Microsoft-Konto", - "azure": "Azure Active Directory", - "google": "Google-ID", - "facebook": "Facebook", - "github": "GitHub", - "slack": "Locker", - "ldap": "LDAP / Active Directory" - } -} \ No newline at end of file diff --git a/server/locales/de/common.json b/server/locales/de/common.json deleted file mode 100644 index b84ea96f..00000000 --- a/server/locales/de/common.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "wiki": "Wiki", - "header": { - "overview": "Überblick" - }, - "footer": { - "poweredby": "Unterstützt von", - "home": "Zuhause", - "top": "Zurück nach oben" - } -} \ No newline at end of file diff --git a/server/locales/de/errors.json b/server/locales/de/errors.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/de/errors.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/de/git.json b/server/locales/de/git.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/de/git.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/ja/admin.json b/server/locales/ja/admin.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/ja/admin.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/ja/auth.json b/server/locales/ja/auth.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/ja/auth.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/ja/common.json b/server/locales/ja/common.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/ja/common.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/ja/errors.json b/server/locales/ja/errors.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/ja/errors.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/ja/git.json b/server/locales/ja/git.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/ja/git.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/pt/admin.json b/server/locales/pt/admin.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/pt/admin.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/pt/auth.json b/server/locales/pt/auth.json deleted file mode 100644 index a59ece50..00000000 --- a/server/locales/pt/auth.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "providers": { - "local": "Local", - "windowslive": "Conta Microsoft", - "azure": "Azure Active Directory", - "google": "Google ID", - "facebook": "Facebook", - "github": "GitHub", - "slack": "negligente", - "ldap": "LDAP / Active Directory" - } -} \ No newline at end of file diff --git a/server/locales/pt/common.json b/server/locales/pt/common.json deleted file mode 100644 index e853e636..00000000 --- a/server/locales/pt/common.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "wiki": "Wiki", - "header": { - "overview": "Visão geral" - }, - "footer": { - "poweredby": "Distribuído por", - "home": "Casa", - "top": "Retornar ao topo" - } -} \ No newline at end of file diff --git a/server/locales/pt/errors.json b/server/locales/pt/errors.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/pt/errors.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/server/locales/pt/git.json b/server/locales/pt/git.json deleted file mode 100644 index 6f31cf5a..00000000 --- a/server/locales/pt/git.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index b3a720cb..c0886a64 100644 Binary files a/yarn.lock and b/yarn.lock differ