diff --git a/.gitignore b/.gitignore index 23a7e7b6a..f7ac9d6a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,22 @@ -config.user.inc.php .DS_Store Thumbs.db + +config.user.inc.php /files/ /build/ + +codeception.yml +/tests/_output/ +/tests/*.suite.yml + /node_modules/ +/bower_components/ /vendor/ +composer.phar +composer.lock + .idea *.sublime-workspace *.sublime-project .codeintel -codeception.yml -/tests/_output/ -/tests/*.suite.yml + diff --git a/.travis.yml b/.travis.yml index fc815f346..72a55f5ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,21 +10,21 @@ matrix: allow_failures: - php: 7 - php: hhvm +sudo: false before_script: - travis_retry composer self-update - npm install -g grunt-cli - npm install - if [ $(phpenv version-name) != "5.3" ]; then composer install; fi -- if [ $(phpenv version-name) != "5.3" ]; then mysql -e 'create database xe_test;'; - fi +- if [ $(phpenv version-name) != "5.3" ]; then mysql -e 'create database xe_test;'; fi - if [ $(phpenv version-name) != "5.3" ]; then echo "USE mysql;\nUPDATE user SET password=PASSWORD('travis') WHERE user='travis';\nFLUSH PRIVILEGES;\n" | mysql -u root; fi - if [ $(phpenv version-name) != "5.3" ]; then php -S localhost:8000 & fi script: - grunt lint - grunt minify -- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run --env travis; - fi +- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept build; fi +- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --fail-fast --env travis; fi notifications: slack: - secure: V4p13KlqML94RK0KTlHNJwrdwOK1K6n7sfxs6oILCJTqBfGuqN2fCglnxX78QEUwnl8LWrwSdA4AnUVfZqv6N5g7zlDDr2ZU2+a4XVApmEss3/C0g9zsYNlFfkJqChvtMsV29UiBjSfqn/coAVLtY1wbCYJYk3Wc2nmB/3Qti9Y= + secure: 0HhwktIb65zfge56E4yMfYj0Xj4GeYIaxvh/Obb13BK1/C8RdWBy6u213N5MQ2UHsxYk8wXXzynaCh4psegi2iPy9dbKmkdAdEQMzYoKE2xYVSqZveeVQm0sqFVXAlzggpgs/j5vtvKYjRkQKtTrz0C+p0uJ0bkLcyWGezWTpGc= diff --git a/Gruntfile.js b/Gruntfile.js index c2195afea..326bbc019 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -112,7 +112,6 @@ module.exports = function(grunt) { }, 'layout': { files: { - 'layouts/xedition/js/jquery.easing.min.js': ['layouts/xedition/js/jquery.easing.js'], 'layouts/xedition/js/layout.min.js': ['layouts/xedition/js/layout.js'], 'layouts/xedition/js/welcome.min.js': ['layouts/xedition/js/welcome.js'], } @@ -148,7 +147,6 @@ module.exports = function(grunt) { }, 'layout': { files: { - 'layouts/xedition/css/camera.min.css': ['layouts/xedition/css/camera.css'], 'layouts/xedition/css/layout.min.css': ['layouts/xedition/css/layout.css'], 'layouts/xedition/css/webfont.min.css': ['layouts/xedition/css/webfont.css'], 'layouts/xedition/css/welcome.min.css': ['layouts/xedition/css/welcome.css'], @@ -301,7 +299,17 @@ module.exports = function(grunt) { grunt.file.delete('build/xe'); grunt.file.delete('build/temp.full.tar'); - grunt.log.ok('Done!'); + grunt.util.spawn({ + cmd: "git", + args: ['diff', '--name-status', target] + }, function (error, result, code) { + var fs = require('fs'); + result = 'Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R).' + grunt.util.linefeed + result; + grunt.file.write(build_dir + '/CHANGED.' + version + '.txt', result); + + grunt.log.ok('Done!'); + }); + }); }); } diff --git a/addons/captcha/captcha.min.js b/addons/captcha/captcha.min.js index b22dc0a66..fd05f65fe 100644 --- a/addons/captcha/captcha.min.js +++ b/addons/captcha/captcha.min.js @@ -1 +1 @@ -var calledArgs=null;!function(a){a(function(){function b(){a("form").each(function(b){var d=!1;if(!a(this).attr("onsubmit")||a(this).attr("onsubmit").indexOf("procFilter")<0)for(var e=a(this).find("input[name=act]").val(),b=0;b'),a(this).find("input[name=error_return_url]")||a(this).append(''),a(this).submit(function(b){if(a(this).find("input[name=secret_text]").val())return!0;b.preventDefault();var d=this;a("#captcha_layer form").submit(function(b){return b.preventDefault(),a("#secret_text").val()?(a(d).append(''),void a(d).submit()):(a(this).find("input[type=text]").val("").focus(),!1)});var e=new Array;e.captcha_action="setCaptchaSession",e.mid=current_mid,window.oldExecXml("","",e,c.show,new Array("error","message","about_captcha","captcha_reload","captcha_play","cmd_input","cmd_cancel"))}))});a(document.body);if(!c){var b=-1!=navigator.appVersion.indexOf("MSIE")?!0:!1,d=-1!=navigator.appVersion.toLowerCase().indexOf("win")?!0:!1,e=-1!=navigator.userAgent.indexOf("Opera")?!0:!1,f=request_uri+"addons/captcha/swf/play.swf";b&&d&&!e?(_object_='',_object_+='',_object_+='',_object_+='',_object_+='',_object_+='',_object_+='',_object_+=""):_object_='',c=a('