diff --git a/.travis.yml b/.travis.yml index 08abbbc11d4..7c103980517 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,13 +79,17 @@ before_install: install: - | echo "Updating Composer" - composer self-update + if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then + composer self-update + fi echo - | echo "Installing Parallel Lint" - composer -n require jakub-onderka/php-parallel-lint ^0 - composer -n require jakub-onderka/php-console-highlighter ^0 + if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then + composer -n require jakub-onderka/php-parallel-lint ^0 + composer -n require jakub-onderka/php-console-highlighter ^0 + fi echo - | @@ -100,13 +104,17 @@ install: - | echo "Installing PHP CodeSniffer" - composer -n require squizlabs/php_codesniffer ^2 + if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then + composer -n require squizlabs/php_codesniffer ^2 + fi echo - | echo "Adding path of binaries tools installed by composer to the PATH" export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH" echo + cat htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php + before_script: - | @@ -288,7 +296,6 @@ script: echo #cat $TRAVIS_BUILD_DIR/upgrade390400-2.log #cat /tmp/dolibarr_install.log - cat htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php - | echo "Unit testing" diff --git a/composer.json b/composer.json index 113a04e3163..fb3109fbc40 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,9 @@ "irc": "irc://chat.freenode.net/dolibarr", "source": "https://github.com/Dolibarr/dolibarr" }, + "config": { + "vendor-dir": "htdocs/includes" + }, "require": { "php": ">=5.3.0", "ext-curl": "*", @@ -45,8 +48,5 @@ "ext-xml": "Excel support", "firephp/firephp-core": "Logging to Firebug console support", "raven/raven": "Sentry logging server support" - }, - "config": { - "vendor-dir": "htdocs/includes" } } diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php old mode 100755 new mode 100644 diff --git a/htdocs/includes/ckeditor/ckeditor/CHANGES.md b/htdocs/includes/ckeditor/ckeditor/CHANGES.md index e48aaac4dc2..f1fb5c7a31d 100644 --- a/htdocs/includes/ckeditor/ckeditor/CHANGES.md +++ b/htdocs/includes/ckeditor/ckeditor/CHANGES.md @@ -1,1080 +1,1080 @@ -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 `