Skip to content

Commit 552a88e

Browse files
author
orocrmdeployer
committed
Merge remote-tracking branch 'remotes/dev/1.6' into 1.6
2 parents 7a7ec39 + 92a4d82 commit 552a88e

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ node_modules/
1616
/web/js
1717
/web/uploads/users/*
1818
/web/media/cache
19+
/web/media/js
1920
/web/build.js
2021
/web/tracking.php
2122
/app/phpunit.xml

‎app/config/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ oro_frontend:
8787
routes_to_expose: [oro_*]
8888

8989
stof_doctrine_extensions:
90-
default_locale: "%locale%"
90+
default_locale: en
9191
translation_fallback: true
9292
orm:
9393
default:

‎dev.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"oro/commerce-dpd": "1.6.x-dev",
3535
"oro/commerce-infinitepay": "1.6.x-dev",
3636
"oro/german-localization": "2.6.x-dev",
37-
"oro/redis-config": "2.x-dev"
37+
"oro/redis-config": "2.6.x-dev"
3838
},
3939
"require-dev": {
4040
"sensio/generator-bundle": "3.1.2",

‎dev.lock

+24-24
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
55
"This file is @generated automatically"
66
],
7-
"content-hash": "043b7bd7e28dad208fb5a5f7fbcc3d14",
7+
"content-hash": "fa8e366f29274e9bc89cf24cd4256771",
88
"packages": [
99
{
1010
"name": "a2lix/translation-form-bundle",
@@ -668,7 +668,7 @@
668668
"version": "dev-master",
669669
"source": {
670670
"type": "git",
671-
"url": "git@github.com:HumbleSoftware/Flotr2.git",
671+
"url": "https://github.com/HumbleSoftware/Flotr2.git",
672672
"reference": "df0ddedcab1a8fdb3a7abafc5fe97819931e7bd5"
673673
},
674674
"dist": {
@@ -3045,22 +3045,22 @@
30453045
},
30463046
{
30473047
"name": "goetas-webservices/xsd2php-runtime",
3048-
"version": "v0.2.7",
3048+
"version": "v0.2.8",
30493049
"source": {
30503050
"type": "git",
30513051
"url": "https://github.com/goetas-webservices/xsd2php-runtime.git",
3052-
"reference": "f62d40ad91502576d252f80143f9c0bf1a46ceec"
3052+
"reference": "18a9e25e89b719fa5417dcbd6515604723df957d"
30533053
},
30543054
"dist": {
30553055
"type": "zip",
3056-
"url": "https://api.github.com/repos/goetas-webservices/xsd2php-runtime/zipball/f62d40ad91502576d252f80143f9c0bf1a46ceec",
3057-
"reference": "f62d40ad91502576d252f80143f9c0bf1a46ceec",
3056+
"url": "https://api.github.com/repos/goetas-webservices/xsd2php-runtime/zipball/18a9e25e89b719fa5417dcbd6515604723df957d",
3057+
"reference": "18a9e25e89b719fa5417dcbd6515604723df957d",
30583058
"shasum": ""
30593059
},
30603060
"require": {
30613061
"jms/serializer": "^1.2",
30623062
"php": ">=5.5",
3063-
"symfony/yaml": "^2.2|^3.0"
3063+
"symfony/yaml": "^2.2|^3.0|^4.0"
30643064
},
30653065
"conflict": {
30663066
"jms/serializer": "1.4.1|1.6.1|1.6.2"
@@ -3081,7 +3081,7 @@
30813081
},
30823082
"notification-url": "https://packagist.org/downloads/",
30833083
"license": [
3084-
"LGPL"
3084+
"LGPL-3.0-or-later"
30853085
],
30863086
"authors": [
30873087
{
@@ -3097,7 +3097,7 @@
30973097
"xml",
30983098
"xsd"
30993099
],
3100-
"time": "2017-05-05T14:58:17+00:00"
3100+
"time": "2018-03-16T09:41:04+00:00"
31013101
},
31023102
{
31033103
"name": "guzzle/guzzle",
@@ -4521,16 +4521,16 @@
45214521
},
45224522
{
45234523
"name": "kriswallsmith/buzz",
4524-
"version": "v0.16.0",
4524+
"version": "v0.16.1",
45254525
"source": {
45264526
"type": "git",
45274527
"url": "https://github.com/kriswallsmith/Buzz.git",
4528-
"reference": "bd3299b7b6be3eeeb7a2842e677685031b93aa26"
4528+
"reference": "4977b7d44dbef49cdc641f14be6512fdcfe32f12"
45294529
},
45304530
"dist": {
45314531
"type": "zip",
4532-
"url": "https://api.github.com/repos/kriswallsmith/Buzz/zipball/bd3299b7b6be3eeeb7a2842e677685031b93aa26",
4533-
"reference": "bd3299b7b6be3eeeb7a2842e677685031b93aa26",
4532+
"url": "https://api.github.com/repos/kriswallsmith/Buzz/zipball/4977b7d44dbef49cdc641f14be6512fdcfe32f12",
4533+
"reference": "4977b7d44dbef49cdc641f14be6512fdcfe32f12",
45344534
"shasum": ""
45354535
},
45364536
"require": {
@@ -4567,7 +4567,7 @@
45674567
"curl",
45684568
"http client"
45694569
],
4570-
"time": "2018-02-03T19:40:45+00:00"
4570+
"time": "2018-03-19T10:34:40+00:00"
45714571
},
45724572
{
45734573
"name": "leafo/lessphp",
@@ -6338,7 +6338,7 @@
63386338
"dist": {
63396339
"type": "path",
63406340
"url": "../../package/platform",
6341-
"reference": "10e52336aa6cbd49fae083c011f1f1c5c35cc430",
6341+
"reference": "3959db3bdb360f5d56b46cff40d5f2745f2392b6",
63426342
"shasum": null
63436343
},
63446344
"require": {
@@ -6429,7 +6429,7 @@
64296429
"npm-asset/xregexp": "3.2.*",
64306430
"ocramius/proxy-manager": "0.5.*",
64316431
"oro/doctrine-extensions": "1.1.*",
6432-
"oro/redis-config": "2.x-dev",
6432+
"oro/redis-config": "~2.0",
64336433
"php": "7.1.*",
64346434
"piwik/device-detector": "3.7.*",
64356435
"robloach/component-installer": "0.2.*",
@@ -6441,7 +6441,7 @@
64416441
"symfony/monolog-bundle": "3.0.*",
64426442
"symfony/polyfill-php70": "1.*",
64436443
"symfony/swiftmailer-bundle": "2.4.*",
6444-
"symfony/symfony": "2.8.*, !=2.8.10, <=2.8.33",
6444+
"symfony/symfony": "2.8.*, !=2.8.10, <=2.8.38",
64456445
"tinymce/tinymce": "4.6.*",
64466446
"twig/extensions": "1.4.*",
64476447
"twig/twig": "1.35.*",
@@ -6544,7 +6544,7 @@
65446544
"dist": {
65456545
"type": "path",
65466546
"url": "../../package/redis-config",
6547-
"reference": "ebb33607b791385b6628708eb86dbf607dc9984d",
6547+
"reference": "25d3e3de7815d3cc7414e3d2138aca6d7cdebd3f",
65486548
"shasum": null
65496549
},
65506550
"require": {
@@ -6557,7 +6557,7 @@
65576557
"type": "symfony-bundle",
65586558
"extra": {
65596559
"branch-alias": {
6560-
"dev-master": "2.x-dev"
6560+
"dev-master": "2.6.x-dev"
65616561
}
65626562
},
65636563
"autoload": {
@@ -8491,16 +8491,16 @@
84918491
},
84928492
{
84938493
"name": "symfony/symfony",
8494-
"version": "v2.8.33",
8494+
"version": "v2.8.38",
84958495
"source": {
84968496
"type": "git",
84978497
"url": "https://github.com/symfony/symfony.git",
8498-
"reference": "a3bb63a81e5cb9bec9f3c8f30405d3107411ba8c"
8498+
"reference": "481883d56cbd4f435466dc26648d5c735671dd58"
84998499
},
85008500
"dist": {
85018501
"type": "zip",
8502-
"url": "https://api.github.com/repos/symfony/symfony/zipball/a3bb63a81e5cb9bec9f3c8f30405d3107411ba8c",
8503-
"reference": "a3bb63a81e5cb9bec9f3c8f30405d3107411ba8c",
8502+
"url": "https://api.github.com/repos/symfony/symfony/zipball/481883d56cbd4f435466dc26648d5c735671dd58",
8503+
"reference": "481883d56cbd4f435466dc26648d5c735671dd58",
85048504
"shasum": ""
85058505
},
85068506
"require": {
@@ -8626,7 +8626,7 @@
86268626
"keywords": [
86278627
"framework"
86288628
],
8629-
"time": "2018-01-05T06:19:59+00:00"
8629+
"time": "2018-04-06T14:52:23+00:00"
86308630
},
86318631
{
86328632
"name": "tinymce/tinymce",

‎web/app_dev.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313

1414
// This check prevents access to debug front controllers that are deployed by accident to production servers.
1515
// Feel free to remove this, extend it, or make something more sophisticated.
16-
/*if (isset($_SERVER['HTTP_CLIENT_IP'])
16+
if (isset($_SERVER['HTTP_CLIENT_IP'])
1717
|| isset($_SERVER['HTTP_X_FORWARDED_FOR'])
18-
|| !in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1'))
18+
|| !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'], true) || PHP_SAPI === 'cli-server')
1919
) {
2020
header('HTTP/1.0 403 Forbidden');
2121
exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
2222
}
23-
*/
2423

2524
$loader = require __DIR__.'/../app/autoload.php';
2625
require_once __DIR__.'/../app/bootstrap.php.cache';

0 commit comments

Comments
 (0)