Explorar o código

Merge branch 'master' into feat/ldap-auth

Yuki Takei %!s(int64=8) %!d(string=hai) anos
pai
achega
42a7ef5f6e
Modificáronse 3 ficheiros con 11 adicións e 7 borrados
  1. 9 5
      CHANGES.md
  2. 1 1
      app.json
  3. 1 1
      package.json

+ 9 - 5
CHANGES.md

@@ -1,14 +1,18 @@
 CHANGES
 CHANGES
 ========
 ========
 
 
-## 2.2.3-RC
+## 2.2.4-RC
 
 
-* 
+## 2.2.3
 
 
-## 2.2.2
-
-* Improvement: Replace emojify.js with emojione
+* Fix: The server responds anything when using passport
+    * Degraded by 2.2.2 updates
 * Fix: Update `lastLoginAt` when login is success
 * Fix: Update `lastLoginAt` when login is success
+* Support: Replace moment with date-fns
+* Support: Upgrade react-bootstrap-typeahead
+* Improvement: Replace emojify.js with emojione
+
+## 2.2.2 (Missing number)
 
 
 ## 2.2.1
 ## 2.2.1
 
 

+ 1 - 1
app.json

@@ -26,7 +26,7 @@
     "mongolab",
     "mongolab",
     "redistogo",
     "redistogo",
     {
     {
-      "plan": "bonsai:sandbox-10",
+      "plan": "bonsai:sandbox-6",
       "options": {
       "options": {
         "version": "5.1"
         "version": "5.1"
       }
       }

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "crowi-plus",
   "name": "crowi-plus",
-  "version": "2.2.3-RC",
+  "version": "2.2.4-RC",
   "description": "Enhanced Crowi",
   "description": "Enhanced Crowi",
   "tags": [
   "tags": [
     "wiki",
     "wiki",