Merge branch 'release/0.14.0'

dreamfactorysoftware · Dec 29, 2017 · 2f82b39 · 2f82b39
2 parents cab7043 + c9b1110
commit 2f82b39
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.dreamfactory.php b/.dreamfactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * DreamFactory(tm) OAuth Service <http://github.com/dreamfactorysoftware/df-oauth>
- * Copyright 2012-2015 DreamFactory Software, Inc. <support@dreamfactory.com>
+ * Copyright 2012-2018 DreamFactory Software, Inc. <dspsupport@dreamfactory.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+## [0.14.0] - 2017-12-28
+### Added
+- Added package discovery
+### Changed
+- DF-1150 Update copyright and support email
+
 ## [0.13.0] - 2017-11-03
 - Added api required endpoint access exceptions
 - Upgrade Swagger to OpenAPI 3.0 specification
@@ -80,7 +86,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## 0.1.0 - 2015-10-24
 First official release working with the new [dreamfactory](https://github.com/dreamfactorysoftware/dreamfactory) project.
 
-[Unreleased]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.13.0...HEAD
+[Unreleased]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.14.0...HEAD
+[0.14.0]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.13.0...0.14.0
 [0.13.0]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.12.0...0.13.0
 [0.12.0]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.11.0...0.12.0
 [0.11.0]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.10.0...0.11.0

diff --git a/composer.json b/composer.json
@@ -20,13 +20,13 @@
     }
   ],
   "support":     {
-    "email":  "support@dreamfactory.com",
+    "email":  "dspsupport@dreamfactory.com",
     "source": "https://github.com/dreamfactorysoftware/df-oauth",
     "issues": "https://github.com/dreamfactorysoftware/df-oauth/issues",
     "wiki":   "https://wiki.dreamfactory.com"
   },
   "require":     {
-    "dreamfactory/df-core":              "~0.13.0",
+    "dreamfactory/df-core":              "~0.14.0",
     "laravel/socialite":                 "~2.0",
     "socialiteproviders/microsoft-live": "^2.0",
     "socialiteproviders/twitter":        "^2.0"
@@ -38,7 +38,12 @@
   },
   "extra":       {
     "branch-alias": {
-      "dev-develop": "0.13.x-dev"
+      "dev-develop": "0.14.x-dev"
+    },
+    "laravel": {
+      "providers": [
+        "DreamFactory\\Core\\OAuth\\ServiceProvider"
+      ]
     }
   }
 }