Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Lee Hicks committed Jan 29, 2016
1 parent e8caa3e commit 083d8a0
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
vendor
.idea
/public/dreamfactory
/public/swagger-ui
/public/df-swagger-ui
/workbench
composer.phar
_ide_helper.php
Expand Down
48 changes: 26 additions & 22 deletions composer.json-all-dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"name": "Arif Islam",
"email": "arifislam@dreamfactory.com"
},
{
"name": "David Weiner",
"email": "davidweiner@dreamfactory.com"
},
{
"name": "Jerry Ablan",
"email": "jerryablan@dreamfactory.com"
},
{
"name": "Lee Hicks",
"email": "leehicks@dreamfactory.com"
},
{
"name": "David Weiner",
"email": "davidweiner@dreamfactory.com"
}
],
"support": {
Expand All @@ -44,28 +44,30 @@
"require": {
"laravel/framework": "5.1.*",
"tymon/jwt-auth": "0.5.*",
"dreamfactory/df-managed": "2.0.*",
"dreamfactory/df-admin-app": "2.0.*",
"dreamfactory/df-core": "0.1.*",
"dreamfactory/df-aws": "0.1.*",
"dreamfactory/df-azure": "0.1.*",
"dreamfactory/df-rackspace": "0.1.*",
"dreamfactory/df-sqldb": "0.1.*",
"dreamfactory/df-mongodb": "0.1.*",
"dreamfactory/df-couchdb": "0.1.*",
"dreamfactory/df-rws": "0.1.*",
"dreamfactory/df-salesforce": "0.1.*",
"dreamfactory/df-soap": "0.1.*",
"dreamfactory/df-user": "0.1.*",
"dreamfactory/df-oauth": "0.1.*",
"dreamfactory/df-adldap": "0.1.*"
"dreamfactory/df-managed": "dev-develop as dev-master",
"dreamfactory/df-admin-app": "dev-develop as dev-master",
"dreamfactory/df-swagger-ui": "dev-develop as dev-master",
"dreamfactory/df-core": "dev-develop as dev-master",
"dreamfactory/df-aws": "dev-develop as dev-master",
"dreamfactory/df-azure": "dev-develop as dev-master",
"dreamfactory/df-rackspace": "dev-develop as dev-master",
"dreamfactory/df-sqldb": "dev-develop as dev-master",
"dreamfactory/df-mongodb": "dev-develop as dev-master",
"dreamfactory/df-couchdb": "dev-develop as dev-master",
"dreamfactory/df-rws": "dev-develop as dev-master",
"dreamfactory/df-salesforce": "dev-develop as dev-master",
"dreamfactory/df-soap": "dev-develop as dev-master",
"dreamfactory/df-user": "dev-develop as dev-master",
"dreamfactory/df-oauth": "dev-develop as dev-master",
"dreamfactory/df-adldap": "dev-develop as dev-master"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "~2.0",
"laracasts/generators": "~1.0",
"laracasts/testdummy": "~2.0",
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1"
"phpspec/phpspec": "~2.1",
"laravel/homestead": "dev-master"
},
"autoload": {
"classmap": [
Expand All @@ -84,12 +86,14 @@
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize",
"php artisan dreamfactory:pull-migrations"
"php artisan dreamfactory:pull-migrations",
"php artisan dreamfactory:homestead-config"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize",
"php artisan dreamfactory:pull-migrations"
"php artisan dreamfactory:pull-migrations",
"php artisan dreamfactory:homestead-config"
]
},
"config": {
Expand Down
27 changes: 15 additions & 12 deletions composer.json-min-dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"name": "Arif Islam",
"email": "arifislam@dreamfactory.com"
},
{
"name": "David Weiner",
"email": "davidweiner@dreamfactory.com"
},
{
"name": "Jerry Ablan",
"email": "jerryablan@dreamfactory.com"
},
{
"name": "Lee Hicks",
"email": "leehicks@dreamfactory.com"
},
{
"name": "David Weiner",
"email": "davidweiner@dreamfactory.com"
}
],
"support": {
Expand All @@ -35,21 +35,22 @@
},
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [],
"require": {
"laravel/framework": "5.1.*",
"tymon/jwt-auth": "0.5.*",
"dreamfactory/df-managed": "2.0.*",
"dreamfactory/df-admin-app": "2.0.*",
"dreamfactory/df-core": "0.1.*",
"dreamfactory/df-sqldb": "0.1.*"
"dreamfactory/df-managed": "dev-develop as dev-master",
"dreamfactory/df-admin-app": "dev-develop as dev-master",
"dreamfactory/df-swagger-ui": "dev-develop as dev-master",
"dreamfactory/df-core": "dev-develop as dev-master",
"dreamfactory/df-sqldb": "dev-develop as dev-master"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "~2.0",
"laracasts/generators": "~1.0",
"laracasts/testdummy": "~2.0",
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1"
"phpspec/phpspec": "~2.1",
"laravel/homestead": "dev-master"
},
"autoload": {
"classmap": [
Expand All @@ -68,12 +69,14 @@
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize",
"php artisan dreamfactory:pull-migrations"
"php artisan dreamfactory:pull-migrations",
"php artisan dreamfactory:homestead-config"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize",
"php artisan dreamfactory:pull-migrations"
"php artisan dreamfactory:pull-migrations",
"php artisan dreamfactory:homestead-config"
]
},
"config": {
Expand Down
55 changes: 0 additions & 55 deletions pull_migrations
View file

This file was deleted.

0 comments on commit 083d8a0

Please sign in to comment.