diff --git a/composer.lock b/composer.lock index 45d304926a..236f0e0472 100644 --- a/composer.lock +++ b/composer.lock @@ -89,16 +89,16 @@ }, { "name": "matthiasmullie/minify", - "version": "1.3.55", + "version": "1.3.58", "source": { "type": "git", "url": "https://github.com/matthiasmullie/minify.git", - "reference": "21084eb9e6c117f5236969532d00ed2750cd1617" + "reference": "aee56fe6c706662c5991bb1f88cabe19430c60fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/21084eb9e6c117f5236969532d00ed2750cd1617", - "reference": "21084eb9e6c117f5236969532d00ed2750cd1617", + "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/aee56fe6c706662c5991bb1f88cabe19430c60fe", + "reference": "aee56fe6c706662c5991bb1f88cabe19430c60fe", "shasum": "" }, "require": { @@ -145,7 +145,7 @@ "minifier", "minify" ], - "time": "2017-10-25T11:13:12+00:00" + "time": "2018-01-08T10:01:42+00:00" }, { "name": "matthiasmullie/path-converter", @@ -198,30 +198,25 @@ }, { "name": "michelf/php-markdown", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220" + "reference": "01ab082b355bf188d907b9929cd99b2923053495" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1f51cc520948f66cd2af8cbc45a5ee175e774220", - "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/01ab082b355bf188d907b9929cd99b2923053495", + "reference": "01ab082b355bf188d907b9929cd99b2923053495", "shasum": "" }, "require": { "php": ">=5.3.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-lib": "1.4.x-dev" - } - }, "autoload": { - "psr-0": { - "Michelf": "" + "psr-4": { + "Michelf\\": "Michelf/" } }, "notification-url": "https://packagist.org/downloads/", @@ -245,7 +240,7 @@ "keywords": [ "markdown" ], - "time": "2016-10-29T18:58:20+00:00" + "time": "2018-01-15T00:49:33+00:00" }, { "name": "oyejorge/less.php", diff --git a/system/config/constants.php b/system/config/constants.php index 459ef048aa..9cbd0ad655 100644 --- a/system/config/constants.php +++ b/system/config/constants.php @@ -13,7 +13,7 @@ * Core version */ define('VERSION', '3.5'); -define('BUILD', '31'); +define('BUILD', '32'); define('LONG_TERM_SUPPORT', true); diff --git a/system/modules/core/languages/es/tl_settings.xlf b/system/modules/core/languages/es/tl_settings.xlf index 576a566f0b..8323c5a3be 100644 --- a/system/modules/core/languages/es/tl_settings.xlf +++ b/system/modules/core/languages/es/tl_settings.xlf @@ -335,6 +335,7 @@ If the width of an image or movie exceeds this value, it will be adjusted automatically. Set to 0 to disable the limit. + Si el ancho de una imagen o película excede este valor, se ajustará automáticamente. Establézcalo en 0 para desactivar el límite. JPG thumbnail quality diff --git a/system/modules/core/languages/lv/countries.xlf b/system/modules/core/languages/lv/countries.xlf index d59c573a95..b8cd42c96e 100644 --- a/system/modules/core/languages/lv/countries.xlf +++ b/system/modules/core/languages/lv/countries.xlf @@ -960,6 +960,7 @@ U.S. Virgin Islands + ASV Virdžīnas Vietnam diff --git a/system/modules/core/languages/zh/tl_settings.xlf b/system/modules/core/languages/zh/tl_settings.xlf index 5ebff342aa..1b01837c29 100644 --- a/system/modules/core/languages/zh/tl_settings.xlf +++ b/system/modules/core/languages/zh/tl_settings.xlf @@ -335,6 +335,7 @@ If the width of an image or movie exceeds this value, it will be adjusted automatically. Set to 0 to disable the limit. + 如果一张图片或者视频的宽度超出所设定的数值,它将会自动调整。设置0禁用这个限制。 JPG thumbnail quality diff --git a/system/modules/repository/classes/RepositorySettings.php b/system/modules/repository/classes/RepositorySettings.php index 02aefd8c6a..80ccd1e315 100644 --- a/system/modules/repository/classes/RepositorySettings.php +++ b/system/modules/repository/classes/RepositorySettings.php @@ -17,6 +17,7 @@ // valid core versions in descending order define('REPOSITORY_COREVERSIONS', + '30050329,30050329;'. // 3.5.32 '30050319,30050319;'. // 3.5.31 '30050309,30050309;'. // 3.5.30 '30050299,30050299;'. // 3.5.29