Merge pull request #196 from stormpath/release-2.2.0

Release 2.2.0
stormpath · Nov 7, 2015 · dd28f14 · dd28f14
2 parents f9ec50c + 7a071fb
commit dd28f14
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 7 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -6,15 +6,27 @@ Change Log
 
 All library changes, in descending order.
 
-Version 2.1.1
+Version 2.2.1
 --------------
 
-** Not Yet Released **
+**Not Yet Released**
+
+
+Version 2.2.0
+--------------
+
+**Released on November 6, 2015.**
+
+- Implemented the password grant flow on the ``/oauth/token`` endpoint, this will
+  be useful for mobile applications and single-page applications that don't use
+  cookie authentication
+
+- The OAuth2 token endpoint is now enabled by default
 
 Version 2.1.0
 --------------
 
-** Released on October 30, 2015.**
+**Released on October 30, 2015.**
 
 - Internal refactor of config parser.
 - Social login support for front-end applications.

diff --git a/docs/contributors.rst b/docs/contributors.rst
@@ -111,5 +111,14 @@ JrodManU has contributed documentation fixes project.
 
 - Github: https://github.com/JrodManU
 
+
+Pierre-David Bélanger
+*********************
+
+Pierre has contributed a patch to the project.
+
+- Github: https://github.com/pierredavidbelanger
+- Website: http://www.pjer.ca/
+
 .. _Stormpath: https://stormpath.com/
 .. _an email: info@stormpath.com
diff --git a/docs/upgrading.rst b/docs/upgrading.rst
@@ -7,12 +7,34 @@ Upgrade Guide
 This page contains specific upgrading instructions to help you migrate between
 Express-Stormpath releases.
 
-Version 2.0.14 -> Version 2.1.0
+Version 2.1.0 -> Version 2.2.0
 --------------------------------
 
-**No changes needed!**
+**Changes may be needed**
+
+The Oauth2 endpoint is now enabled by default.  You no longer need to use this
+configuration option is you want to enable the OAuth2 endpoint:
+
+.. code-block:: javascript
+
+    stormpath.init(app, {
+      api: true
+    });
+
+If you wish to *disable* the Oauth2 endpoint you can do so like this:
 
-Version 2.0.14 -> Version 2.0.15
+.. code-block:: javascript
+
+    stormpath.init(app, {
+      web: {
+        oauth2: {
+          enabled: false
+        }
+      }
+    });
+
+
+Version 2.0.14 -> Version 2.1.0
 --------------------------------
 
 **No changes needed!**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "express-stormpath",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Build simple, secure web applications with Stormpath and Express!",
   "keywords": [
     "express",