Merge pull request #329 from weseek/master

release v3.0.2

README.md

@@ -1,3 +1,5 @@
+# Sorry, GROWI v3.0.0 - v3.0.1 has been broken. Please wait v3.0.2 that is under constructing.
+
 <p align="center">
   <a href="https://growi.org">
     <img src="https://user-images.githubusercontent.com/1638767/38254268-d4476bbe-3793-11e8-964c-8865d690baff.png" width="240px">

config/webpack.common.js

@@ -59,7 +59,10 @@ module.exports = function (options) {
           test: /\.scss$/,
           use: ExtractTextPlugin.extract({
             fallback: 'style-loader',
-            use: 'css-loader!sass-loader'
+            use: [
+              { loader: 'css-loader', options: { minimize: isProd, sourceMap: !isProd } },
+              { loader: 'sass-loader', options: { sourceMap: !isProd } }
+            ]
           }),
           include: [helpers.root('resource/styles/scss')]
         },

config/webpack.dev.js

@@ -63,7 +63,7 @@ module.exports = function (options) {
         },
         dllDir: helpers.root('public/dll'),
         webpackConfig: webpackMergeDll(commonConfig({env: ENV}), {
-          devtool: 'cheap-module-source-map',
+          devtool: undefined,
           plugins: [],
         })
       }),

config/webpack.prod.js

@@ -26,7 +26,7 @@ const PORT = process.env.PORT || 3000;
 
 module.exports = function (env) {
   return webpackMerge(commonConfig({ env: ENV }), {
-    devtool: 'source-map',
+    devtool: undefined,
     output: {
       path: helpers.root('public/js'),
       publicPath: '/js/',

lib/views/login.html

@@ -147,15 +147,17 @@
 
         <hr>
 
-        {% if config.crowi['security:registrationMode'] != 'Closed' %}
         <div class="row">
           <div class="col-xs-12 text-right">
+            {% if config.crowi['security:registrationMode'] != 'Closed' %}
             <a href="#register" id="register" class="link-switch">
               <i class="ti-check-box"></i> {{ t('Sign up is here') }}
             </a>
+            {% else %}
+            &nbsp;
+            {% endif %}
           </div>
         </div>
-        {% endif %}
       </div>
 
 

lib/views/widget/not_found_content.html

@@ -16,7 +16,13 @@
   {% include 'not_found_tabs.html' %}
 
   <div class="tab-content">
+    {#
+     # Commented out temporally -- 2018.04.07 Yuki Takei
+     # This will be fixed by https://github.com/weseek/growi/issues/324
+     #
+     #
     <script type="text/template" id="raw-text-original"># {{ path|path2name }}</script>
+     #}
     {# list view #}
     <div class="p-t-10 active tab-pane page-list-container" id="revision-body">
       {% if pages.length == 0 %}

package.json

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

resource/js/app.js

@@ -46,15 +46,10 @@ 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;