Merge pull request #767 from weseek/master

release v3.3.2

CHANGES.md

@@ -1,11 +1,11 @@
 CHANGES
 ========
 
-## 3.3.1-RC
+## 3.3.2-RC
 
-* Fix: Missing dependencies for production (url-join)
+* 
 
-## 3.3.0
+## 3.3.1
 
 * Feature: NO_CDN Mode
 * Feature: Add option to show/hide restricted pages in list
@@ -20,6 +20,8 @@ CHANGES
     * googleapis
     * passport-saml
 
+## 3.3.0 (Missing number)
+
 ## 3.2.10
 
 * Fix: Pages in trash are available to create

package.json

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

resource/cdn-manifests.js

@@ -26,7 +26,8 @@ module.exports = {
 'gh/highlightjs/cdn-release@9.12.0/build/languages/less.min.js,' +
 'gh/highlightjs/cdn-release@9.12.0/build/languages/scss.min.js,' +
 'gh/highlightjs/cdn-release@9.12.0/build/languages/typescript.min.js,' +
-'gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js',
+'gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js,' +
+'npm/highlightjs-line-numbers.js@2.6.0/dist/highlightjs-line-numbers.min.js',
       args: {
         async: true,
         integrity: '',

src/client/js/util/GrowiRenderer.js

@@ -174,6 +174,8 @@ export default class GrowiRenderer {
       const citeTag = (langFn) ? `<cite>${langFn}</cite>` : '';
       if (hljs.getLanguage(lang)) {
         try {
+          //// TODO activate `hljs.lineNumbersValue` when https://github.com/weseek/growi/issues/457 is fixed
+          // return `<pre class="hljs ${noborder}">${citeTag}<code class="language-${lang}">${hljs.lineNumbersValue(hljs.highlight(lang, code, true).value)}</code></pre>`;
           return `<pre class="hljs ${noborder}">${citeTag}<code class="language-${lang}">${hljs.highlight(lang, code, true).value}</code></pre>`;
         }
         catch (__) {

src/client/styles/scss/_wiki.scss

@@ -122,7 +122,21 @@ div.body {
       font-weight: bold;
       opacity: 0.6;
     }
-  };
+  }
+
+  // styles for highlightjs-line-numbers
+  .hljs-ln td.hljs-ln-numbers {
+    user-select: none;
+
+    text-align: center;
+    color: #ccc;
+    border-right: 1px solid #CCC;
+    vertical-align: top;
+    padding-right: 5px;
+  }
+  .hljs-ln td.hljs-ln-code {
+    padding-left: 10px;
+  }
 
   p code {  // only inline code blocks
     font-family: $font-family-monospace-not-strictly;

src/server/models/page.js

@@ -850,6 +850,8 @@ module.exports = function(crowi) {
       if (count === 0) {
         throw new Error('no relations were exist for group and user.');
       }
+
+      page.grantedGroup = grantUserGroupId;
     }
   }
 

src/server/views/admin/app.html

@@ -248,7 +248,7 @@
           }
           var $message = $('<p class="alert"></p>');
           $message.addClass('alert-' + status);
-          $message.html(msg.replace('\n', '<br>'));
+          $message.html(msg.replace(/\n/g, '<br>'));
           $message.insertAfter('#' + formId + ' legend');
 
           if (status == 'success') {

src/server/views/admin/customize.html

@@ -346,7 +346,8 @@
 
           <p class="help-block">
             Examples:
-            <pre class="hljs {% if !settingForm['customize:highlightJsStyleBorder'] %}hljs-no-border{% endif %}"><code class="highlightjs-demo">function $initHighlight(block, cls) {
+            <div class="wiki">
+              <pre class="hljs {% if !settingForm['customize:highlightJsStyleBorder'] %}hljs-no-border{% endif %}"><code class="highlightjs-demo">function $initHighlight(block, cls) {
   try {
     if (cls.search(/\bno\-highlight\b/) != -1)
       return process(block, true, 0x0F) +
@@ -361,6 +362,7 @@
 }
 
 export  $initHighlight;</code></pre>
+            </div>
           </p>
 
           <div class="form-group">
@@ -551,7 +553,7 @@ window.addEventListener('load', (event) => {
           }
           var $message = $('<p id="alert-results" class="alert"></p>');
           $message.addClass('alert-' + status);
-          $message.html(msg.replace('\n', '<br>'));
+          $message.html(msg.replace(/\n/g, '<br>'));
           $message.insertAfter('#' + formId + ' legend');
 
           if (status == 'success') {
@@ -592,6 +594,7 @@ window.addEventListener('load', (event) => {
      * highlight.js style switcher
      */
     hljs.initHighlightingOnLoad()
+    hljs.initLineNumbersOnLoad()
 
     function selectHighlightJsStyle(event) {
       var highlightJsCssDOM = $("#highlightJsCssContainer link")[0]

src/server/views/admin/importer.html

@@ -205,7 +205,7 @@
     }
     var $message = $('<p class="alert"></p>');
     $message.addClass('alert-' + status);
-    $message.html(msg.replace('\n', '<br>'));
+    $message.html(msg.replace(/\n/g, '<br>'));
     $message.insertAfter('#' + formId + ' legend');
 
     if (status == 'success') {

src/server/views/admin/search.html

@@ -84,7 +84,7 @@
     }
     var $message = $('<p class="alert"></p>');
     $message.addClass('alert-' + status);
-    $message.html(msg.replace('\n', '<br>'));
+    $message.html(msg.replace(/\n/g, '<br>'));
     $message.insertAfter('#' + formId + ' legend');
 
     if (status == 'success') {

src/server/views/admin/security.html

@@ -354,7 +354,7 @@
           }
           var $message = $('<p class="alert"></p>');
           $message.addClass('alert-' + status);
-          $message.html(msg.replace('\n', '<br>'));
+          $message.html(msg.replace(/\n/g, '<br>'));
           $message.insertAfter('#' + formId + ' .alert-anchor');
 
           if (status == 'success') {

src/server/views/admin/widget/passport/ldap.html

@@ -287,7 +287,7 @@
           }
           var $message = $('<p class="alert"></p>');
           $message.addClass('alert-' + status);
-          $message.html(msg.replace('\n', '<br>'));
+          $message.html(msg.replace(/\n/g, '<br>'));
           $message.insertAfter('#' + formId + ' legend');
 
           if (status == 'success') {

src/server/views/widget/passport/ldap-association-tester.html

@@ -38,7 +38,7 @@
 
         var $message = $('<p class="alert"></p>');
         $message.addClass('alert-' + status);
-        $message.html(msg.replace('\n', '<br>'));
+        $message.html(msg.replace(/\n/g, '<br>'));
         $message.appendTo('#' + formId + '> .alert-container');
 
         if (status == 'success') {

wercker.yml

@@ -161,7 +161,11 @@ release: # would be run on release branch
 
     - script:
       name: trigger growi-docker release pipeline
-      code: sh ./bin/wercker/trigger-growi-docker.sh
+      code: GROWI_DOCKER_PIPELINE_ID=$GROWI_DOCKER_PIPELINE_ID_CDN sh ./bin/wercker/trigger-growi-docker.sh
+
+    - script:
+      name: trigger growi-docker release-nocdn pipeline
+      code: GROWI_DOCKER_PIPELINE_ID=$GROWI_DOCKER_PIPELINE_ID_NOCDN sh ./bin/wercker/trigger-growi-docker.sh
 
   after-steps:
     - slack-notifier: