-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from xpressengine/develop
Develop
- Loading branch information
Showing
1,140 changed files
with
43,519 additions
and
11,625 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,22 @@ | ||
| .DS_Store | ||
| Thumbs.db | ||
|
|
||
| config.user.inc.php | ||
| /files/ | ||
| /build/ | ||
|
|
||
| codeception.yml | ||
| /tests/_output/ | ||
| /tests/*.suite.yml | ||
|
|
||
| /node_modules/ | ||
| .DS_Store | ||
| Thumbs.db | ||
| /bower_components/ | ||
| /vendor/ | ||
| composer.phar | ||
| composer.lock | ||
|
|
||
| .idea | ||
| *.sublime-workspace | ||
| *.sublime-project | ||
| .codeintel | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| common/js/jquery*.js | ||
| common/js/modernizr.js | ||
| common/js/xe.js | ||
| common/js/x.js | ||
| common/js/*.min.js | ||
| common/js/unittest/* | ||
| common/js/plugins/* | ||
| common/js/foggyLayer.js | ||
| common/js/html5.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| { | ||
| "globalstrict": false, | ||
| "undef": false, | ||
| "eqeqeq": false, | ||
| "browser": true, | ||
| "devel": true, | ||
| "jquery": true, | ||
| "evil": true, | ||
| "globals": { | ||
| "window": true, | ||
| "current_url": true, | ||
| "exec_json": true, | ||
| "exec_xml": true, | ||
| "procFilter": true, | ||
| "xe": true, | ||
| "request_uri": true, | ||
| "xAddEventListener": false, | ||
| "xResizeEvent": false, | ||
| "xScrollEvent": false, | ||
| "xAppendChild": false, | ||
| "xClientHeight": false, | ||
| "xClientWidth": false, | ||
| "xCreateElement": false, | ||
| "xDef": false, | ||
| "xDeleteCookie": false, | ||
| "xDisplay": false, | ||
| "xEvent": false, | ||
| "xFirstChild": false, | ||
| "xGetBodyWidth": false, | ||
| "xGetBodyHeight": false, | ||
| "xGetComputedStyle": false, | ||
| "xGetCookie": false, | ||
| "xGetElementById": false, | ||
| "xGetElementsByAttribute": false, | ||
| "xGetElementsByClassName": false, | ||
| "xGetElementsByTagName": false, | ||
| "xGetURLArguments": false, | ||
| "xHeight": false, | ||
| "xHex": false, | ||
| "xHide": false, | ||
| "xInnerHtml": false, | ||
| "xLeft": false, | ||
| "xMoveTo": false, | ||
| "xName": false, | ||
| "xNextSib": false, | ||
| "xNum": false, | ||
| "xOffsetLeft": false, | ||
| "xOffsetTop": false, | ||
| "xPad": false, | ||
| "xPageX": false, | ||
| "xPageY": false, | ||
| "xParent": false, | ||
| "xPreventDefault": false, | ||
| "xPrevSib": false, | ||
| "xRemoveEventListener": false, | ||
| "xResizeTo": false, | ||
| "xScrollLeft": false, | ||
| "xScrollTop": false, | ||
| "xSetCookie": false, | ||
| "xShow": false, | ||
| "xStr": false, | ||
| "xTop": false, | ||
| "xVisibility": false, | ||
| "xWidth": false, | ||
| "xZIndex": false, | ||
| "xStopPropagation": false | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,30 @@ | ||
| language: php | ||
| php: | ||
| - 5.2 | ||
| - 5.3 | ||
| - 5.4 | ||
| - 5.5 | ||
| - 5.3 | ||
| - 5.4 | ||
| - 5.5 | ||
| - 5.6 | ||
| - 7 | ||
| - hhvm | ||
| matrix: | ||
| allow_failures: | ||
| - php: 7 | ||
| - php: hhvm | ||
| before_script: | ||
| - npm install -g grunt-cli | ||
| - npm install | ||
| - 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 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 lint | ||
| - grunt minify | ||
| - if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --env travis; | ||
| fi | ||
| notifications: | ||
| slack: | ||
| secure: V4p13KlqML94RK0KTlHNJwrdwOK1K6n7sfxs6oILCJTqBfGuqN2fCglnxX78QEUwnl8LWrwSdA4AnUVfZqv6N5g7zlDDr2ZU2+a4XVApmEss3/C0g9zsYNlFfkJqChvtMsV29UiBjSfqn/coAVLtY1wbCYJYk3Wc2nmB/3Qti9Y= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.