Merge pull request #211 from weseek/master

release 2.2.4

CHANGES.md

@@ -1,17 +1,23 @@
 CHANGES
 ========
 
+## 2.2.4
+
+* Fix: googleapis v23.0.0 lost the function `oauth2Client.setCredentials`
+    * Degraded by 2.2.2 updates
+* Fix: HeaderSearchBox didn't append 'q=' param when searching
+    * Degraded by 2.2.3 updates
+
 ## 2.2.3
 
 * Fix: The server responds anything when using passport
     * Degraded by 2.2.2 updates
+* Fix: Update `lastLoginAt` when login is success
 * Support: Replace moment with date-fns
 * Support: Upgrade react-bootstrap-typeahead
-
-## 2.2.2
-
 * Improvement: Replace emojify.js with emojione
-* Fix: Update `lastLoginAt` when login is success
+
+## 2.2.2 (Missing number)
 
 ## 2.2.1
 

lib/util/googleAuth.js

@@ -49,9 +49,7 @@ module.exports = function(config) {
         return callback(new Error('[googleAuth.handleCallback] Error to get token.'), null);
       }
 
-      oauth2Client.setCredentials({
-        access_token: tokens.access_token,
-      });
+      oauth2Client.credentials = tokens;
 
       var oauth2 = google.oauth2('v2');
       oauth2.userinfo.get({}, function(err, response) {

package.json

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

resource/js/components/HeaderSearchBox/SearchForm.js

@@ -121,6 +121,7 @@ export default class SearchForm extends React.Component {
           <InputGroup>
             <AsyncTypeahead
               ref={ref => this._typeahead = ref}
+              name="q"
               isLoading={this.state.isLoading}
               labelKey="path"
               minLength={2}