From cf8c180fa4fab9f75a775cd3522d328f57613ddc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 May 2016 16:26:15 +0200 Subject: [PATCH] Fix perm and CRLF --- .travis.yml | 17 +- composer.json | 6 +- .../mailings/advthirdparties.modules.php | 0 htdocs/includes/ckeditor/ckeditor/CHANGES.md | 2160 +++++------ htdocs/includes/ckeditor/ckeditor/LICENSE.md | 2840 +++++++------- .../ckeditor/ckeditor/build-config.js | 102 +- .../includes/ckeditor/ckeditor/contents.css | 270 +- htdocs/includes/ckeditor/ckeditor/lang/af.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ar.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/bg.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/bn.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/bs.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ca.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/cs.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/cy.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/da.js | 6 +- .../includes/ckeditor/ckeditor/lang/de-ch.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/de.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/el.js | 6 +- .../includes/ckeditor/ckeditor/lang/en-au.js | 6 +- .../includes/ckeditor/ckeditor/lang/en-ca.js | 6 +- .../includes/ckeditor/ckeditor/lang/en-gb.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/en.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/eo.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/es.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/et.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/eu.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/fa.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/fi.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/fo.js | 6 +- .../includes/ckeditor/ckeditor/lang/fr-ca.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/fr.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/gl.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/gu.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/he.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/hi.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/hr.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/hu.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/id.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/is.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/it.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ja.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ka.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/km.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ko.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ku.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/lt.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/lv.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/mk.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/mn.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ms.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/nb.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/nl.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/no.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/pl.js | 6 +- .../includes/ckeditor/ckeditor/lang/pt-br.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/pt.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ro.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ru.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/si.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sk.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sl.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sq.js | 6 +- .../ckeditor/ckeditor/lang/sr-latn.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sr.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sv.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/th.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/tr.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/tt.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ug.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/uk.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/vi.js | 6 +- .../includes/ckeditor/ckeditor/lang/zh-cn.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/zh.js | 6 +- .../dialogs/lang/_translationstatus.txt | 50 +- .../colordialog/dialogs/colordialog.css | 40 +- .../ckeditor/plugins/preview/preview.html | 26 +- .../ckeditor/plugins/scayt/CHANGELOG.md | 40 +- .../ckeditor/plugins/scayt/LICENSE.md | 56 +- .../ckeditor/ckeditor/plugins/scayt/README.md | 50 +- .../plugins/scayt/dialogs/toolbar.css | 142 +- .../dialogs/lang/_translationstatus.txt | 40 +- .../plugins/templates/dialogs/templates.css | 168 +- .../ckeditor/ckeditor/plugins/wsc/LICENSE.md | 56 +- .../ckeditor/ckeditor/plugins/wsc/README.md | 50 +- .../ckeditor/plugins/wsc/dialogs/ciframe.html | 132 +- .../plugins/wsc/dialogs/tmpFrameset.html | 104 +- .../ckeditor/plugins/wsc/dialogs/wsc.css | 164 +- .../ckeditor/ckeditor/samples/css/samples.css | 3280 ++++++++--------- .../ckeditor/ckeditor/samples/index.html | 256 +- .../ckeditor/ckeditor/samples/js/sample.js | 106 +- .../ckeditor/ckeditor/samples/old/ajax.html | 170 +- .../ckeditor/ckeditor/samples/old/api.html | 420 +-- .../ckeditor/samples/old/appendto.html | 118 +- .../old/assets/outputxhtml/outputxhtml.css | 408 +- .../samples/old/assets/posteddata.php | 118 +- .../ckeditor/samples/old/datafiltering.html | 1016 ++--- .../samples/old/dialog/assets/my_dialog.js | 96 +- .../ckeditor/samples/old/dialog/dialog.html | 380 +- .../ckeditor/samples/old/divreplace.html | 288 +- .../samples/old/enterkey/enterkey.html | 212 +- .../old/htmlwriter/outputforflash.html | 566 +-- .../samples/old/htmlwriter/outputhtml.html | 448 +-- .../ckeditor/ckeditor/samples/old/index.html | 218 +- .../ckeditor/samples/old/inlineall.html | 628 ++-- .../ckeditor/samples/old/inlinebycode.html | 248 +- .../ckeditor/samples/old/inlinetextarea.html | 226 +- .../ckeditor/ckeditor/samples/old/jquery.html | 206 +- .../samples/old/magicline/magicline.html | 418 +-- .../ckeditor/samples/old/readonly.html | 152 +- .../ckeditor/samples/old/replacebyclass.html | 120 +- .../ckeditor/samples/old/replacebycode.html | 118 +- .../ckeditor/ckeditor/samples/old/sample.css | 714 ++-- .../ckeditor/ckeditor/samples/old/sample.js | 100 +- .../samples/old/sample_posteddata.php | 32 +- .../ckeditor/samples/old/tabindex.html | 156 +- .../ckeditor/samples/old/toolbar/toolbar.html | 470 +-- .../ckeditor/samples/old/uicolor.html | 144 +- .../ckeditor/samples/old/uilanguages.html | 244 +- .../samples/old/wysiwygarea/fullpage.html | 160 +- .../ckeditor/samples/old/xhtmlstyle.html | 468 +-- .../toolbarconfigurator/css/fontello.css | 110 +- .../toolbarconfigurator/font/LICENSE.txt | 20 +- .../samples/toolbarconfigurator/index.html | 892 ++--- .../lib/codemirror/codemirror.css | 650 ++-- .../lib/codemirror/neo.css | 72 +- .../lib/codemirror/show-hint.css | 76 +- .../ckeditor/ckeditor/skins/moono/dialog.css | 8 +- .../ckeditor/skins/moono/dialog_ie.css | 8 +- .../ckeditor/skins/moono/dialog_ie7.css | 8 +- .../ckeditor/skins/moono/dialog_ie8.css | 8 +- .../ckeditor/skins/moono/dialog_iequirks.css | 8 +- .../ckeditor/ckeditor/skins/moono/editor.css | 8 +- .../ckeditor/skins/moono/editor_gecko.css | 8 +- .../ckeditor/skins/moono/editor_ie.css | 8 +- .../ckeditor/skins/moono/editor_ie7.css | 8 +- .../ckeditor/skins/moono/editor_ie8.css | 8 +- .../ckeditor/skins/moono/editor_iequirks.css | 8 +- .../ckeditor/ckeditor/skins/moono/readme.md | 98 +- htdocs/includes/ckeditor/ckeditor/styles.js | 222 +- .../lib/swiftmailer_generate_mimes_config.php | 0 141 files changed, 10927 insertions(+), 10920 deletions(-) mode change 100755 => 100644 htdocs/core/modules/mailings/advthirdparties.modules.php mode change 100755 => 100644 htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php 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 `