Explorar o código

Merge pull request #233 from crowi/wip-v1.6.2

Wip v1.6.2
Sotaro KARASAWA %!s(int64=8) %!d(string=hai) anos
pai
achega
8751a6adef
Modificáronse 4 ficheiros con 145 adicións e 131 borrados
  1. 9 0
      CHANGES.md
  2. 6 1
      app.json
  3. 129 129
      npm-shrinkwrap.json
  4. 1 1
      package.json

+ 9 - 0
CHANGES.md

@@ -1,6 +1,15 @@
 CHANGES
 CHANGES
 ========
 ========
 
 
+## 1.6.2
+
+- Feature: Support PlantUML
+- Feature: Support MathJax
+- Fix: API authentication conflicts header of Basic Auth (#226 Thanks @Charo-IT)
+- Fix: Cannot bookmark Portal page
+- Fix: Highlight searched keyword on search result page
+- And some refactorings, bug fixes, internal fixes. (Thaon, @hideo54, @Tamason)
+
 ## 1.6.1
 ## 1.6.1
 
 
 - Feature: Non-image file uploads and its settings,
 - Feature: Non-image file uploads and its settings,

+ 6 - 1
app.json

@@ -22,6 +22,11 @@
   "addons": [
   "addons": [
     "mongolab",
     "mongolab",
     "redistogo",
     "redistogo",
-    "bonsai"
+    {
+      "plan": "bonsai",
+      "options": {
+        "version": "5.1"
+      }
+    }
   ]
   ]
 }
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 129 - 129
npm-shrinkwrap.json


+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "crowi",
   "name": "crowi",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "The simple & powerful Wiki",
   "description": "The simple & powerful Wiki",
   "tags": [
   "tags": [
     "wiki",
     "wiki",

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio