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

Working on Laravel 5.4

Browse Source
This commit is contained in:
Hillel Coren 2018-02-22 12:06:32 +02:00
parent f7e29a325f
commit fbfa477c18
5 changed files with 885 additions and 861 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.json
View File

@ -24,7 +24,6 @@
"barryvdh/laravel-debugbar": "~2.2",
"barryvdh/laravel-ide-helper": "~2.2",
"cerdic/css-tidy": "~v1.5",
"chumper/datatable": "dev-develop#04ef2bf",
"cleverit/ubl_invoice": "1.*",
"codedge/laravel-selfupdater": "5.x-dev",
"collizo4sky/omnipay-wepay": "dev-address-fix",
@ -41,11 +40,10 @@
"jlapp/swaggervel": "master-dev",
"jonnyw/php-phantomjs": "4.*",
"laracasts/presenter": "dev-master",
"laravel/framework": "5.3.*",
"laravel/framework": "5.4.*",
"laravel/legacy-encrypter": "^1.0",
"laravel/socialite": "~2.0",
"laravelcollective/bus": "5.3.*",
"laravelcollective/html": "5.3.*",
"laravel/socialite": "~3.0",
"laravelcollective/html": "5.4.*",
"league/flysystem-aws-s3-v3": "~1.0",
"league/flysystem-rackspace": "~1.0",
"league/fractal": "0.13.*",
@ -70,7 +68,7 @@
"codeception/c3": "~2.0",
"codeception/codeception": "2.3.3",
"phpspec/phpspec": "~2.1",
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "~5.7"
},
"autoload": {
"classmap": [

1722
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

10
config/app.php
View File

@ -149,7 +149,6 @@ return [
'Bootstrapper\BootstrapperL5ServiceProvider',
'Former\FormerServiceProvider',
'Barryvdh\Debugbar\ServiceProvider',
'Chumper\Datatable\DatatableServiceProvider',
'Intervention\Image\ImageServiceProvider',
'Webpatser\Countries\CountriesServiceProvider',
'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
@ -157,7 +156,7 @@ return [
'Jlapp\Swaggervel\SwaggervelServiceProvider',
'Maatwebsite\Excel\ExcelServiceProvider',
Websight\GcsProvider\CloudStorageServiceProvider::class,
'Jaybizzle\LaravelCrawlerDetect\LaravelCrawlerDetectServiceProvider',
//'Jaybizzle\LaravelCrawlerDetect\LaravelCrawlerDetectServiceProvider',
Codedge\Updater\UpdaterServiceProvider::class,
Nwidart\Modules\LaravelModulesServiceProvider::class,
Barryvdh\Cors\ServiceProvider::class,
@ -174,7 +173,7 @@ return [
'App\Providers\RouteServiceProvider',
'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
'Davibennun\LaravelPushNotification\LaravelPushNotificationServiceProvider',
//'Davibennun\LaravelPushNotification\LaravelPushNotificationServiceProvider',
],
@ -253,7 +252,6 @@ return [
'Typeahead' => 'Bootstrapper\Facades\Typeahead',
'Typography' => 'Bootstrapper\Facades\Typography',
'Former' => 'Former\Facades\Former',
'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
'Omnipay' => 'Omnipay\Omnipay',
'CreditCard' => 'Omnipay\Common\CreditCard',
'Image' => 'Intervention\Image\Facades\Image',
@ -262,8 +260,8 @@ return [
'Rocketeer' => 'Rocketeer\Facades\Rocketeer',
'Socialite' => 'Laravel\Socialite\Facades\Socialite',
'Excel' => 'Maatwebsite\Excel\Facades\Excel',
'PushNotification' => 'Davibennun\LaravelPushNotification\Facades\PushNotification',
'Crawler' => 'Jaybizzle\LaravelCrawlerDetect\Facades\LaravelCrawlerDetect',
//'PushNotification' => 'Davibennun\LaravelPushNotification\Facades\PushNotification',
//'Crawler' => 'Jaybizzle\LaravelCrawlerDetect\Facades\LaravelCrawlerDetect',
'Updater' => Codedge\Updater\UpdaterFacade::class,
'Module' => Nwidart\Modules\Facades\Module::class,

2
resources/views/partials/dropzone.blade.php
View File

@ -4,7 +4,7 @@ window.countUploadingDocuments = 0;
window.dropzone = new Dropzone('#document-upload .dropzone', {
url: {!! json_encode(url('documents')) !!},
params: {
'_token': '{{ Session::getToken() }}',
'_token': '{{ Session::token() }}',
'is_default': {{ isset($isDefault) && $isDefault ? '1' : '0' }},
},
acceptedFiles: {!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},

2
resources/views/proposals/grapesjs.blade.php
View File

@ -30,7 +30,7 @@ $(function() {
@endif
uploadName: 'files',
params: {
'_token': '{{ Session::getToken() }}',
'_token': '{{ Session::token() }}',
'grapesjs': true,
}
}