Skip to content

Commit

Permalink
Merge branch 'release/2.11.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lee Hicks committed Jan 26, 2018
2 parents 7c61434 + 22f6fdc commit a50cfd8
Show file tree
Hide file tree
Showing 9 changed files with 402 additions and 295 deletions.
3 changes: 3 additions & 0 deletions .env-dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ APP_KEY=
#DF_PYTHON_PATH=/usr/local/bin/python
## protocol to use for Node.js and Python when making internal calls back to DreamFactory, http or https
#DF_SCRIPTING_DEFAULT_PROTOCOL=http
## Characters limit for script to run inline. When this limit exceeds script will be written in file and executed.
## This applies to NodeJS and Python scripting only. NOTE: This is number of characters in script.
#DF_SCRIPT_INLINE_CHAR_LIMIT=25000

##------------------------------------------------------------------------------
## API Settings
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
## [2.11.1] - 2018-01-25
### Added
- Updated vagrant configuration script

## [2.11.0] - 2017-12-29
### Added
- Added GraphQL API interface for database services - beta
Expand Down Expand Up @@ -218,7 +222,8 @@ For older installs, see DF_CIPHER in .env or .env-dist for more details.
## 2.0.0 - 2015-10-27
First official release of the new open-source DreamFactory project.

[Unreleased]: https://github.com/dreamfactorysoftware/dreamfactory/compare/2.11.0...HEAD
[Unreleased]: https://github.com/dreamfactorysoftware/dreamfactory/compare/2.11.1...HEAD
[2.11.1]: https://github.com/dreamfactorysoftware/dreamfactory/compare/2.11.0...2.11.1
[2.11.0]: https://github.com/dreamfactorysoftware/dreamfactory/compare/2.10.0...2.11.0
[2.10.0]: https://github.com/dreamfactorysoftware/dreamfactory/compare/2.9.0...2.10.0
[2.9.0]: https://github.com/dreamfactorysoftware/dreamfactory/compare/2.8.1...2.9.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## DreamFactory 2.11.0
## DreamFactory 2.11.1

[![License](https://poser.pugx.org/dreamfactory/dreamfactory/license.svg)](http://www.apache.org/licenses/LICENSE-2.0)

Expand Down
28 changes: 14 additions & 14 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,28 @@
"repositories": [
],
"require": {
"dreamfactory/df-admin-app": "~2.13.0",
"dreamfactory/df-admin-app": "~2.14.0",
"dreamfactory/df-api-docs-ui": "~1.2.0",
"dreamfactory/df-apidoc": "~0.6.0",
"dreamfactory/df-aws": "~0.15.0",
"dreamfactory/df-azure": "~0.15.0",
"dreamfactory/df-aws": "~0.15.1",
"dreamfactory/df-azure": "~0.15.1",
"dreamfactory/df-cache": "~0.11.0",
"dreamfactory/df-cassandra": "~0.12.0",
"dreamfactory/df-core": "~0.14.0",
"dreamfactory/df-couchbase": "~0.10.0",
"dreamfactory/df-couchdb": "~0.15.0",
"dreamfactory/df-cassandra": "~0.12.1",
"dreamfactory/df-core": "~0.14.1",
"dreamfactory/df-couchbase": "~0.10.1",
"dreamfactory/df-couchdb": "~0.15.1",
"dreamfactory/df-email": "~0.8.0",
"dreamfactory/df-file": "~0.6.0",
"dreamfactory/df-file": "~0.6.1",
"dreamfactory/df-filemanager-app": "~0.3.0",
"dreamfactory/df-firebird": "~0.7.0",
"dreamfactory/df-firebird": "~0.7.1",
"dreamfactory/df-git": "~0.3.0",
"dreamfactory/df-graphql": "~0.1.0",
"dreamfactory/df-mongodb": "~0.15.0",
"dreamfactory/df-mongodb": "~0.15.1",
"dreamfactory/df-oauth": "~0.14.0",
"dreamfactory/df-rackspace": "~0.14.0",
"dreamfactory/df-rws": "~0.14.0",
"dreamfactory/df-script": "~0.8.0",
"dreamfactory/df-sqldb": "~0.15.0",
"dreamfactory/df-rackspace": "~0.14.1",
"dreamfactory/df-rws": "~0.14.1",
"dreamfactory/df-script": "~0.8.1",
"dreamfactory/df-sqldb": "~0.15.1",
"dreamfactory/df-system": "~0.1.0",
"dreamfactory/df-user": "~0.14.0",
"predis/predis": "~1.0",
Expand Down
28 changes: 14 additions & 14 deletions composer.json-dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,28 @@
"repositories": [
],
"require": {
"dreamfactory/df-admin-app": "~2.13.0",
"dreamfactory/df-admin-app": "~2.14.0",
"dreamfactory/df-api-docs-ui": "~1.2.0",
"dreamfactory/df-apidoc": "~0.6.0",
"dreamfactory/df-aws": "~0.15.0",
"dreamfactory/df-azure": "~0.15.0",
"dreamfactory/df-aws": "~0.15.1",
"dreamfactory/df-azure": "~0.15.1",
"dreamfactory/df-cache": "~0.11.0",
"dreamfactory/df-cassandra": "~0.12.0",
"dreamfactory/df-core": "~0.14.0",
"dreamfactory/df-couchbase": "~0.10.0",
"dreamfactory/df-couchdb": "~0.15.0",
"dreamfactory/df-cassandra": "~0.12.1",
"dreamfactory/df-core": "~0.14.1",
"dreamfactory/df-couchbase": "~0.10.1",
"dreamfactory/df-couchdb": "~0.15.1",
"dreamfactory/df-email": "~0.8.0",
"dreamfactory/df-file": "~0.6.0",
"dreamfactory/df-file": "~0.6.1",
"dreamfactory/df-filemanager-app": "~0.3.0",
"dreamfactory/df-firebird": "~0.7.0",
"dreamfactory/df-firebird": "~0.7.1",
"dreamfactory/df-git": "~0.3.0",
"dreamfactory/df-graphql": "~0.1.0",
"dreamfactory/df-mongodb": "~0.15.0",
"dreamfactory/df-mongodb": "~0.15.1",
"dreamfactory/df-oauth": "~0.14.0",
"dreamfactory/df-rackspace": "~0.14.0",
"dreamfactory/df-rws": "~0.14.0",
"dreamfactory/df-script": "~0.8.0",
"dreamfactory/df-sqldb": "~0.15.0",
"dreamfactory/df-rackspace": "~0.14.1",
"dreamfactory/df-rws": "~0.14.1",
"dreamfactory/df-script": "~0.8.1",
"dreamfactory/df-sqldb": "~0.15.1",
"dreamfactory/df-system": "~0.1.0",
"dreamfactory/df-user": "~0.14.0",
"predis/predis": "~1.0",
Expand Down
Loading

0 comments on commit a50cfd8

Please sign in to comment.