diff --git a/composer.lock b/composer.lock index d9fa2a179..86881211a 100644 --- a/composer.lock +++ b/composer.lock @@ -1057,12 +1057,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "1.0.0" + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "1.0.0", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", "shasum": "" }, "type": "library", @@ -2714,24 +2714,24 @@ "packages-dev": [ { "name": "behat/mink", - "version": "v1.7.0", + "version": "v1.7.1", "source": { "type": "git", "url": "https://github.com/minkphp/Mink.git", - "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf" + "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf", - "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9", + "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/css-selector": "~2.1" + "symfony/css-selector": "~2.1|~3.0" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "suggest": { "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", @@ -2768,31 +2768,31 @@ "testing", "web" ], - "time": "2015-09-20 20:24:03" + "time": "2016-03-05 08:26:18" }, { "name": "behat/mink-browserkit-driver", - "version": "v1.3.0", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", - "reference": "da47df1593dac132f04d24e7277ef40d33d9f201" + "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/da47df1593dac132f04d24e7277ef40d33d9f201", - "reference": "da47df1593dac132f04d24e7277ef40d33d9f201", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/10e67fb4a295efcd62ea0bf16025a85ea19534fb", + "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb", "shasum": "" }, "require": { - "behat/mink": "~1.7@dev", + "behat/mink": "^1.7.1@dev", "php": ">=5.3.6", - "symfony/browser-kit": "~2.3", - "symfony/dom-crawler": "~2.3" + "symfony/browser-kit": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0" }, "require-dev": { "silex/silex": "~1.2", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "type": "mink-driver", "extra": { @@ -2824,20 +2824,20 @@ "browser", "testing" ], - "time": "2015-09-21 20:56:13" + "time": "2016-03-05 08:59:47" }, { "name": "behat/mink-goutte-driver", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/minkphp/MinkGoutteDriver.git", - "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f" + "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f", - "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f", + "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", + "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", "shasum": "" }, "require": { @@ -2847,7 +2847,7 @@ "php": ">=5.3.1" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "type": "mink-driver", "extra": { @@ -2879,7 +2879,7 @@ "headless", "testing" ], - "time": "2015-09-21 21:31:11" + "time": "2016-03-05 09:04:22" }, { "name": "doctrine/instantiator", @@ -2937,24 +2937,24 @@ }, { "name": "fabpot/goutte", - "version": "v3.1.1", + "version": "v3.1.2", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc" + "reference": "3cbc6ed222422a28400e470050f14928a153207e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/751a3dc5c4d86ec3e97c9f27133ef9694d9243cc", - "reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/3cbc6ed222422a28400e470050f14928a153207e", + "reference": "3cbc6ed222422a28400e470050f14928a153207e", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0", "php": ">=5.5.0", - "symfony/browser-kit": "~2.1", - "symfony/css-selector": "~2.1", - "symfony/dom-crawler": "~2.1" + "symfony/browser-kit": "~2.1|~3.0", + "symfony/css-selector": "~2.1|~3.0", + "symfony/dom-crawler": "~2.1|~3.0" }, "type": "application", "extra": { @@ -2982,7 +2982,7 @@ "keywords": [ "scraper" ], - "time": "2015-08-29 16:16:56" + "time": "2015-11-05 12:58:44" }, { "name": "jcalderonzumba/gastonjs", diff --git a/core/INSTALL.txt b/core/INSTALL.txt index ed1304a53..ff35ee334 100644 --- a/core/INSTALL.txt +++ b/core/INSTALL.txt @@ -199,7 +199,7 @@ INSTALLATION 5. Change file system storage settings (optional). - The files directory created in step 4 is the default file system path used to + The files directory created in step 3 is the default file system path used to store all uploaded files, as well as some temporary files created by Drupal. After installation, you can modify the file system path to store uploaded files in a different location. @@ -226,11 +226,19 @@ INSTALLATION mkdir uploads chmod a+w uploads - b. Navigate to Administration > Configuration > Media > File system, and - enter the desired path. Note that if you want to use private file storage, - you need to first enter the path for private files and save the - configuration, and then change the "Default download method" setting and - save again. + b. Open your settings.php in a plain-text editor, and uncomment (remove the # + at the start of line) this line: + + # $settings['file_public_path'] = 'sites/default/files'; + + Enter the desired path and save the file. + + If you want to use private file storage, you need to uncomment (remove + the # at the start of line) the following line in settings.php: + + # $settings['file_private_path'] = ''; + + Enter the path for private files and save the file. Changing the file system path after files have been uploaded may cause unexpected problems on an existing site. If you modify the file system path diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt index 8ca4bbd66..44b4d7a01 100644 --- a/core/MAINTAINERS.txt +++ b/core/MAINTAINERS.txt @@ -53,7 +53,7 @@ Authentication and authorization system - ? Base system -- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz +- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud - Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman Batch system @@ -63,7 +63,7 @@ Bootstrap system - ? Cache system -- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz +- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch - Mark Sonnabaum 'msonnabaum' https://www.drupal.org/u/msonnabaum @@ -91,11 +91,11 @@ Database system - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss PostgreSQL DB driver - - Damien Tournoud 'DamZ' https://www.drupal.org/u/damz + - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud - Josh Waihi 'fiasco' https://www.drupal.org/u/fiasco Sqlite DB driver - - Damien Tournoud 'DamZ' https://www.drupal.org/u/damz + - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud Database update system - ? @@ -110,7 +110,6 @@ Extension system Field system - Yves Chedemois 'yched' https://www.drupal.org/u/yched -- Kristof De Jaeger 'swentel' https://www.drupal.org/u/swentel - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu File system @@ -138,7 +137,7 @@ Language system - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun Lock system -- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz +- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud Mail system - ? @@ -199,7 +198,7 @@ Translations Transliteration system - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu -- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz +- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun - Jennifer Hodgdon 'jhodgdon' https://www.drupal.org/u/jhodgdon @@ -329,7 +328,6 @@ Editor module Field UI module - Yves Chedemois 'yched' https://www.drupal.org/u/yched -- Kristof De Jaeger 'swentel' https://www.drupal.org/u/swentel - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu File module @@ -385,7 +383,7 @@ Node module - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss Number module -- Kristof De Jaeger 'swentel' https://www.drupal.org/u/swentel +- ? Options module - Yves Chedemois 'yched' https://www.drupal.org/u/yched @@ -407,6 +405,7 @@ RDF module REST module - Klaus Purer 'klausi' https://www.drupal.org/u/klausi - Larry Garfield 'Crell' https://www.drupal.org/u/crell +- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers Responsive Image module - Peter Droogmans 'attiks' https://www.drupal.org/u/attiks @@ -444,7 +443,7 @@ Taxonomy module - Benjamin Doherty 'bangpound' https://www.drupal.org/u/bangpound Telephone module -- Dave Reid 'davereid' https://www.drupal.org/u/davereid +- Dave Reid 'dave-reid' https://www.drupal.org/u/dave-reid Text module - ? diff --git a/core/assets/vendor/ckeditor/CHANGES.md b/core/assets/vendor/ckeditor/CHANGES.md index f751de993..f1fb5c7a3 100644 --- a/core/assets/vendor/ckeditor/CHANGES.md +++ b/core/assets/vendor/ckeditor/CHANGES.md @@ -1,6 +1,21 @@ CKEditor 4 Changelog ==================== +## CKEditor 4.5.9 + +Fixed Issues: + +* [#10685](http://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor-dev/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor-dev](https://github.com/ckeditor/ckeditor-dev) and [6c9189f4](https://github.com/ckeditor/ckeditor-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor-presets](https://github.com/ckeditor/ckeditor-presets). +* [#14573](https://dev.ckeditor.com/ticket/14573): Fixed: Missing [Widget](http://ckeditor.com/addon/widget) drag handler CSS when there are multiple editor instances. +* [#14620](https://dev.ckeditor.com/ticket/14620): Fixed: Setting both the `min-height` style for the `` element and the `height` style for the `` element breaks the [Auto Grow](http://ckeditor.com/addon/autogrow) plugin. +* [#14538](http://dev.ckeditor.com/ticket/14538): Fixed: Keyboard focus goes into an embedded `