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 #319

Browse Source
This commit is contained in:
Hillel Coren 2015-05-22 13:52:49 +03:00
parent d8e2aacece
commit 50e3008ebb
4 changed files with 68 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -33,9 +33,9 @@
"coatesap/omnipay-realex": "~2.0", "coatesap/omnipay-realex": "~2.0",
"fruitcakestudio/omnipay-sisow": "~2.0", "fruitcakestudio/omnipay-sisow": "~2.0",
"alfaproject/omnipay-skrill": "dev-master", "alfaproject/omnipay-skrill": "dev-master",
"illuminate/html": "5.*",
"omnipay/bitpay": "dev-master", "omnipay/bitpay": "dev-master",
"guzzlehttp/guzzle": "~4.0" "guzzlehttp/guzzle": "~4.0",
"laravelcollective/html": "~5.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "~4.0",

72
composer.lock generated
View File

@ -1,10 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "75169c1d348bf682bd06c75c84b19c0e", "hash": "a227afec5776c50509282b949ff6fd71",
"packages": [ "packages": [
{ {
"name": "alfaproject/omnipay-neteller", "name": "alfaproject/omnipay-neteller",
@ -120,12 +120,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/formers/former.git", "url": "https://github.com/formers/former.git",
"reference": "4a03cdd08f1bdd975bd2521bed74ab38bf590388" "reference": "e37cb69d12d4436282e6754800903d94788528f3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/formers/former/zipball/e37cb69d12d4436282e6754800903d94788528f3", "url": "https://api.github.com/repos/formers/former/zipball/e37cb69d12d4436282e6754800903d94788528f3",
"reference": "4a03cdd08f1bdd975bd2521bed74ab38bf590388", "reference": "e37cb69d12d4436282e6754800903d94788528f3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -171,7 +171,7 @@
"foundation", "foundation",
"laravel" "laravel"
], ],
"time": "2015-04-20 13:53:18" "time": "2015-05-06 00:01:16"
}, },
{ {
"name": "anahkiasen/html-object", "name": "anahkiasen/html-object",
@ -339,7 +339,7 @@
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Chumper/Datatable/zipball/d8a01807d0d0b46e6ff26d760934f885f4f48dc3", "url": "https://api.github.com/repos/Chumper/Datatable/zipball/7fa47cb5469f07c620fb69dee94b8e1a96943ee2",
"reference": "7fa47cb", "reference": "7fa47cb",
"shasum": "" "shasum": ""
}, },
@ -1768,16 +1768,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.0.28", "version": "v5.0.31",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "06a09429322cf53e5bd4587db1060f02a291562e" "reference": "db0a7400465df159ba8c6eaa954f97f50bc19687"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/06a09429322cf53e5bd4587db1060f02a291562e", "url": "https://api.github.com/repos/laravel/framework/zipball/db0a7400465df159ba8c6eaa954f97f50bc19687",
"reference": "06a09429322cf53e5bd4587db1060f02a291562e", "reference": "db0a7400465df159ba8c6eaa954f97f50bc19687",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1890,7 +1890,57 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2015-04-21 01:44:32" "time": "2015-05-11 22:15:00"
},
{
"name": "laravelcollective/html",
"version": "v5.0.4",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
"reference": "c55fda58b1a9a1b58bd04f97e0fb9ebc238a0a94"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/c55fda58b1a9a1b58bd04f97e0fb9ebc238a0a94",
"reference": "c55fda58b1a9a1b58bd04f97e0fb9ebc238a0a94",
"shasum": ""
},
"require": {
"illuminate/http": "~5.0",
"illuminate/routing": "~5.0",
"illuminate/session": "~5.0",
"illuminate/support": "~5.0",
"php": ">=5.4.0"
},
"require-dev": {
"mockery/mockery": "~0.9",
"phpunit/phpunit": "~4.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Collective\\Html\\": "src/"
},
"files": [
"src/helpers.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylorotwell@gmail.com"
},
{
"name": "Adam Engebretson",
"email": "adam@laravelcollective.com"
}
],
"time": "2015-05-06 14:23:37"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",

8
config/app.php
View File

@ -187,7 +187,7 @@ return [
'File' => 'Illuminate\Support\Facades\File', 'File' => 'Illuminate\Support\Facades\File',
//'Form' => 'Illuminate\Support\Facades\Form', //'Form' => 'Illuminate\Support\Facades\Form',
'Hash' => 'Illuminate\Support\Facades\Hash', 'Hash' => 'Illuminate\Support\Facades\Hash',
'HTML' => 'Illuminate\Support\Facades\HTML', //'HTML' => 'Illuminate\Support\Facades\HTML',
'Input' => 'Illuminate\Support\Facades\Input', 'Input' => 'Illuminate\Support\Facades\Input',
'Lang' => 'Illuminate\Support\Facades\Lang', 'Lang' => 'Illuminate\Support\Facades\Lang',
'Log' => 'Illuminate\Support\Facades\Log', 'Log' => 'Illuminate\Support\Facades\Log',
@ -244,8 +244,8 @@ return [
// Added Class Aliases // Added Class Aliases
'Utils' => 'App\Libraries\Utils', 'Utils' => 'App\Libraries\Utils',
'Form' => 'Illuminate\Html\FormFacade', 'Form' => 'Collective\Html\FormFacade',
'HTML' => 'Illuminate\Html\HtmlFacade', 'HTML' => 'Collective\Html\HtmlFacade',
'SSH' => 'Illuminate\Support\Facades\SSH', 'SSH' => 'Illuminate\Support\Facades\SSH',
'Alert' => 'Bootstrapper\Facades\Alert', 'Alert' => 'Bootstrapper\Facades\Alert',
'Badge' => 'Bootstrapper\Facades\Badge', 'Badge' => 'Bootstrapper\Facades\Badge',
@ -255,7 +255,7 @@ return [
'ButtonToolbar' => 'Bootstrapper\Facades\ButtonToolbar', 'ButtonToolbar' => 'Bootstrapper\Facades\ButtonToolbar',
'Carousel' => 'Bootstrapper\Facades\Carousel', 'Carousel' => 'Bootstrapper\Facades\Carousel',
'DropdownButton' => 'Bootstrapper\Facades\DropdownButton', 'DropdownButton' => 'Bootstrapper\Facades\DropdownButton',
'Form' => 'Bootstrapper\Facades\Form', //'Form' => 'Bootstrapper\Facades\Form', //need to clarify this guy
'Helpers' => 'Bootstrapper\Facades\Helpers', 'Helpers' => 'Bootstrapper\Facades\Helpers',
'Icon' => 'Bootstrapper\Facades\Icon', 'Icon' => 'Bootstrapper\Facades\Icon',
//'Image' => 'Bootstrapper\Facades\Image', //'Image' => 'Bootstrapper\Facades\Image',

2
resources/views/master.blade.php
View File

@ -15,7 +15,7 @@
<meta property="og:description" content="Simple, Intuitive Invoicing." /> <meta property="og:description" content="Simple, Intuitive Invoicing." />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="csrf-token" content="<?= csrf_token() ?>"> <meta name="csrf-token" content="{{ csrf_token() }}">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="//fonts.googleapis.com/css?family=Roboto:400,700,900,100" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Roboto:400,700,900,100" rel="stylesheet" type="text/css">