Merge pull request #2 from xpressengine/develop

.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
+
+[*.{css,scss,sass,less,js,jsx,json,yml}]
+indent_style = tab
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -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
+

.htaccess

@@ -15,7 +15,37 @@ RewriteRule ^(.+)/files/(member_extra_info|attach|cache|faceOff)/(.*) ./files/$2
 RewriteCond %{SCRIPT_FILENAME} !-f
 RewriteRule ^(.+)/(files|modules|widgets|widgetstyles|layouts|m.layouts|addons)/(.*) ./$2/$3 [L]
 
-# router
-RewriteCond %{SCRIPT_FILENAME} !-f
+# rss , blogAPI
+RewriteRule ^(rss|atom)$ ./index.php?module=rss&act=$1 [L]
+RewriteRule ^([a-zA-Z0-9_]+)/(rss|atom|api)$ ./index.php?mid=$1&act=$2 [L]
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/(rss|atom|api)$ ./index.php?vid=$1&mid=$2&act=$3 [L]
+
+# trackback
+RewriteRule ^([0-9]+)/(.+)/trackback$ ./index.php?document_srl=$1&key=$2&act=trackback [L]
+RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)/(.+)/trackback$ ./index.php?mid=$1&document_srl=$2&key=$3&act=trackback [L]
+RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)/(.+)/trackback$ ./index.php?vid=$1&document_srl=$2&key=$3&act=trackback [L]
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([0-9]+)/(.+)/trackback$ ./index.php?vid=$1&mid=$2&document_srl=$3&key=$4&act=trackback [L]
+
+# document permanent link
+RewriteRule ^([0-9]+)$ ./index.php?document_srl=$1 [L,QSA]
+
+# mid link
 RewriteCond %{SCRIPT_FILENAME} !-d
-RewriteRule ^(.*)$ ./index.php [L]
+RewriteRule ^([a-zA-Z0-9_]+)/?$ ./index.php?mid=$1 [L,QSA]
+# mid + document link
+RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)$ ./index.php?mid=$1&document_srl=$2 [L,QSA]
+
+# vid + mid link
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/?$ ./index.php?vid=$1&mid=$2 [L,QSA]
+# vid + mid + document link
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([0-9]+)$ ./index.php?vid=$1&mid=$2&document_srl=$3 [L,QSA]
+
+# mid + entry title
+RewriteRule ^([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?mid=$1&entry=$2 [L,QSA]
+# vid + mid + entry title
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?vid=$1&mid=$2&entry=$3 [L,QSA]
+
+#shop / vid / [category|product] / identifier
+RewriteCond %{SCRIPT_FILENAME} !-f
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-zA-Z0-9_\.-]+)$ ./index.php?act=route&vid=$1&type=$2&identifier=$3 [L,QSA]

.travis.yml

@@ -1,12 +1,32 @@
 language: php
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+- 5.3
+- 5.4
+- 5.5
+- 5.6
+- 7
+- hhvm
+matrix:
+  allow_failures:
+  - php: 7
+  - php: hhvm
+sudo: false
 before_script:
-  - npm install -g grunt-cli
-  - npm install
+- travis_retry composer self-update
+- npm install -g grunt-cli
+- npm install
+- phpenv config-rm xdebug.ini
+- 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('root')
+  WHERE user='root';\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 build; fi
+- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --fail-fast --env travis; fi
+notifications:
+  slack:
+    secure: jpoMjtkveVuPZM4JXJETAPv8QUCtTbI/ZTixdS9HUgxSb9tD2DkoekMaRzXYnXA82Les/gGxTC0fQFcFrls6Ypkbvp1udBPggmAdLiBHubBIz+yd1BGIf/l4I6MY1QmGe1Lx4xlnVlEgLnKXHn+W+ENep4/MzpCEaR9Vw8wfGqY=
+    secure: "gPv4qFmGcXimNlI/OeVk5n4VtRCWbAe7VUtw7Inb3A/ZZaVDo11gtMNkwo/JVKSnXqFkaCQYebcNpj2D9Rb2ZCwgjMSX6wxvpA4/8OLOZpbWqFW6Hz2RKNggubXlnalXkIwFcsvj70rKctbcJFk2C1G9rVvYWdVGD9X4/ozQtAc="

Gruntfile.js

@@ -91,6 +91,7 @@ module.exports = function(grunt) {
 					'modules/board/skins/default/board.default.min.js': ['modules/board/skins/default/board.default.js'],
 					'modules/board/m.skins/default/js/mboard.min.js': ['modules/board/m.skins/default/js/mboard.js'],
 					'modules/board/m.skins/simpleGray/js/mboard.min.js': ['modules/board/m.skins/simpleGray/js/mboard.js'],
+					'modules/board/skins/xedition/board.default.min.js': ['modules/board/skins/xedition/board.default.js'],
 					// editor-component-image-gallery
 					'modules/editor/components/image_gallery/tpl/gallery.min.js' : ['modules/editor/components/image_gallery/tpl/gallery.js'],
 					'modules/editor/components/image_gallery/tpl/list_gallery.min.js' : ['modules/editor/components/image_gallery/tpl/list_gallery.js'],
@@ -109,6 +110,12 @@ module.exports = function(grunt) {
 					'addons/oembed/oembed.min.js': ['addons/oembed/oembed.js'],
 				}
 			},
