minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'multilanguage' into dev

Browse Source
This commit is contained in:
Michal Kváček
2016-07-23 21:56:30 +02:00
parent ebc7330717 b2b8084cfe
commit 3733d24da8
43 changed files with 932 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+62 -14
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "64dd6115505ac9f62926d5fccc14704d",
"content-hash": "8cefeb3bdf109c79d77ac6cb303a1a96",
"hash": "3a1cbb52ac8547058b740bac891b3b82",
"content-hash": "f274b2d31a4a37163ddd90984815797d",
"packages": [
{
"name": "classpreloader/classpreloader",
@@ -796,12 +796,12 @@
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "9d853b9b2db24849b68ce219d80fc68165807810"
"reference": "f6a4db472ca9013e56d8a7065c9fd64383a3d4d4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/9d853b9b2db24849b68ce219d80fc68165807810",
"reference": "9d853b9b2db24849b68ce219d80fc68165807810",
"url": "https://api.github.com/repos/laravel/framework/zipball/f6a4db472ca9013e56d8a7065c9fd64383a3d4d4",
"reference": "f6a4db472ca9013e56d8a7065c9fd64383a3d4d4",
"shasum": ""
},
"require": {
@@ -918,7 +918,7 @@
"framework",
"laravel"
],
"time": "2016-07-21 15:40:02"
"time": "2016-07-22 22:19:36"
},
{
"name": "laravelcollective/html",
@@ -1057,6 +1057,54 @@
],
"time": "2016-07-21 09:35:56"
},
{
"name": "mcamara/laravel-localization",
"version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/mcamara/laravel-localization.git",
"reference": "239d711d1f861e333e6de73d98dabdf94500512e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/239d711d1f861e333e6de73d98dabdf94500512e",
"reference": "239d711d1f861e333e6de73d98dabdf94500512e",
"shasum": ""
},
"require": {
"laravel/framework": "~5.2",
"php": ">=5.5.0"
},
"require-dev": {
"orchestra/testbench": "3.2.*"
},
"type": "library",
"autoload": {
"classmap": [],
"psr-0": {
"Mcamara\\LaravelLocalization": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Marc Cámara",
"email": "mcamara88@gmail.com",
"role": "Developer"
}
],
"description": "Easy localization for Laravel",
"homepage": "https://github.com/mcamara/laravel-localization",
"keywords": [
"laravel",
"localization",
"php"
],
"time": "2016-07-11 12:59:33"
},
{
"name": "monolog/monolog",
"version": "1.x-dev",
@@ -3551,28 +3599,28 @@
},
{
"name": "sebastian/environment",
"version": "dev-master",
"version": "1.3.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "a13903bf5fd0239748fe322dfbdd5f5720ab20e6"
"reference": "622c5dc0a8036cfc4ccd73c7b1b668a431e69d96"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/a13903bf5fd0239748fe322dfbdd5f5720ab20e6",
"reference": "a13903bf5fd0239748fe322dfbdd5f5720ab20e6",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/622c5dc0a8036cfc4ccd73c7b1b668a431e69d96",
"reference": "622c5dc0a8036cfc4ccd73c7b1b668a431e69d96",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0"
"php": "^5.3.3 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^5.0"
"phpunit/phpunit": "^4.8 || ^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
"dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -3597,7 +3645,7 @@
"environment",
"hhvm"
],
"time": "2016-06-11 08:54:23"
"time": "2016-06-11 08:21:19"
},
{
"name": "sebastian/exporter",