Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2016-07-02 23:18:15 +03:00
commit d3ffb652cb
4 changed files with 721 additions and 816 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -1,7 +1,6 @@
APP_ENV=production APP_ENV=production
APP_DEBUG=false APP_DEBUG=false
APP_URL=http://ninja.dev APP_URL=http://ninja.dev
APP_CIPHER=rijndael-128
APP_KEY=SomeRandomString APP_KEY=SomeRandomString
DB_TYPE=mysql DB_TYPE=mysql

3
composer.json
View File

@ -20,7 +20,6 @@
"omnipay/stripe": "dev-master", "omnipay/stripe": "dev-master",
"laravel/framework": "5.2.*", "laravel/framework": "5.2.*",
"laravelcollective/html": "5.2.*", "laravelcollective/html": "5.2.*",
"laravelcollective/bus": "5.2.*",
"symfony/css-selector": "~3.0", "symfony/css-selector": "~3.0",
"patricktalmadge/bootstrapper": "5.5.x", "patricktalmadge/bootstrapper": "5.5.x",
"anahkiasen/former": "4.0.*@dev", "anahkiasen/former": "4.0.*@dev",
@ -28,8 +27,6 @@
"omnipay/omnipay": "~2.3", "omnipay/omnipay": "~2.3",
"intervention/image": "dev-master", "intervention/image": "dev-master",
"webpatser/laravel-countries": "dev-master", "webpatser/laravel-countries": "dev-master",
"doctrine/dbal": "2.5.x",
"jsanc623/phpbenchtime": "2.x",
"lokielse/omnipay-alipay": "dev-master", "lokielse/omnipay-alipay": "dev-master",
"coatesap/omnipay-datacash": "~2.0", "coatesap/omnipay-datacash": "~2.0",
"mfauveau/omnipay-pacnet": "~2.0", "mfauveau/omnipay-pacnet": "~2.0",

1531
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
config/app.php
View File

@ -84,7 +84,7 @@ return [
'key' => env('APP_KEY', 'SomeRandomString'), 'key' => env('APP_KEY', 'SomeRandomString'),
'cipher' => env('APP_CIPHER', MCRYPT_RIJNDAEL_128), 'cipher' => env('APP_CIPHER', 'AES-256-CBC'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------