Quellcode durchsuchen

replace "crowi-plus" with "GROWI"

Yuki Takei vor 8 Jahren
Ursprung
Commit
9a326e38d6

+ 3 - 3
.github/ISSUE_TEMPLATE.md

@@ -6,13 +6,13 @@ Environment
 | item     | version |
 | item     | version |
 | ---      | --- |
 | ---      | --- |
 |OS        ||
 |OS        ||
-|crowi-plus|x.y.z|
+|GROWI     |x.y.z|
 |node.js   |x.y.z|
 |node.js   |x.y.z|
 |npm       |x.y.z|
 |npm       |x.y.z|
 |Using Docker|yes/no|
 |Using Docker|yes/no|
-|Using [crowi-plus-docker-compose][crowi-plus-docker-compose]|yes/no|
+|Using [growi-docker-compose][growi-docker-compose]|yes/no|
 
 
-[crowi-plus-docker-compose]: https://github.com/weseek/crowi-plus-docker-compose
+[growi-docker-compose]: https://github.com/weseek/growi-docker-compose
 
 
 *(Accessing https://{CROWI_HOST}/admin helps you to fill in above versions)*
 *(Accessing https://{CROWI_HOST}/admin helps you to fill in above versions)*
 
 

+ 3 - 3
THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
-crowi-plus uses third-party libraries or other resources that may  
-be distributed under licenses different than the crowi-plus software.
+GROWI uses third-party libraries or other resources that may  
+be distributed under licenses different than the GROWI software.
 
 
 In the event that we accidentally failed to list a required notice,  
 In the event that we accidentally failed to list a required notice,  
 please bring it to our attention through any of the ways detailed here :
 please bring it to our attention through any of the ways detailed here :
@@ -9,7 +9,7 @@ please bring it to our attention through any of the ways detailed here :
 The attached notices are provided for information only.
 The attached notices are provided for information only.
 
 
 For any licenses that require disclosure of source, sources are available at  
 For any licenses that require disclosure of source, sources are available at  
-https://github.com/weseek/crowi-plus.
+https://github.com/weseek/growi.
 
 
 
 
 1. crowi/crowi (https://github.com/crowi/crowi)
 1. crowi/crowi (https://github.com/crowi/crowi)

+ 2 - 2
app.js

@@ -1,7 +1,7 @@
 /**
 /**
- * Crowi::app.js
+ * Growi::app.js
  *
  *
- * @package crowi-plus
+ * @package growi
  * @author  Yuki Takei <yuki@weseek.co.jp>
  * @author  Yuki Takei <yuki@weseek.co.jp>
  */
  */
 
 

+ 4 - 4
app.json

@@ -1,11 +1,11 @@
 {
 {
-  "name": "crowi-plus",
-  "description": "Enhanced Crowi",
+  "name": "growi",
+  "description": "Team collaboration system with markdown",
   "keywords": [
   "keywords": [
     "wiki",
     "wiki",
     "communication"
     "communication"
   ],
   ],
-  "repository": "https://github.com/weseek/crowi-plus",
+  "repository": "https://github.com/weseek/growi",
   "success_url": "/",
   "success_url": "/",
   "env": {
   "env": {
     "SECRET_TOKEN": {
     "SECRET_TOKEN": {
@@ -18,7 +18,7 @@
     },
     },
     "INSTALL_PLUGINS": {
     "INSTALL_PLUGINS": {
       "description": "Comma-separated list of plugin package names to install.",
       "description": "Comma-separated list of plugin package names to install.",
-      "value": "crowi-plugin-lsx",
+      "value": "growi-plugin-lsx",
       "required": false
       "required": false
     }
     }
   },
   },

+ 1 - 1
lib/locales/en-US/translation.json

@@ -268,7 +268,7 @@
     "without_encryption": "Please be noted that your ID and Password will be sent wihtout encryption.",
     "without_encryption": "Please be noted that your ID and Password will be sent wihtout encryption.",
     "users_without_account": "Users without account is not accessible",
     "users_without_account": "Users without account is not accessible",
     "restrict_emails": "You can restrict registerable e-mail address.",
     "restrict_emails": "You can restrict registerable e-mail address.",
-    "for_instance":" For instance, if you use Crowi-plus within a company, you can write ",
+    "for_instance":" For instance, if you use growi within a company, you can write ",
     "only_those":" Only those whose e-mail address including the company address can register.",
     "only_those":" Only those whose e-mail address including the company address can register.",
     "insert_single":"Please insert single e-mail address per line.",
     "insert_single":"Please insert single e-mail address per line.",
     "Authentication mechanism settings":"Authentication mechanism settings"
     "Authentication mechanism settings":"Authentication mechanism settings"

+ 2 - 4
lib/models/config.js

@@ -21,13 +21,12 @@ module.exports = function(crowi) {
   });
   });
 
 
   /**
   /**
-   * default values when crowi-plus is cleanly installed
+   * default values when GROWI is cleanly installed
    */
    */
   function getArrayForInstalling() {
   function getArrayForInstalling() {
     let config = getDefaultCrowiConfigs();
     let config = getDefaultCrowiConfigs();
 
 
     // overwrite
     // overwrite
-    config['app:title'] = 'crowi-plus';
     config['app:fileUpload'] = true;
     config['app:fileUpload'] = true;
     config['security:isEnabledPassport'] = true;
     config['security:isEnabledPassport'] = true;
     config['customize:behavior'] = 'crowi-plus';
     config['customize:behavior'] = 'crowi-plus';
@@ -44,7 +43,6 @@ module.exports = function(crowi) {
   {
   {
     return {
     return {
       //'app:installed'     : "0.0.0",
       //'app:installed'     : "0.0.0",
-      'app:title'         : 'Crowi',
       'app:confidential'  : '',
       'app:confidential'  : '',
 
 
       'app:fileUpload'    : false,
       'app:fileUpload'    : false,
@@ -257,7 +255,7 @@ module.exports = function(crowi) {
 
 
   configSchema.statics.isEnabledPassport = function(config)
   configSchema.statics.isEnabledPassport = function(config)
   {
   {
-    // always true if crowi-plus installed cleanly
+    // always true if growi installed cleanly
     if (Object.keys(config.crowi).length == 0) {
     if (Object.keys(config.crowi).length == 0) {
       return true;
       return true;
     }
     }

+ 1 - 1
lib/models/revision.js

@@ -14,7 +14,7 @@ module.exports = function(crowi) {
   });
   });
 
 
   /*
   /*
-   * preparation for https://github.com/weseek/crowi-plus/issues/216
+   * preparation for https://github.com/weseek/growi/issues/216
    */
    */
   // // create a XSS Filter instance
   // // create a XSS Filter instance
   // // TODO read options
   // // TODO read options

+ 1 - 1
lib/util/search.js

@@ -244,7 +244,7 @@ SearchClient.prototype.addAllPages = function()
       // all done
       // all done
 
 
       // return if body is empty
       // return if body is empty
-      // see: https://github.com/weseek/crowi-plus/issues/228
+      // see: https://github.com/weseek/growi/issues/228
       if (body.length == 0) {
       if (body.length == 0) {
         return resolve();
         return resolve();
       }
       }

+ 1 - 1
lib/views/admin/customize.html

@@ -431,7 +431,7 @@ export  $initHighlight;</code></pre>
             <dt><code>crowiRenderer</code></dt>
             <dt><code>crowiRenderer</code></dt>
             <dd>Crowi Renderer instance</dd>
             <dd>Crowi Renderer instance</dd>
             <dt><code>crowiPlugin</code></dt>
             <dt><code>crowiPlugin</code></dt>
-            <dd>crowi-plus plugin manager instance</dd>
+            <dd>GROWI plugin manager instance</dd>
           </dl>
           </dl>
         </p>
         </p>
         <p class="help-block">
         <p class="help-block">

+ 1 - 1
lib/views/admin/index.html

@@ -34,7 +34,7 @@
       </legend>
       </legend>
       <table class="table table-bordered">
       <table class="table table-bordered">
         <tr>
         <tr>
-          <th class="col-sm-4">crowi-plus</th>
+          <th class="col-sm-4">GROWI</th>
           <td>{{ crowiVersion() }}</td>
           <td>{{ crowiVersion() }}</td>
         </tr>
         </tr>
         <tr>
         <tr>

+ 9 - 9
lib/views/admin/notification.html

@@ -55,8 +55,8 @@
               <p class="well">
               <p class="well">
                 <i class="icon-fw icon-exclamation text-danger"></i><span class="text-danger">NOT RECOMMENDED</span>
                 <i class="icon-fw icon-exclamation text-danger"></i><span class="text-danger">NOT RECOMMENDED</span>
                 <br><br>
                 <br><br>
-                This is the way that compatible with the official Crowi,<br>
-                but not recommended in crowi-plus because it is too complex.
+                This is the way that compatible with Crowi,<br>
+                but not recommended in GROWI because it is too complex.
                 <br><br>
                 <br><br>
                 Please use <a href="#slack-incoming-webhooks" data-toggle="tab" onclick="activateTab('slack-incoming-webhooks')">Slack incomming webhooks Configuration</a> instead.
                 Please use <a href="#slack-incoming-webhooks" data-toggle="tab" onclick="activateTab('slack-incoming-webhooks')">Slack incomming webhooks Configuration</a> instead.
               </p>
               </p>
@@ -118,7 +118,7 @@
                 <li>
                 <li>
                   Create App from <a href="https://api.slack.com/applications/new">this link</a>, and fill the form out as below:
                   Create App from <a href="https://api.slack.com/applications/new">this link</a>, and fill the form out as below:
                   <dl class="dl-horizontal">
                   <dl class="dl-horizontal">
-                    <dt>App Name</dt> <dd><code>crowi-plus</code> </dd>
+                    <dt>App Name</dt> <dd><code>growi</code> </dd>
                     <dt>Development Slack Workspace</dt> <dd>Select the workspace you want to notify to.</dd>
                     <dt>Development Slack Workspace</dt> <dd>Select the workspace you want to notify to.</dd>
                   </dl>
                   </dl>
                 </li>
                 </li>
@@ -143,7 +143,7 @@
               Set Permission Scopes to the App
               Set Permission Scopes to the App
               <ol>
               <ol>
                 <li>Go to "OAuth &amp; Permissions" page.</li>
                 <li>Go to "OAuth &amp; Permissions" page.</li>
-                <li>Add "Send messages as crowi-plus"(<code>chat:write:bot</code>).</li>
+                <li>Add "Send messages as GROWI"(<code>chat:write:bot</code>).</li>
                 <li>Don't forget to <strong>save</strong>.</li>
                 <li>Don't forget to <strong>save</strong>.</li>
               </ol>
               </ol>
             </li>
             </li>
@@ -162,7 +162,7 @@
             <li>
             <li>
               (At Workspace) Approve the app
               (At Workspace) Approve the app
               <ol>
               <ol>
-                <li>Go to the management Apps page for the workspace you installed the app and approve crowi-plus.</li>
+                <li>Go to the management Apps page for the workspace you installed the app and approve "growi".</li>
               </ol>
               </ol>
             </li>
             </li>
             <li>
             <li>
@@ -172,10 +172,10 @@
               </ol>
               </ol>
             </li>
             </li>
             <li>
             <li>
-              (At crowi-plus) Input "clientId" and "clientSecret" and submit on this page.
+              (At GROWI admin page) Input "clientId" and "clientSecret" and submit on this page.
             </li>
             </li>
             <li>
             <li>
-              (At crowi-plus) Click "Connect to Slack" button to start OAuth process.
+              (At GROWI admin page) Click "Connect to Slack" button to start OAuth process.
             </li>
             </li>
           </ol>
           </ol>
           {# {% endif %} #}
           {# {% endif %} #}
@@ -202,7 +202,7 @@
                   <input type="checkbox" name="slackIwhSetting[slack:isIncomingWebhookPrioritized]" value="1"
                   <input type="checkbox" name="slackIwhSetting[slack:isIncomingWebhookPrioritized]" value="1"
                     {% if slackSetting['slack:isIncomingWebhookPrioritized'] %}checked{% endif %}>
                     {% if slackSetting['slack:isIncomingWebhookPrioritized'] %}checked{% endif %}>
                   Prioritize Incoming Webhook than Slack App
                   Prioritize Incoming Webhook than Slack App
-                  <p class="help-block">Check this option and crowi-plus use Incoming Webhooks even if Slack App settings are enabled.</p>
+                  <p class="help-block">Check this option and GROWI use Incoming Webhooks even if Slack App settings are enabled.</p>
                 </div>
                 </div>
               </div>
               </div>
 
 
@@ -231,7 +231,7 @@
               </ol>
               </ol>
             </li>
             </li>
             <li>
             <li>
-              (At crowi-plus) Set Webhook URL
+              (At GROWI admin page) Set Webhook URL
               <ol>
               <ol>
                 <li>Input "Webhook URL" and submit on this page.</li>
                 <li>Input "Webhook URL" and submit on this page.</li>
               </ol>
               </ol>

+ 5 - 5
lib/views/admin/widget/passport/google-oauth.html

@@ -19,7 +19,7 @@
       <li>
       <li>
         Create App from <a href="https://api.slack.com/applications/new">this link</a>, and fill the form out as below:
         Create App from <a href="https://api.slack.com/applications/new">this link</a>, and fill the form out as below:
         <dl class="dl-horizontal">
         <dl class="dl-horizontal">
-          <dt>App Name</dt> <dd><code>crowi-plus</code> </dd>
+          <dt>App Name</dt> <dd><code>growi</code> </dd>
           <dt>Development Slack Team</dt> <dd>Select the team you want to notify to.</dd>
           <dt>Development Slack Team</dt> <dd>Select the team you want to notify to.</dd>
         </dl>
         </dl>
       </li>
       </li>
@@ -44,7 +44,7 @@
     Set Permission Scopes to the App
     Set Permission Scopes to the App
     <ol>
     <ol>
       <li>Go to "OAuth &amp; Permissions" page.</li>
       <li>Go to "OAuth &amp; Permissions" page.</li>
-      <li>Add "Send messages as crowi-plus"(<code>chat:write:bot</code>).</li>
+      <li>Add "Send messages as GROWI"(<code>chat:write:bot</code>).</li>
       <li>Don't forget to <strong>save</strong>.</li>
       <li>Don't forget to <strong>save</strong>.</li>
     </ol>
     </ol>
   </li>
   </li>
@@ -63,7 +63,7 @@
   <li>
   <li>
     (At Team) Approve the app
     (At Team) Approve the app
     <ol>
     <ol>
-      <li>Go to the management Apps page for the team you installed the app and approve crowi-plus.</li>
+      <li>Go to the management Apps page for the team you installed the app and approve "growi".</li>
     </ol>
     </ol>
   </li>
   </li>
   <li>
   <li>
@@ -73,10 +73,10 @@
     </ol>
     </ol>
   </li>
   </li>
   <li>
   <li>
-    (At crowi-plus) Input "clientId" and "clientSecret" and submit on this page.
+    (At GROWI admin page) Input "clientId" and "clientSecret" and submit on this page.
   </li>
   </li>
   <li>
   <li>
-    (At crowi-plus) Click "Connect to Slack" button to start OAuth process.
+    (At GROWI admin page) Click "Connect to Slack" button to start OAuth process.
   </li>
   </li>
 </ol>
 </ol>
 {% endif %}
 {% endif %}

+ 2 - 2
lib/views/login.html

@@ -42,7 +42,7 @@
 
 
         {#
         {#
         # The case that there already exists a user whose username matches ID of the newly created LDAP user
         # The case that there already exists a user whose username matches ID of the newly created LDAP user
-        # https://github.com/weseek/crowi-plus/issues/193
+        # https://github.com/weseek/growi/issues/193
         #}
         #}
         {% set isDuplicatedUsernameExceptionOccured = req.flash('isDuplicatedUsernameExceptionOccured') %}
         {% set isDuplicatedUsernameExceptionOccured = req.flash('isDuplicatedUsernameExceptionOccured') %}
         {% if isDuplicatedUsernameExceptionOccured != null %}
         {% if isDuplicatedUsernameExceptionOccured != null %}
@@ -50,7 +50,7 @@
           <p><strong><i class="icon-fw icon-ban"></i>DuplicatedUsernameException occured</strong></p>
           <p><strong><i class="icon-fw icon-ban"></i>DuplicatedUsernameException occured</strong></p>
           <p>
           <p>
             Your LDAP authentication was succeess, but a new user could not be created.
             Your LDAP authentication was succeess, but a new user could not be created.
-            See the issue <a href="https://github.com/weseek/crowi-plus/issues/193">#193</a>.
+            See the issue <a href="https://github.com/weseek/growi/issues/193">#193</a>.
           </p>
           </p>
         </div>
         </div>
         {% endif %}
         {% endif %}

+ 1 - 1
lib/views/widget/system-version.html

@@ -1,6 +1,6 @@
 <div class="system-version hidden-xs">
 <div class="system-version hidden-xs">
   <span>
   <span>
-    <a href="https://github.com/weseek/crowi-plus">crowi-plus</a> {{ crowiVersion() }}
+    <a href="https://github.com/weseek/growi">GROWI</a> {{ crowiVersion() }}
   </span>
   </span>
   <span>
   <span>
     <a href="" data-target="#shortcuts-modal" data-toggle="modal"><i class="fa fa-keyboard-o"></i>&nbsp;<span class="cmd-key"></span>-/</a>
     <a href="" data-target="#shortcuts-modal" data-toggle="modal"><i class="fa fa-keyboard-o"></i>&nbsp;<span class="cmd-key"></span>-/</a>

+ 4 - 4
package.json

@@ -1,7 +1,7 @@
 {
 {
-  "name": "crowi-plus",
+  "name": "growi",
   "version": "3.0.0-RC",
   "version": "3.0.0-RC",
-  "description": "Enhanced Crowi",
+  "description": "Team collaboration system with markdown",
   "tags": [
   "tags": [
     "wiki",
     "wiki",
     "communication",
     "communication",
@@ -13,10 +13,10 @@
   "license": "MIT",
   "license": "MIT",
   "repository": {
   "repository": {
     "type": "git",
     "type": "git",
-    "url": "https://github.com/weseek/crowi-plus.git"
+    "url": "https://github.com/weseek/growi.git"
   },
   },
   "bugs": {
   "bugs": {
-    "url": "https://github.com/weseek/crowi-plus/issues"
+    "url": "https://github.com/weseek/growi/issues"
   },
   },
   "scripts": {
   "scripts": {
     "build:dev:analyze": "cross-env ANALYZE=1 npm run build:dev",
     "build:dev:analyze": "cross-env ANALYZE=1 npm run build:dev",

+ 1 - 1
wercker.yml

@@ -143,7 +143,7 @@ release: # would be run on release branch
         git push --delete origin $TMP_RELEASE_BRANCH
         git push --delete origin $TMP_RELEASE_BRANCH
 
 
     - script:
     - script:
-      name: trigger crowi-plus-docker release pipeline
+      name: trigger growi-docker release pipeline
       code: sh ./bin/wercker/trigger-crowi-plus-docker.sh
       code: sh ./bin/wercker/trigger-crowi-plus-docker.sh
 
 
   after-steps:
   after-steps: