Merge pull request #327 from weseek/master

release v3.0.0

README.md

@@ -27,6 +27,7 @@ GROWI
 * **Pluggable**
   * You can find plugins from [npm](https://www.npmjs.com/browse/keyword/growi-plugin) or [github](https://github.com/search?q=topic%3Agrowi-plugin)!
 * **Features**
+  * Create hierarchical pages with markdown
   * Support Authentication with LDAP / Active Directory 
   * Slack Incoming Webhooks Integration
   * [Miscellaneous features](https://github.com/weseek/growi/wiki/Additional-Features)
@@ -121,8 +122,7 @@ npm start
 ### How to install plugins
 
 * Stop server if server is running
-* `yarn add` to install plugin or `npm install --save`
-  * **Don't forget `--save` option if you use npm** or growi doesn't detect plugins
+* `yarn add` to install plugin or `npm install`
 * `npm start` to build client app and start server
 
 #### Examples

lib/views/_form.html

@@ -56,7 +56,7 @@
       </select>
       {% endif %}
       {% if userRelatedGroups.length != 0 %}
-      <select name="pageForm[grantUserGroupId]" class="form-control">
+      <select name="pageForm[grantUserGroupId]" class="selectpicker btn-group-sm">
         {% for userGroup in userRelatedGroups %}
         <option value="{{ userGroup.id }}">{{ userGroup.name }}</option>
         {% endfor %}

resource/js/app.js

@@ -46,10 +46,15 @@ if (mainContent !== null) {
   pageRevisionId = mainContent.getAttribute('data-page-revision-id');
   pageRevisionCreatedAt = +mainContent.getAttribute('data-page-revision-created');
   pagePath = mainContent.attributes['data-path'].value;
+  /*
+   * Commented out temporally -- 2018.04.07 Yuki Takei
+   * This will be fixed by https://github.com/weseek/growi/issues/324
+   *
   const rawText = document.getElementById('raw-text-original');
   if (rawText) {
     pageContent = rawText.innerHTML;
   }
+  */
   markdown = entities.decodeHTML(pageContent);
 }
 const isLoggedin = document.querySelector('.main-container.nologin') == null;