mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
merging changes
This commit is contained in:
Hillel Coren
parent
78be769c8d
commit
7fa754c067
@ -9,19 +9,8 @@
|
|||||||
@stop
|
@stop
|
||||||
|
|
||||||
@section('body')
|
@section('body')
|
||||||
|
<!--<script>
|
||||||
{{ Form::open(array('url' => 'get_started', 'id' => 'startForm')) }}
|
|
||||||
{{ Form::hidden('guest_key') }}
|
|
||||||
{{ Form::close() }}
|
|
||||||
|
|
||||||
<script>
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
|
||||||
|
|
||||||
if (isStorageSupported()) {
|
|
||||||
$('[name="guest_key"]').val(localStorage.getItem('guest_key'));
|
|
||||||
}
|
|
||||||
|
|
||||||
var $window = $(window);
|
var $window = $(window);
|
||||||
$('section[data-type="background"]').each(function () {
|
$('section[data-type="background"]').each(function () {
|
||||||
var $bgobj = $(this);
|
var $bgobj = $(this);
|
||||||
@ -32,29 +21,16 @@
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
</script>-->
|
||||||
function isStorageSupported() {
|
|
||||||
try {
|
|
||||||
return 'localStorage' in window && window['localStorage'] !== null;
|
|
||||||
} catch (e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getStarted() {
|
|
||||||
$('#startForm').submit();
|
|
||||||
}
|
|
||||||
|
|
||||||
</script>
|
|
||||||
<div class="navbar" style="margin-bottom:0px">
|
<div class="navbar" style="margin-bottom:0px">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="navbar-inner">
|
<div class="navbar-inner">
|
||||||
<a class="brand" href="/"><img src=
|
<a class="brand" href="#"><img src=
|
||||||
"images/invoiceninja-logo.png"></a>
|
"images/invoiceninja-logo.png"></a>
|
||||||
<ul class="navbar-list">
|
<ul class="navbar-list">
|
||||||
<li>{{ link_to('about', 'About Us' ) }}</li>
|
<li>{{ link_to('about_us', 'About Us' ) }}</li>
|
||||||
<li>{{ link_to('contact', 'Contact Us' ) }}</li>
|
<li>{{ link_to('contact_us', 'Contact Us' ) }}</li>
|
||||||
<li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
|
<li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -86,6 +62,7 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-5">
|
<div class="col-md-5">
|
||||||
<div class="screendump">
|
<div class="screendump">
|
||||||
|
<img src="images/about1.jpg">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-7">
|
<div class="col-md-7">
|
||||||
@ -105,12 +82,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-5">
|
<div class="col-md-5">
|
||||||
<div class="screendump">
|
<div class="screendump">
|
||||||
|
<img src="images/about2.jpg">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<!--
|
|
||||||
<section class="about center white-bg">
|
<section class="about center white-bg">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -125,7 +102,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
-->
|
|
||||||
<section class="upper-footer">
|
<section class="upper-footer">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -158,9 +134,7 @@
|
|||||||
|
|
||||||
<div class="navbar-inner">
|
<div class="navbar-inner">
|
||||||
<ul class="navbar-list">
|
<ul class="navbar-list">
|
||||||
<li>{{ link_to('about', 'About Us' ) }}</li>
|
<li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li>
|
||||||
<li>{{ link_to('contact', 'Contact Us' ) }}</li>
|
|
||||||
<li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
|||||||
@ -17,15 +17,6 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
var $window = $(window);
|
|
||||||
$('section[data-type="background"]').each(function () {
|
|
||||||
var $bgobj = $(this);
|
|
||||||
$(window).scroll(function () {
|
|
||||||
var yPos = -($window.scrollTop() / $bgobj.data('speed'));
|
|
||||||
var coords = '50% ' + yPos + 'px';
|
|
||||||
$bgobj.css({ backgroundPosition: coords });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
$("#feedbackSubmit").click(function() {
|
$("#feedbackSubmit").click(function() {
|
||||||
//clear any errors
|
//clear any errors
|
||||||
contactForm.clearErrors();
|
contactForm.clearErrors();
|
||||||
|
|||||||
@ -16,16 +16,6 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
var $window = $(window);
|
|
||||||
$('section[data-type="background"]').each(function () {
|
|
||||||
var $bgobj = $(this);
|
|
||||||
$(window).scroll(function () {
|
|
||||||
var yPos = -($window.scrollTop() / $bgobj.data('speed'));
|
|
||||||
var coords = '50% ' + yPos + 'px';
|
|
||||||
$bgobj.css({ backgroundPosition: coords });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
if (isStorageSupported()) {
|
if (isStorageSupported()) {
|
||||||
$('[name="guest_key"]').val(localStorage.getItem('guest_key'));
|
$('[name="guest_key"]').val(localStorage.getItem('guest_key'));
|
||||||
}
|
}
|
||||||
|
|||||||
284
composer.lock
generated
284
composer.lock
generated
@ -107,12 +107,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Anahkiasen/rocketeer.git",
|
"url": "https://github.com/Anahkiasen/rocketeer.git",
|
||||||
"reference": "f25f73671938cf8a29b11c3c8b773e47f78663ff"
|
"reference": "cc287bee0344b64e09eb970a357387c01db327bf"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Anahkiasen/rocketeer/zipball/f25f73671938cf8a29b11c3c8b773e47f78663ff",
|
"url": "https://api.github.com/repos/Anahkiasen/rocketeer/zipball/cc287bee0344b64e09eb970a357387c01db327bf",
|
||||||
"reference": "f25f73671938cf8a29b11c3c8b773e47f78663ff",
|
"reference": "cc287bee0344b64e09eb970a357387c01db327bf",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -143,14 +143,14 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-develop": "1.2-dev"
|
"dev-develop": "1.3-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Rocketeer\\": [
|
"Rocketeer\\": [
|
||||||
"src/Rocketeer",
|
"src/Rocketeer",
|
||||||
"tests/"
|
"tests"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -170,7 +170,7 @@
|
|||||||
"laravel",
|
"laravel",
|
||||||
"ssh"
|
"ssh"
|
||||||
],
|
],
|
||||||
"time": "2014-02-21 18:34:20"
|
"time": "2014-03-08 19:06:58"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "anahkiasen/underscore-php",
|
"name": "anahkiasen/underscore-php",
|
||||||
@ -221,18 +221,18 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/barryvdh/laravel-debugbar.git",
|
"url": "https://github.com/barryvdh/laravel-debugbar.git",
|
||||||
"reference": "7ffde7c3627e18760a2713cd0260472436fe488c"
|
"reference": "e94bed1e6276dab47699179dceee694bb6713606"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/7ffde7c3627e18760a2713cd0260472436fe488c",
|
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/e94bed1e6276dab47699179dceee694bb6713606",
|
||||||
"reference": "7ffde7c3627e18760a2713cd0260472436fe488c",
|
"reference": "e94bed1e6276dab47699179dceee694bb6713606",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"illuminate/filesystem": "~4.0",
|
"illuminate/filesystem": "~4.0",
|
||||||
"illuminate/support": "~4.0",
|
"illuminate/support": "~4.0",
|
||||||
"maximebf/debugbar": "~1.9",
|
"maximebf/debugbar": "1.9.x",
|
||||||
"php": ">=5.3.0",
|
"php": ">=5.3.0",
|
||||||
"symfony/finder": "~2.3"
|
"symfony/finder": "~2.3"
|
||||||
},
|
},
|
||||||
@ -260,7 +260,7 @@
|
|||||||
"profiler",
|
"profiler",
|
||||||
"webprofiler"
|
"webprofiler"
|
||||||
],
|
],
|
||||||
"time": "2014-02-24 15:47:08"
|
"time": "2014-03-07 14:52:36"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "chumper/datatable",
|
"name": "chumper/datatable",
|
||||||
@ -367,12 +367,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Codeception/Codeception.git",
|
"url": "https://github.com/Codeception/Codeception.git",
|
||||||
"reference": "57072cb9dbf23dfd7f2806de61e54ccc57cbbdef"
|
"reference": "23d5bf8e5976ac43a8b17450369023a30dcefafa"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Codeception/Codeception/zipball/57072cb9dbf23dfd7f2806de61e54ccc57cbbdef",
|
"url": "https://api.github.com/repos/Codeception/Codeception/zipball/23d5bf8e5976ac43a8b17450369023a30dcefafa",
|
||||||
"reference": "57072cb9dbf23dfd7f2806de61e54ccc57cbbdef",
|
"reference": "23d5bf8e5976ac43a8b17450369023a30dcefafa",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -387,6 +387,7 @@
|
|||||||
"symfony/yaml": "~2.3"
|
"symfony/yaml": "~2.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"codeception/specify": "*",
|
||||||
"facebook/php-sdk": "3.*",
|
"facebook/php-sdk": "3.*",
|
||||||
"videlalvaro/php-amqplib": "*"
|
"videlalvaro/php-amqplib": "*"
|
||||||
},
|
},
|
||||||
@ -422,7 +423,7 @@
|
|||||||
"functional testing",
|
"functional testing",
|
||||||
"unit testing"
|
"unit testing"
|
||||||
],
|
],
|
||||||
"time": "2014-02-24 23:38:17"
|
"time": "2014-03-07 03:54:31"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "d11wtq/boris",
|
"name": "d11wtq/boris",
|
||||||
@ -859,12 +860,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Intervention/image.git",
|
"url": "https://github.com/Intervention/image.git",
|
||||||
"reference": "18f50ac4317d82ecfe88b6b1ed46d071478c5022"
|
"reference": "68352b3ffc76bee1979d411eba6f0136fe9b5630"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Intervention/image/zipball/18f50ac4317d82ecfe88b6b1ed46d071478c5022",
|
"url": "https://api.github.com/repos/Intervention/image/zipball/68352b3ffc76bee1979d411eba6f0136fe9b5630",
|
||||||
"reference": "18f50ac4317d82ecfe88b6b1ed46d071478c5022",
|
"reference": "68352b3ffc76bee1979d411eba6f0136fe9b5630",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -901,7 +902,7 @@
|
|||||||
"thumbnail",
|
"thumbnail",
|
||||||
"watermark"
|
"watermark"
|
||||||
],
|
],
|
||||||
"time": "2014-02-20 15:58:24"
|
"time": "2014-02-28 10:26:09"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ircmaxell/password-compat",
|
"name": "ircmaxell/password-compat",
|
||||||
@ -1136,12 +1137,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "f7935afc541fc15324efc8538c60866e593ee447"
|
"reference": "85428c311b38cf91d6a80a22712a65643920fed4"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/f7935afc541fc15324efc8538c60866e593ee447",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/85428c311b38cf91d6a80a22712a65643920fed4",
|
||||||
"reference": "f7935afc541fc15324efc8538c60866e593ee447",
|
"reference": "85428c311b38cf91d6a80a22712a65643920fed4",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1204,7 +1205,7 @@
|
|||||||
"iron-io/iron_mq": "1.5.*",
|
"iron-io/iron_mq": "1.5.*",
|
||||||
"mockery/mockery": "0.9.*",
|
"mockery/mockery": "0.9.*",
|
||||||
"pda/pheanstalk": "2.1.*",
|
"pda/pheanstalk": "2.1.*",
|
||||||
"phpunit/phpunit": "3.7.*"
|
"phpunit/phpunit": "4.0.*"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"doctrine/dbal": "Allow renaming columns and dropping SQLite columns."
|
"doctrine/dbal": "Allow renaming columns and dropping SQLite columns."
|
||||||
@ -1245,7 +1246,7 @@
|
|||||||
"framework",
|
"framework",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2014-02-25 22:33:32"
|
"time": "2014-03-09 03:15:08"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravelbook/ardent",
|
"name": "laravelbook/ardent",
|
||||||
@ -1308,21 +1309,22 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "maximebf/debugbar",
|
"name": "maximebf/debugbar",
|
||||||
"version": "1.9.4",
|
"version": "1.9.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/maximebf/php-debugbar.git",
|
"url": "https://github.com/maximebf/php-debugbar.git",
|
||||||
"reference": "5bbb3bc78b3e9ee0c4cc8c3619171ea16f0fb51f"
|
"reference": "d076e51b3a28dccbb1b2683c8abb303551e17d27"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/5bbb3bc78b3e9ee0c4cc8c3619171ea16f0fb51f",
|
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d076e51b3a28dccbb1b2683c8abb303551e17d27",
|
||||||
"reference": "5bbb3bc78b3e9ee0c4cc8c3619171ea16f0fb51f",
|
"reference": "d076e51b3a28dccbb1b2683c8abb303551e17d27",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.0",
|
"php": ">=5.3.0",
|
||||||
"psr/log": "~1.0"
|
"psr/log": "~1.0",
|
||||||
|
"raveren/kint": "0.9"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"php": ">=5.3.0"
|
"php": ">=5.3.0"
|
||||||
@ -1354,7 +1356,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"debug"
|
"debug"
|
||||||
],
|
],
|
||||||
"time": "2014-02-14 16:30:44"
|
"time": "2014-03-04 17:18:45"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "monolog/monolog",
|
"name": "monolog/monolog",
|
||||||
@ -1362,12 +1364,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Seldaek/monolog.git",
|
"url": "https://github.com/Seldaek/monolog.git",
|
||||||
"reference": "7085f3e424dfbaba98461a433f6c55fec3229355"
|
"reference": "dc75a998d83ebb285b94b1a6fd96644b457ed33c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/7085f3e424dfbaba98461a433f6c55fec3229355",
|
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc75a998d83ebb285b94b1a6fd96644b457ed33c",
|
||||||
"reference": "7085f3e424dfbaba98461a433f6c55fec3229355",
|
"reference": "dc75a998d83ebb285b94b1a6fd96644b457ed33c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1375,8 +1377,8 @@
|
|||||||
"psr/log": "~1.0"
|
"psr/log": "~1.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"aws/aws-sdk-php": "~2.4.8",
|
"aws/aws-sdk-php": "~2.4, >2.4.8",
|
||||||
"doctrine/couchdb": "dev-master",
|
"doctrine/couchdb": "~1.0@dev",
|
||||||
"graylog2/gelf-php": "~1.0",
|
"graylog2/gelf-php": "~1.0",
|
||||||
"phpunit/phpunit": "~3.7.0",
|
"phpunit/phpunit": "~3.7.0",
|
||||||
"raven/raven": "~0.5",
|
"raven/raven": "~0.5",
|
||||||
@ -1389,6 +1391,7 @@
|
|||||||
"ext-mongo": "Allow sending log messages to a MongoDB server",
|
"ext-mongo": "Allow sending log messages to a MongoDB server",
|
||||||
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
||||||
"raven/raven": "Allow sending log messages to a Sentry server",
|
"raven/raven": "Allow sending log messages to a Sentry server",
|
||||||
|
"rollbar/rollbar": "Allow sending log messages to Rollbar",
|
||||||
"ruflin/elastica": "Allow sending log messages to an Elastic Search server"
|
"ruflin/elastica": "Allow sending log messages to an Elastic Search server"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
@ -1421,7 +1424,7 @@
|
|||||||
"logging",
|
"logging",
|
||||||
"psr-3"
|
"psr-3"
|
||||||
],
|
],
|
||||||
"time": "2014-02-25 22:48:41"
|
"time": "2014-03-09 20:51:48"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nesbot/carbon",
|
"name": "nesbot/carbon",
|
||||||
@ -3113,12 +3116,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/orchestral/testbench.git",
|
"url": "https://github.com/orchestral/testbench.git",
|
||||||
"reference": "425d887bc5357dc2929da4887c8a13b3ba67a17e"
|
"reference": "5582dc10637678a0a9f723fa6e2f181f6bc2d786"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/orchestral/testbench/zipball/425d887bc5357dc2929da4887c8a13b3ba67a17e",
|
"url": "https://api.github.com/repos/orchestral/testbench/zipball/5582dc10637678a0a9f723fa6e2f181f6bc2d786",
|
||||||
"reference": "425d887bc5357dc2929da4887c8a13b3ba67a17e",
|
"reference": "5582dc10637678a0a9f723fa6e2f181f6bc2d786",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3132,8 +3135,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-0": {
|
"psr-4": {
|
||||||
"Orchestra\\Testbench": "src/"
|
"Orchestra\\Testbench\\": "src/Testbench/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
@ -3152,20 +3155,20 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2014-02-19 14:52:34"
|
"time": "2014-03-03 04:47:07"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "patchwork/utf8",
|
"name": "patchwork/utf8",
|
||||||
"version": "v1.1.18",
|
"version": "v1.1.20",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git",
|
"url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git",
|
||||||
"reference": "66a936cc633fe13378c91f81030d5193be968480"
|
"reference": "aea0de833cba7cf2c25239be71f2787edaee36d5"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/66a936cc633fe13378c91f81030d5193be968480",
|
"url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/aea0de833cba7cf2c25239be71f2787edaee36d5",
|
||||||
"reference": "66a936cc633fe13378c91f81030d5193be968480",
|
"reference": "aea0de833cba7cf2c25239be71f2787edaee36d5",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3203,7 +3206,7 @@
|
|||||||
"utf-8",
|
"utf-8",
|
||||||
"utf8"
|
"utf8"
|
||||||
],
|
],
|
||||||
"time": "2014-02-02 17:09:49"
|
"time": "2014-03-01 20:01:07"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "patricktalmadge/bootstrapper",
|
"name": "patricktalmadge/bootstrapper",
|
||||||
@ -3211,12 +3214,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/patricktalmadge/bootstrapper.git",
|
"url": "https://github.com/patricktalmadge/bootstrapper.git",
|
||||||
"reference": "c0cee9c65ea063b0817e0c5f788371bbcbbf7d71"
|
"reference": "53c5e7c0b70210ac34f298d3cf7831b2bfbeb8eb"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/patricktalmadge/bootstrapper/zipball/c0cee9c65ea063b0817e0c5f788371bbcbbf7d71",
|
"url": "https://api.github.com/repos/patricktalmadge/bootstrapper/zipball/53c5e7c0b70210ac34f298d3cf7831b2bfbeb8eb",
|
||||||
"reference": "c0cee9c65ea063b0817e0c5f788371bbcbbf7d71",
|
"reference": "53c5e7c0b70210ac34f298d3cf7831b2bfbeb8eb",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3258,7 +3261,7 @@
|
|||||||
"bootstrap",
|
"bootstrap",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2014-02-24 10:46:34"
|
"time": "2014-03-07 22:01:49"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpseclib/phpseclib",
|
"name": "phpseclib/phpseclib",
|
||||||
@ -3266,12 +3269,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phpseclib/phpseclib.git",
|
"url": "https://github.com/phpseclib/phpseclib.git",
|
||||||
"reference": "76c9692908a6c25601df2db373043fcbb335332e"
|
"reference": "5dcc63ef6ca720b1617cff33b445d9b318c9ad03"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/76c9692908a6c25601df2db373043fcbb335332e",
|
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/5dcc63ef6ca720b1617cff33b445d9b318c9ad03",
|
||||||
"reference": "76c9692908a6c25601df2db373043fcbb335332e",
|
"reference": "5dcc63ef6ca720b1617cff33b445d9b318c9ad03",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3296,7 +3299,8 @@
|
|||||||
"Crypt": "phpseclib/",
|
"Crypt": "phpseclib/",
|
||||||
"File": "phpseclib/",
|
"File": "phpseclib/",
|
||||||
"Math": "phpseclib/",
|
"Math": "phpseclib/",
|
||||||
"Net": "phpseclib/"
|
"Net": "phpseclib/",
|
||||||
|
"System": "phpseclib/"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"phpseclib/Crypt/Random.php"
|
"phpseclib/Crypt/Random.php"
|
||||||
@ -3352,26 +3356,26 @@
|
|||||||
"x.509",
|
"x.509",
|
||||||
"x509"
|
"x509"
|
||||||
],
|
],
|
||||||
"time": "2014-02-23 01:03:22"
|
"time": "2014-03-06 11:05:11"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
"version": "1.2.x-dev",
|
"version": "1.2.13",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||||
"reference": "69e55e68481cf708a6db43aff0b504e31402fe27"
|
"reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/69e55e68481cf708a6db43aff0b504e31402fe27",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/466e7cd2554b4e264c9e3f31216d25ac0e5f3d94",
|
||||||
"reference": "69e55e68481cf708a6db43aff0b504e31402fe27",
|
"reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.3",
|
"php": ">=5.3.3",
|
||||||
"phpunit/php-file-iterator": ">=1.3.0@stable",
|
"phpunit/php-file-iterator": ">=1.3.0@stable",
|
||||||
"phpunit/php-text-template": ">=1.2.0@stable",
|
"phpunit/php-text-template": ">=1.1.1@stable",
|
||||||
"phpunit/php-token-stream": ">=1.1.3@stable"
|
"phpunit/php-token-stream": ">=1.1.3@stable"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
@ -3413,11 +3417,11 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2014-02-25 03:34:05"
|
"time": "2013-09-10 08:14:32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-file-iterator",
|
"name": "phpunit/php-file-iterator",
|
||||||
"version": "dev-master",
|
"version": "1.3.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
|
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
|
||||||
@ -3462,16 +3466,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-text-template",
|
"name": "phpunit/php-text-template",
|
||||||
"version": "dev-master",
|
"version": "1.1.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-text-template.git",
|
"url": "https://github.com/sebastianbergmann/php-text-template.git",
|
||||||
"reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
|
"reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5180896f51c5b3648ac946b05f9ec02be78a0b23",
|
||||||
"reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
|
"reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3502,11 +3506,11 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"template"
|
"template"
|
||||||
],
|
],
|
||||||
"time": "2014-01-30 17:20:04"
|
"time": "2012-10-31 18:15:28"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-timer",
|
"name": "phpunit/php-timer",
|
||||||
"version": "dev-master",
|
"version": "1.0.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-timer.git",
|
"url": "https://github.com/sebastianbergmann/php-timer.git",
|
||||||
@ -3554,12 +3558,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
|
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
|
||||||
"reference": "292f4d5772dad5a12775be69f4a8dd663b20f103"
|
"reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/292f4d5772dad5a12775be69f4a8dd663b20f103",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32",
|
||||||
"reference": "292f4d5772dad5a12775be69f4a8dd663b20f103",
|
"reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3596,7 +3600,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"tokenizer"
|
"tokenizer"
|
||||||
],
|
],
|
||||||
"time": "2013-10-21 14:03:39"
|
"time": "2014-03-03 05:10:30"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
@ -3604,12 +3608,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f"
|
"reference": "4dbc3ab5de25a9ffd07796519f9f7f4aaddc37e0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2752cbb9ea5bd84c2811b34b6953f76965ec7a2f",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4dbc3ab5de25a9ffd07796519f9f7f4aaddc37e0",
|
||||||
"reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f",
|
"reference": "4dbc3ab5de25a9ffd07796519f9f7f4aaddc37e0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3619,9 +3623,9 @@
|
|||||||
"ext-spl": "*",
|
"ext-spl": "*",
|
||||||
"php": ">=5.3.3",
|
"php": ">=5.3.3",
|
||||||
"phpunit/php-code-coverage": "~1.2.1",
|
"phpunit/php-code-coverage": "~1.2.1",
|
||||||
"phpunit/php-file-iterator": ">=1.3.1",
|
"phpunit/php-file-iterator": "~1.3.1",
|
||||||
"phpunit/php-text-template": ">=1.1.1",
|
"phpunit/php-text-template": "~1.1.1",
|
||||||
"phpunit/php-timer": ">=1.0.4",
|
"phpunit/php-timer": "~1.0.4",
|
||||||
"phpunit/phpunit-mock-objects": "~1.2.0",
|
"phpunit/phpunit-mock-objects": "~1.2.0",
|
||||||
"symfony/yaml": "~2.0"
|
"symfony/yaml": "~2.0"
|
||||||
},
|
},
|
||||||
@ -3632,7 +3636,7 @@
|
|||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-simplexml": "*",
|
"ext-simplexml": "*",
|
||||||
"ext-tokenizer": "*",
|
"ext-tokenizer": "*",
|
||||||
"phpunit/php-invoker": ">=1.1.0,<1.2.0"
|
"phpunit/php-invoker": "~1.1"
|
||||||
},
|
},
|
||||||
"bin": [
|
"bin": [
|
||||||
"composer/bin/phpunit"
|
"composer/bin/phpunit"
|
||||||
@ -3670,7 +3674,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2014-02-25 03:47:29"
|
"time": "2014-03-05 12:52:24"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit-mock-objects",
|
"name": "phpunit/phpunit-mock-objects",
|
||||||
@ -3819,6 +3823,52 @@
|
|||||||
],
|
],
|
||||||
"time": "2014-01-18 15:33:09"
|
"time": "2014-01-18 15:33:09"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "raveren/kint",
|
||||||
|
"version": "v0.9",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/raveren/kint.git",
|
||||||
|
"reference": "ada810111ced4e3a926b4040da9b86442e43b613"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/raveren/kint/zipball/ada810111ced4e3a926b4040da9b86442e43b613",
|
||||||
|
"reference": "ada810111ced4e3a926b4040da9b86442e43b613",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.2.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"files": [
|
||||||
|
"Kint.class.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Rokas Šleinius",
|
||||||
|
"homepage": "https://github.com/raveren"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Contributors",
|
||||||
|
"homepage": "https://github.com/raveren/kint/contributors"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Kint - debugging helper for PHP developers",
|
||||||
|
"homepage": "https://github.com/raveren/kint",
|
||||||
|
"keywords": [
|
||||||
|
"debug",
|
||||||
|
"kint",
|
||||||
|
"php"
|
||||||
|
],
|
||||||
|
"time": "2013-08-12 22:46:16"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "stack/builder",
|
"name": "stack/builder",
|
||||||
"version": "dev-master",
|
"version": "dev-master",
|
||||||
@ -3980,12 +4030,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/Console.git",
|
"url": "https://github.com/symfony/Console.git",
|
||||||
"reference": "43717a2ba9a8695dac525b928134d1b6d620f13a"
|
"reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/Console/zipball/43717a2ba9a8695dac525b928134d1b6d620f13a",
|
"url": "https://api.github.com/repos/symfony/Console/zipball/ef20f1f58d7f693ee888353962bd2db336e3bbcb",
|
||||||
"reference": "43717a2ba9a8695dac525b928134d1b6d620f13a",
|
"reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4026,7 +4076,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony Console Component",
|
"description": "Symfony Console Component",
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "http://symfony.com",
|
||||||
"time": "2014-02-18 15:41:06"
|
"time": "2014-03-01 17:35:04"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/css-selector",
|
"name": "symfony/css-selector",
|
||||||
@ -4035,12 +4085,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/CssSelector.git",
|
"url": "https://github.com/symfony/CssSelector.git",
|
||||||
"reference": "ed1d61b2e23a0fd5dba0b20651258c4633d3e3a7"
|
"reference": "76ce933792a3b4fcb8ea9b017081327c2dc3c65b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/ed1d61b2e23a0fd5dba0b20651258c4633d3e3a7",
|
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/76ce933792a3b4fcb8ea9b017081327c2dc3c65b",
|
||||||
"reference": "ed1d61b2e23a0fd5dba0b20651258c4633d3e3a7",
|
"reference": "76ce933792a3b4fcb8ea9b017081327c2dc3c65b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4079,7 +4129,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony CssSelector Component",
|
"description": "Symfony CssSelector Component",
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "http://symfony.com",
|
||||||
"time": "2014-02-11 13:52:09"
|
"time": "2014-03-01 17:35:04"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/debug",
|
"name": "symfony/debug",
|
||||||
@ -4088,12 +4138,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/Debug.git",
|
"url": "https://github.com/symfony/Debug.git",
|
||||||
"reference": "23b5f4fcad883679d9a6e1cbc568247fe606d8ee"
|
"reference": "412b76458b60a645a9daacdd49f57d704c84c4d4"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/Debug/zipball/23b5f4fcad883679d9a6e1cbc568247fe606d8ee",
|
"url": "https://api.github.com/repos/symfony/Debug/zipball/412b76458b60a645a9daacdd49f57d704c84c4d4",
|
||||||
"reference": "23b5f4fcad883679d9a6e1cbc568247fe606d8ee",
|
"reference": "412b76458b60a645a9daacdd49f57d704c84c4d4",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4136,7 +4186,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony Debug Component",
|
"description": "Symfony Debug Component",
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "http://symfony.com",
|
||||||
"time": "2014-02-11 13:52:09"
|
"time": "2014-03-01 17:35:04"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/dom-crawler",
|
"name": "symfony/dom-crawler",
|
||||||
@ -4145,12 +4195,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/DomCrawler.git",
|
"url": "https://github.com/symfony/DomCrawler.git",
|
||||||
"reference": "f0b3d9f4b4bb8ec4b5fa57e8cb6bd8ff4e972b19"
|
"reference": "4bebef4fd60f15e3fc58f684550beae1f9162f30"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/f0b3d9f4b4bb8ec4b5fa57e8cb6bd8ff4e972b19",
|
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/4bebef4fd60f15e3fc58f684550beae1f9162f30",
|
||||||
"reference": "f0b3d9f4b4bb8ec4b5fa57e8cb6bd8ff4e972b19",
|
"reference": "4bebef4fd60f15e3fc58f684550beae1f9162f30",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4191,7 +4241,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony DomCrawler Component",
|
"description": "Symfony DomCrawler Component",
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "http://symfony.com",
|
||||||
"time": "2014-02-18 15:41:06"
|
"time": "2014-03-01 17:35:04"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher",
|
"name": "symfony/event-dispatcher",
|
||||||
@ -4305,12 +4355,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/Finder.git",
|
"url": "https://github.com/symfony/Finder.git",
|
||||||
"reference": "d712f4a26737300b4d7546705a4fb15feeb3e96f"
|
"reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/Finder/zipball/d712f4a26737300b4d7546705a4fb15feeb3e96f",
|
"url": "https://api.github.com/repos/symfony/Finder/zipball/ab301c7d21f536c34ab6c2c79dba8d465104c518",
|
||||||
"reference": "d712f4a26737300b4d7546705a4fb15feeb3e96f",
|
"reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4345,7 +4395,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony Finder Component",
|
"description": "Symfony Finder Component",
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "http://symfony.com",
|
||||||
"time": "2014-02-24 16:20:54"
|
"time": "2014-03-01 17:35:04"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/http-foundation",
|
"name": "symfony/http-foundation",
|
||||||
@ -4354,12 +4404,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/HttpFoundation.git",
|
"url": "https://github.com/symfony/HttpFoundation.git",
|
||||||
"reference": "cdee7c84ba8b2a8aafa1c055f5cb4f640d81c129"
|
"reference": "97052d99f8eea42975ef21e3dba01cb550913157"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/cdee7c84ba8b2a8aafa1c055f5cb4f640d81c129",
|
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/97052d99f8eea42975ef21e3dba01cb550913157",
|
||||||
"reference": "cdee7c84ba8b2a8aafa1c055f5cb4f640d81c129",
|
"reference": "97052d99f8eea42975ef21e3dba01cb550913157",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4397,7 +4447,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony HttpFoundation Component",
|
"description": "Symfony HttpFoundation Component",
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "http://symfony.com",
|
||||||
"time": "2014-02-11 15:39:28"
|
"time": "2014-03-04 07:36:26"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/http-kernel",
|
"name": "symfony/http-kernel",
|
||||||
@ -4406,12 +4456,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/HttpKernel.git",
|
"url": "https://github.com/symfony/HttpKernel.git",
|
||||||
"reference": "1e1a8e4f1040d744086e9bdaa979f015789b4af6"
|
"reference": "2b803c45c454751c503a7d4f15fce4aa4a9e4686"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/1e1a8e4f1040d744086e9bdaa979f015789b4af6",
|
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/2b803c45c454751c503a7d4f15fce4aa4a9e4686",
|
||||||
"reference": "1e1a8e4f1040d744086e9bdaa979f015789b4af6",
|
"reference": "2b803c45c454751c503a7d4f15fce4aa4a9e4686",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4470,7 +4520,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony HttpKernel Component",
|
"description": "Symfony HttpKernel Component",
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "http://symfony.com",
|
||||||
"time": "2014-02-12 21:00:41"
|
"time": "2014-03-04 17:06:29"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/process",
|
"name": "symfony/process",
|
||||||
@ -4653,12 +4703,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/Yaml.git",
|
"url": "https://github.com/symfony/Yaml.git",
|
||||||
"reference": "e49a47d60348665261f6e279ba383241deb73cab"
|
"reference": "6194137af5f12fbcfc0cb21e269f47542b8beb47"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/Yaml/zipball/e49a47d60348665261f6e279ba383241deb73cab",
|
"url": "https://api.github.com/repos/symfony/Yaml/zipball/6194137af5f12fbcfc0cb21e269f47542b8beb47",
|
||||||
"reference": "e49a47d60348665261f6e279ba383241deb73cab",
|
"reference": "6194137af5f12fbcfc0cb21e269f47542b8beb47",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4693,7 +4743,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony Yaml Component",
|
"description": "Symfony Yaml Component",
|
||||||
"homepage": "http://symfony.com",
|
"homepage": "http://symfony.com",
|
||||||
"time": "2014-02-24 16:21:51"
|
"time": "2014-03-03 12:53:01"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "webpatser/laravel-countries",
|
"name": "webpatser/laravel-countries",
|
||||||
@ -4701,12 +4751,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/webpatser/laravel-countries.git",
|
"url": "https://github.com/webpatser/laravel-countries.git",
|
||||||
"reference": "b38d62c3559011b3f34bb4059bcd52ec54907512"
|
"reference": "0631c1c6211303990561185cea280c9965c1a5a9"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/webpatser/laravel-countries/zipball/b38d62c3559011b3f34bb4059bcd52ec54907512",
|
"url": "https://api.github.com/repos/webpatser/laravel-countries/zipball/0631c1c6211303990561185cea280c9965c1a5a9",
|
||||||
"reference": "b38d62c3559011b3f34bb4059bcd52ec54907512",
|
"reference": "0631c1c6211303990561185cea280c9965c1a5a9",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4745,7 +4795,7 @@
|
|||||||
"iso_3166_3",
|
"iso_3166_3",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2014-01-11 14:44:54"
|
"time": "2014-03-02 11:42:11"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "zizaco/confide",
|
"name": "zizaco/confide",
|
||||||
|
|||||||
@ -137,7 +137,7 @@ a .cta:hover span {
|
|||||||
background-image: url(/images/hero-bg-3.jpg);
|
background-image: url(/images/hero-bg-3.jpg);
|
||||||
padding: 150px 0;
|
padding: 150px 0;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: bottom center;
|
background-position: center center;
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
}
|
}
|
||||||
.hero4 {
|
.hero4 {
|
||||||
@ -145,7 +145,7 @@ a .cta:hover span {
|
|||||||
background-image: url(/images/hero-bg-4.jpg);
|
background-image: url(/images/hero-bg-4.jpg);
|
||||||
padding: 150px 0;
|
padding: 150px 0;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: bottom center;
|
background-position: center center;
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
}
|
}
|
||||||
.hero2 h1, .hero3 h1, .hero4 h1 {
|
.hero2 h1, .hero3 h1, .hero4 h1 {
|
||||||
@ -154,8 +154,8 @@ a .cta:hover span {
|
|||||||
}
|
}
|
||||||
.background {
|
.background {
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: top center;
|
background-position: center center;
|
||||||
background-attachment: fixed;
|
background-attachment: static;
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
min-height: 500px;
|
min-height: 500px;
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
BIN
public/images/about1.jpg
Normal file
BIN
public/images/about1.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
BIN
public/images/about2.jpg
Normal file
BIN
public/images/about2.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 47 KiB |
BIN
public/images/hero-bg-4.psd
Normal file
BIN
public/images/hero-bg-4.psd
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user