+			'layout': {
+				files: {
+					'layouts/xedition/js/layout.min.js': ['layouts/xedition/js/layout.js'],
+					'layouts/xedition/js/welcome.min.js': ['layouts/xedition/js/welcome.js'],
+				}
+			},
 		},
 		cssmin: {
 			'common': {
@@ -129,21 +136,32 @@ module.exports = function(grunt) {
 					'modules/editor/skins/xpresseditor/css/default.min.css': ['modules/editor/skins/xpresseditor/css/default.css'],
 					'modules/board/skins/default/board.default.min.css': ['modules/board/skins/default/board.default.css'],
 					'modules/board/m.skins/default/css/mboard.min.css': ['modules/board/m.skins/default/css/mboard.css'],
-					'modules/board/m.skins/simpleGray/css/mboard.min.css': ['modules/board/m.skins/simpleGray/css/mboard.css']
+					'modules/board/m.skins/simpleGray/css/mboard.min.css': ['modules/board/m.skins/simpleGray/css/mboard.css'],
+					'modules/board/skins/xedition/board.default.min.css': ['modules/board/skins/xedition/board.default.css'],
 				}
 			},
 			'addons': {
 				files: {
 					'addons/oembed/jquery.oembed.min.css': ['addons/oembed/jquery.oembed.css'],
 				}
 			},
+			'layout': {
+				files: {
+					'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'],
+					'layouts/xedition/css/widget.login.min.css': ['layouts/xedition/css/widget.login.css'],
+					'layouts/xedition/css/xeicon.min.css': ['layouts/xedition/css/xeicon.css'],
+				}
+			},
 		},
 		jshint: {
 			files: [
 				'Gruntfile.js',
 				'common/js/*.js',
 				'modules/admin/tpl/js/*.js',
 				'modules/board/tpl/js/*.js',
+				'modules/board/skins/*/*.js',
 				'modules/editor/tpl/js/*.js',
 				'modules/menu/tpl/js/*.js',
 				'modules/widget/tpl/js/*.js',
@@ -161,6 +179,8 @@ module.exports = function(grunt) {
 					'common/js/x.js',
 					'common/js/xe.js',
 					'common/js/modernizr.js',
+					'vendor/**',
+					'tests/**',
 				]
 			}
 		},
@@ -183,6 +203,8 @@ module.exports = function(grunt) {
 					'!common/css/bootstrap.css',
 					'!common/css/bootstrap-responsive.css',
 					'!**/*.min.css',
+					'!vendor/**',
+					'!tests/**',
 				]
 			}
 		},
@@ -198,7 +220,9 @@ module.exports = function(grunt) {
 					"!tests/**",
 					"!tools/**",
 					"!node_modules/**",
-					"!libs/**"
+					"!libs/**",
+					"!vendor/**",
+					"!tests/_output/**"
 				],
 			},
 		}
@@ -222,7 +246,7 @@ module.exports = function(grunt) {
 
 	grunt.registerTask('build', '', function(A, B) {
 		var _only_export = false;
-		var tasks = ['krzip', 'syndication'];
+		var tasks = ['krzip', 'syndication', 'seo'];
 
 		if(!A) {
 			grunt.fail.warn('Undefined build target.');
@@ -275,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!');
+						});
+
 					});
 				});
 			}
@@ -358,6 +392,15 @@ module.exports = function(grunt) {
 					grunt.file.delete('build/xe/modules/syndication/.git');
 					taskDone();
 				});
+
+        // seo
+        grunt.util.spawn({
+          cmd: "git",
+          args: ['clone', '-b', 'master', 'git@github.com:xpressengine/xe-module-seo.git', 'build/xe/modules/seo']
+        }, function (error, result, code) {
+          grunt.file.delete('build/xe/modules/seo/.git');
+          taskDone();
+        });
 			});
 		});
 	});

README.md

@@ -23,7 +23,7 @@ XE 코어는 모듈, 애드온, 에디터 컴포넌트, 위젯, 레이아웃의
 XpressEngine은 여러분들의 개발 참여를 기다립니다.
 
 ## Server Requirements
-* PHP version 5.2.4 or greater (But recommend PHP >= 5.3.11)
+* PHP version 5.3.0 or greater (But recommend PHP >= 5.5.0)
 * MYSQL version 4.1 or greater (But recommend MYSQL >= 5.x) , MS-SQL, CUBRID
 * XML Library
 * GD Library