Merge branch 'master' into feat/3176-grid-edit-modal-for-master-merge

CHANGES.md

@@ -1,7 +1,12 @@
 # CHANGES
 
-## v4.2.3-RC
+## v4.2.4
 
+* 
+
+## v4.2.3
+
+* Feature: Insert/edit links with GUI
 * Feature: Auto reconnecting to search service
 * Improvement: New style of params for Healthcheck API
 * Fix: Referencing attachments when `FILE_UPLOAD_DISABLED` is true

package.json

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

src/client/styles/scss/_on-edit.scss

@@ -134,6 +134,13 @@ body.on-edit {
 
     .grw-taglabels-container {
       margin-bottom: 0;
+
+      // To scroll tags horizontally
+      .grw-tag-labels.form-inline {
+        flex-flow: row nowrap;
+        width: 100%;
+        overflow-x: scroll;
+      }
     }
   }
 
@@ -141,6 +148,7 @@ body.on-edit {
   .grw-subnav-left-side {
     overflow: hidden;
     .grw-path-nav-container {
+      margin-right: 1rem;
       overflow: hidden;
       .grw-page-path-nav {
         white-space: nowrap;

src/server/routes/apiv3/users.js

@@ -181,6 +181,8 @@ module.exports = (crowi) => {
       [sort]: (sortOrder === 'desc') ? -1 : 1,
     };
 
+    //  For more information about the external specification of the User API, see here (https://dev.growi.org/5fd7466a31d89500488248e3)
+
     const orConditions = [
       { name: { $in: searchWord } },
       { username: { $in: searchWord } },