Merge pull request #3 from yuki-takei/master

merge master into feature-plugin2

CHANGES.md

@@ -1,6 +1,15 @@
 CHANGES
 ========
 
+## 1.6.0
+
+- I18N
+- Improved diff view
+- - Minus search
+- - Supports Elasticsearch 5.x
+- Special thank you for the great pull requests: @b4b4r07 @kaz @hasete2 @okonomi
+- And also special thanks for the translation: @Hidsm
+
 ## 1.5.3
 
 * Added node-shrinkwrap.json

README.md

@@ -4,7 +4,7 @@ Crowi - The Simple & Powerful Communication Tool Based on Wiki
 ================================================================
 
 
-[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/crowi/crowi/tree/v1.5.3)
+[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/crowi/crowi/tree/v1.6.0)
 
 [![Circle CI](https://circleci.com/gh/crowi/crowi.svg?style=svg)](https://circleci.com/gh/crowi/crowi)
 [![Join the chat at https://gitter.im/crowi/general](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/crowi/general)
@@ -37,7 +37,7 @@ Dependencies
 
 * Node.js (6.x)
 * MongoDB
-* Elasticsearch (optional)
+* Elasticsearch (optional) ([Doc is here](https://github.com/crowi/crowi/wiki/Configure-Search-Functions))
 * Redis (optional)
 * Amazon S3 (optional)
 * Google Project (optional)

lib/views/layout/layout.html

@@ -15,6 +15,8 @@
 
   <script src="{{ assets('/js/bundled.js') }}"></script>
   <link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
+  <!-- Font Awesome -->
+  <link href='//cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css' rel='stylesheet' type='text/css'>
 </head>
 {% endblock %}
 

package.json

@@ -57,7 +57,6 @@
     "express": "~4.14.0",
     "express-form": "~0.12.0",
     "express-session": "~1.14.0",
-    "font-awesome": "~4.7.0",
     "googleapis": "=12.3.0",
     "gulp": "~3.9.0",
     "gulp-concat": "~2.6.0",

public/apple-touch-icon-114x114-precomposed.png

@@ -1 +0,0 @@
-../../node_modules/diff2html/dist

public/emoji_images

@@ -1 +0,0 @@
-../node_modules/emojify.js/dist/images

public/favicon.ico

@@ -1 +0,0 @@
-../node_modules/font-awesome/fonts

public/nginx-mime.types

@@ -3,8 +3,9 @@ import emojify from 'emojify.js';
 export default class Emoji {
 
   constructor() {
+    // see https://github.com/Ranks/emojify.js/issues/123
     emojify.setConfig({
-      img_dir: '/emoji_images/basic',
+      img_dir: 'https://github.global.ssl.fastly.net/images/icons/emoji/',
     });
   }