Merge branch 'master' into improvement/initialize-client

CHANGES.md

@@ -1,9 +1,15 @@
 # CHANGES
 
-## v4.0.6-RC
+## v4.0.7-RC
+
+* 
+
+## v4.0.6
 
 * Fix: Avatar images in Recent Changes are not shown
-* Fix: Full screen modal of Handsontable and Draoio don't work
+* Fix: Full screen modal of Handsontable and Draw.io don't work
+* Fix: Shortcut for creating page respond with modifier key wrongly
+    * Introduced by v4.0.5
 
 ## v4.0.5
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "growi",
-  "version": "4.0.6-RC",
+  "version": "4.0.7-RC",
   "description": "Team collaboration software using markdown",
   "tags": [
     "wiki",

src/client/js/services/NavigationContainer.js

@@ -52,7 +52,10 @@ export default class NavigationContainer extends Container {
       }
 
       if (event.key === 'c') {
-        this.setState({ isPageCreateModalShown: true });
+        // don't fire when not needed
+        if (!event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey) {
+          this.setState({ isPageCreateModalShown: true });
+        }
       }
     });
   }

src/lib/util/mongoose-utils.js

@@ -7,7 +7,7 @@ const getMongoUri = () => {
     || env.MONGODB_URI // MONGOLAB changes their env name
     || env.MONGOHQ_URL
     || env.MONGO_URI
-    || ((env.NODE_ENV === 'test') ? 'mongodb://localhost/growi_test' : 'mongodb://localhost/growi');
+    || ((env.NODE_ENV === 'test') ? 'mongodb://mongo/growi_test' : 'mongodb://mongo/growi');
 };
 
 const getModelSafely = (modelName) => {