Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/v2/guide/transitions.md

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>

Author: MachinisteWeb

Makefile

@@ -2,6 +2,7 @@ all: update deploy
 
 deploy:
 	rm -rf public db.json
+	node install.js
 	hexo generate
 	hexo deploy
 

install.js

@@ -0,0 +1,14 @@
+var fs = require('fs')
+var execSync = require('child_process').execSync
+var deps = require('./package.json').dependencies
+var depFolders = Object.keys(deps)
+
+for (var depFolder in deps) {
+  if (!fs.existsSync('./node_modules/' + depFolder)) {
+    console.log('Dependency "' + depFolder + '" is NOT installed - installing now...')
+    execSync('npm install')
+    process.exit(0)
+  }
+}
+
+console.log('All dependencies are already installed.')

src/v2/guide/transitions.md

@@ -651,7 +651,7 @@ Qui pourrait aussi s'écrire ainsi :
 // ...
 computed: {
   buttonMessage: function () {
-    switch (docState) {
+    switch (this.docState) {
       case 'saved': return 'Modifier'
       case 'edited': return 'Sauver'
       case 'editing': return 'Annuler'

yarn.lock

@@ -1546,11 +1546,7 @@ moment-timezone@^0.5.4:
   dependencies:
     moment ">= 2.9.0"
 
-"moment@>= 2.9.0", moment@^2.10.6, moment@^2.11.2:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
-moment@~2.13.0:
+"moment@>= 2.9.0", moment@^2.10.6, moment@^2.11.2, moment@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.13.0.tgz#24162d99521e6d40f99ae6939e806d2139eaac52"