mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-11-03 23:27:31 -05:00
Updated to the latest version of Laravel
This commit is contained in:
Hillel Coren
parent
ddbc254d4b
commit
beede39e85
@ -15,7 +15,7 @@
|
|||||||
"omnipay/2checkout": "dev-master#e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",
|
"omnipay/2checkout": "dev-master#e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",
|
||||||
"omnipay/gocardless": "dev-master",
|
"omnipay/gocardless": "dev-master",
|
||||||
"omnipay/stripe": "2.3.0",
|
"omnipay/stripe": "2.3.0",
|
||||||
"laravel/framework": "5.2.22",
|
"laravel/framework": "5.2.*",
|
||||||
"laravelcollective/html": "5.2.*",
|
"laravelcollective/html": "5.2.*",
|
||||||
"laravelcollective/bus": "5.2.*",
|
"laravelcollective/bus": "5.2.*",
|
||||||
"symfony/css-selector": "~3.0",
|
"symfony/css-selector": "~3.0",
|
||||||
|
|||||||
92
composer.lock
generated
92
composer.lock
generated
@ -4,8 +4,8 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"hash": "a33dce96f4ded3fb269a6d9dcbf24b27",
|
"hash": "e5e8524886bd38794a15e406acc3745a",
|
||||||
"content-hash": "f73a83c64422ef3560da4adb988850ae",
|
"content-hash": "6b3f343959ba3f330c425325574dfe28",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "agmscode/omnipay-agms",
|
"name": "agmscode/omnipay-agms",
|
||||||
@ -123,12 +123,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/formers/former.git",
|
"url": "https://github.com/formers/former.git",
|
||||||
"reference": "e196c4336db77be97131f6a3b3c3b69b3a22b683"
|
"reference": "d97f907741323b390f43954a90a227921ecc6b96"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/formers/former/zipball/e196c4336db77be97131f6a3b3c3b69b3a22b683",
|
"url": "https://api.github.com/repos/formers/former/zipball/d97f907741323b390f43954a90a227921ecc6b96",
|
||||||
"reference": "e196c4336db77be97131f6a3b3c3b69b3a22b683",
|
"reference": "d97f907741323b390f43954a90a227921ecc6b96",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -174,7 +174,7 @@
|
|||||||
"foundation",
|
"foundation",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2016-03-02 17:21:21"
|
"time": "2016-03-16 01:43:45"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "anahkiasen/html-object",
|
"name": "anahkiasen/html-object",
|
||||||
@ -880,12 +880,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/delatbabel/omnipay-fatzebra.git",
|
"url": "https://github.com/delatbabel/omnipay-fatzebra.git",
|
||||||
"reference": "7b3cb869abe8327d4cf6ccc6591a89a95c02bfbc"
|
"reference": "d0a56a8704357d91457672741a48a4cb6c7ecd53"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/delatbabel/omnipay-fatzebra/zipball/7b3cb869abe8327d4cf6ccc6591a89a95c02bfbc",
|
"url": "https://api.github.com/repos/delatbabel/omnipay-fatzebra/zipball/d0a56a8704357d91457672741a48a4cb6c7ecd53",
|
||||||
"reference": "7b3cb869abe8327d4cf6ccc6591a89a95c02bfbc",
|
"reference": "d0a56a8704357d91457672741a48a4cb6c7ecd53",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -929,7 +929,7 @@
|
|||||||
"payment",
|
"payment",
|
||||||
"paystream"
|
"paystream"
|
||||||
],
|
],
|
||||||
"time": "2015-02-15 11:27:23"
|
"time": "2016-03-21 09:21:14"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "dercoder/omnipay-ecopayz",
|
"name": "dercoder/omnipay-ecopayz",
|
||||||
@ -1039,12 +1039,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/descubraomundo/omnipay-pagarme.git",
|
"url": "https://github.com/descubraomundo/omnipay-pagarme.git",
|
||||||
"reference": "528953568929b57189de16fa7431eaab75d61840"
|
"reference": "8571396139eb1fb1a7011450714a5e8d8d604d8c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/descubraomundo/omnipay-pagarme/zipball/528953568929b57189de16fa7431eaab75d61840",
|
"url": "https://api.github.com/repos/descubraomundo/omnipay-pagarme/zipball/8571396139eb1fb1a7011450714a5e8d8d604d8c",
|
||||||
"reference": "528953568929b57189de16fa7431eaab75d61840",
|
"reference": "8571396139eb1fb1a7011450714a5e8d8d604d8c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1081,7 +1081,7 @@
|
|||||||
"pay",
|
"pay",
|
||||||
"payment"
|
"payment"
|
||||||
],
|
],
|
||||||
"time": "2015-10-27 19:17:20"
|
"time": "2016-03-18 19:37:37"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "dioscouri/omnipay-cybersource",
|
"name": "dioscouri/omnipay-cybersource",
|
||||||
@ -1938,16 +1938,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/guzzle",
|
"name": "guzzlehttp/guzzle",
|
||||||
"version": "6.1.1",
|
"version": "6.2.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/guzzle/guzzle.git",
|
"url": "https://github.com/guzzle/guzzle.git",
|
||||||
"reference": "c6851d6e48f63b69357cbfa55bca116448140e0c"
|
"reference": "d094e337976dff9d8e2424e8485872194e768662"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c",
|
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662",
|
||||||
"reference": "c6851d6e48f63b69357cbfa55bca116448140e0c",
|
"reference": "d094e337976dff9d8e2424e8485872194e768662",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1963,7 +1963,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "6.1-dev"
|
"dev-master": "6.2-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -1996,7 +1996,7 @@
|
|||||||
"rest",
|
"rest",
|
||||||
"web service"
|
"web service"
|
||||||
],
|
],
|
||||||
"time": "2015-11-23 00:47:50"
|
"time": "2016-03-21 20:02:09"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/promises",
|
"name": "guzzlehttp/promises",
|
||||||
@ -2603,12 +2603,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/labs7in0/omnipay-wechat.git",
|
"url": "https://github.com/labs7in0/omnipay-wechat.git",
|
||||||
"reference": "4e279ff4535dfa0636a3d6af5c92b8e9dcc4311a"
|
"reference": "40c9f86df6573ad98ae1dd0d29712ccbc789a74e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/labs7in0/omnipay-wechat/zipball/4e279ff4535dfa0636a3d6af5c92b8e9dcc4311a",
|
"url": "https://api.github.com/repos/labs7in0/omnipay-wechat/zipball/40c9f86df6573ad98ae1dd0d29712ccbc789a74e",
|
||||||
"reference": "4e279ff4535dfa0636a3d6af5c92b8e9dcc4311a",
|
"reference": "40c9f86df6573ad98ae1dd0d29712ccbc789a74e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -2644,7 +2644,7 @@
|
|||||||
"purchase",
|
"purchase",
|
||||||
"wechat"
|
"wechat"
|
||||||
],
|
],
|
||||||
"time": "2015-11-16 11:04:21"
|
"time": "2016-03-18 09:59:11"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laracasts/presenter",
|
"name": "laracasts/presenter",
|
||||||
@ -2694,16 +2694,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v5.2.22",
|
"version": "v5.2.24",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "aec1b7cb9ec0bac0107361a3730cac9b6f945ef4"
|
"reference": "396297a5fd3c70c2fc1af68f09ee574a2380175c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/aec1b7cb9ec0bac0107361a3730cac9b6f945ef4",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/396297a5fd3c70c2fc1af68f09ee574a2380175c",
|
||||||
"reference": "aec1b7cb9ec0bac0107361a3730cac9b6f945ef4",
|
"reference": "396297a5fd3c70c2fc1af68f09ee574a2380175c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -2716,7 +2716,7 @@
|
|||||||
"monolog/monolog": "~1.11",
|
"monolog/monolog": "~1.11",
|
||||||
"mtdowling/cron-expression": "~1.0",
|
"mtdowling/cron-expression": "~1.0",
|
||||||
"nesbot/carbon": "~1.20",
|
"nesbot/carbon": "~1.20",
|
||||||
"paragonie/random_compat": "~1.1",
|
"paragonie/random_compat": "~1.4",
|
||||||
"php": ">=5.5.9",
|
"php": ">=5.5.9",
|
||||||
"psy/psysh": "0.7.*",
|
"psy/psysh": "0.7.*",
|
||||||
"swiftmailer/swiftmailer": "~5.1",
|
"swiftmailer/swiftmailer": "~5.1",
|
||||||
@ -2818,7 +2818,7 @@
|
|||||||
"framework",
|
"framework",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2016-02-27 22:09:19"
|
"time": "2016-03-22 13:45:19"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/socialite",
|
"name": "laravel/socialite",
|
||||||
@ -3815,7 +3815,7 @@
|
|||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/31394ce58d5999b6f49b321cb3547747837c1297",
|
"url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/77b316bd08c6b7a1e93721f15d1bfbd21a62ba6b",
|
||||||
"reference": "e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",
|
"reference": "e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
@ -4328,16 +4328,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "omnipay/eway",
|
"name": "omnipay/eway",
|
||||||
"version": "v2.2.0",
|
"version": "v2.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/omnipay-eway.git",
|
"url": "https://github.com/thephpleague/omnipay-eway.git",
|
||||||
"reference": "0dcf28596f0382fbfc3ee229e98e60798675ed16"
|
"reference": "1c953630f7097bfdeed200b17a847015a4df5607"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/omnipay-eway/zipball/0dcf28596f0382fbfc3ee229e98e60798675ed16",
|
"url": "https://api.github.com/repos/thephpleague/omnipay-eway/zipball/1c953630f7097bfdeed200b17a847015a4df5607",
|
||||||
"reference": "0dcf28596f0382fbfc3ee229e98e60798675ed16",
|
"reference": "1c953630f7097bfdeed200b17a847015a4df5607",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4381,7 +4381,7 @@
|
|||||||
"pay",
|
"pay",
|
||||||
"payment"
|
"payment"
|
||||||
],
|
],
|
||||||
"time": "2015-03-30 00:28:33"
|
"time": "2016-03-22 01:11:02"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "omnipay/firstdata",
|
"name": "omnipay/firstdata",
|
||||||
@ -5536,16 +5536,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "paragonie/random_compat",
|
"name": "paragonie/random_compat",
|
||||||
"version": "v1.2.2",
|
"version": "v1.4.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/paragonie/random_compat.git",
|
"url": "https://github.com/paragonie/random_compat.git",
|
||||||
"reference": "b3313b618f4edd76523572531d5d7e22fe747430"
|
"reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/b3313b618f4edd76523572531d5d7e22fe747430",
|
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
|
||||||
"reference": "b3313b618f4edd76523572531d5d7e22fe747430",
|
"reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -5580,7 +5580,7 @@
|
|||||||
"pseudorandom",
|
"pseudorandom",
|
||||||
"random"
|
"random"
|
||||||
],
|
],
|
||||||
"time": "2016-03-11 19:54:08"
|
"time": "2016-03-18 20:34:03"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "patricktalmadge/bootstrapper",
|
"name": "patricktalmadge/bootstrapper",
|
||||||
@ -8475,16 +8475,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpspec/phpspec",
|
"name": "phpspec/phpspec",
|
||||||
"version": "2.4.1",
|
"version": "2.5.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phpspec/phpspec.git",
|
"url": "https://github.com/phpspec/phpspec.git",
|
||||||
"reference": "5528ce1e93a1efa090c9404aba3395c329b4e6ed"
|
"reference": "385ecb015e97c13818074f1517928b24d4a26067"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpspec/phpspec/zipball/5528ce1e93a1efa090c9404aba3395c329b4e6ed",
|
"url": "https://api.github.com/repos/phpspec/phpspec/zipball/385ecb015e97c13818074f1517928b24d4a26067",
|
||||||
"reference": "5528ce1e93a1efa090c9404aba3395c329b4e6ed",
|
"reference": "385ecb015e97c13818074f1517928b24d4a26067",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -8549,7 +8549,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"tests"
|
"tests"
|
||||||
],
|
],
|
||||||
"time": "2016-01-01 10:17:54"
|
"time": "2016-03-20 20:34:32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpspec/prophecy",
|
"name": "phpspec/prophecy",
|
||||||
|
|||||||
@ -52,7 +52,7 @@ Note: we've recently updated this branch to Laravel 5.2. If you're upgrading her
|
|||||||
* [Debian and Nginx](https://www.rosehosting.com/blog/install-invoice-ninja-on-a-debian-7-vps/)
|
* [Debian and Nginx](https://www.rosehosting.com/blog/install-invoice-ninja-on-a-debian-7-vps/)
|
||||||
* [User Guide](https://www.invoiceninja.com/app-user-guide/)
|
* [User Guide](https://www.invoiceninja.com/app-user-guide/)
|
||||||
* [Developer Guide](https://www.invoiceninja.com/knowledgebase/developer-guide/)
|
* [Developer Guide](https://www.invoiceninja.com/knowledgebase/developer-guide/)
|
||||||
* [API Documentation](https://www.invoiceninja.com/knowledgebase/api-documentation/)
|
* [API Documentation](https://www.invoiceninja.com/api-documentation/)
|
||||||
* [Support Forum](https://www.invoiceninja.com/forums/forum/support/)
|
* [Support Forum](https://www.invoiceninja.com/forums/forum/support/)
|
||||||
* [Feature Roadmap](https://trello.com/b/63BbiVVe/)
|
* [Feature Roadmap](https://trello.com/b/63BbiVVe/)
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
@include('accounts.nav', ['selected' => ACCOUNT_API_TOKENS, 'advanced' => true])
|
@include('accounts.nav', ['selected' => ACCOUNT_API_TOKENS, 'advanced' => true])
|
||||||
|
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
{!! Button::normal(trans('texts.documentation'))->asLinkTo(NINJA_WEB_URL.'/knowledgebase/api-documentation/')->withAttributes(['target' => '_blank'])->appendIcon(Icon::create('info-sign')) !!}
|
{!! Button::normal(trans('texts.documentation'))->asLinkTo(NINJA_WEB_URL.'/api-documentation/')->withAttributes(['target' => '_blank'])->appendIcon(Icon::create('info-sign')) !!}
|
||||||
@if (Utils::isNinja())
|
@if (Utils::isNinja())
|
||||||
{!! Button::normal(trans('texts.zapier'))->asLinkTo(ZAPIER_URL)->withAttributes(['target' => '_blank']) !!}
|
{!! Button::normal(trans('texts.zapier'))->asLinkTo(ZAPIER_URL)->withAttributes(['target' => '_blank']) !!}
|
||||||
@endif
|
@endif
|
||||||
@ -51,4 +51,9 @@
|
|||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@if (Utils::isNinja() && !Utils::isReseller())
|
||||||
|
<p> </p>
|
||||||
|
<script src="https://zapier.com/zapbook/embed/widget.js?services=invoice-ninja&container=false&limit=6"></script>
|
||||||
|
@endif
|
||||||
|
|
||||||
@stop
|
@stop
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user