From c82bbb7c4deee76a1c1d59d3b7275e57b23e0ef5 Mon Sep 17 00:00:00 2001
From: YJSoft <yjsoft@yjsoft.pe.kr>
Date: Fri, 4 Apr 2014 11:15:06 +0900
Subject: [PATCH 1/6] =?UTF-8?q?fix=20#610=20=EC=98=AC=EB=B0=94=EB=A5=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EB=AA=A8=EB=93=88=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20=EC=8A=A4=ED=82=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

$module이 null일때 skin 관련 작업을 하면 생기는 warning때문에 사이트 디자인 설정이 불가능해지는 문제 수정.
---
 modules/menu/menu.admin.model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index c270781c3..0d2aef70a 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -349,6 +349,7 @@ class menuAdminModel extends menu
 		foreach($_allModules as $module_name)
 		{
 			$module = $oModuleModel->getModuleInfoXml($module_name);
+			if(!isset($module)) continue;
 			$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
 			$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
 			$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);

From 418fdd3c72030082f94d1fa258f3c5788daa5b95 Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Tue, 15 Apr 2014 14:41:06 +0900
Subject: [PATCH 2/6] Version update: 1.7.5-beta2

---
 config/config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.inc.php b/config/config.inc.php
index bc8c1b97e..dbc5d93eb 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.7.5-beta1');
+define('__XE_VERSION__', '1.7.5-beta2');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

From fc9330bb1894f7ad81b47d9b77919674937e35f0 Mon Sep 17 00:00:00 2001
From: "Jin Hu, Baek" <m@ake.kr>
Date: Tue, 8 Apr 2014 03:18:38 +0900
Subject: [PATCH 3/6] remove spaces in checkbox, radio, select types inputbox

remove spaces in checkbox, radio, select types inputbox. and code optimizing
---
 classes/extravar/Extravar.class.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 2ad6a69ac..97ff19968 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -249,7 +249,7 @@ class ExtraItem
 
 				for($i = 0, $c = count($values); $i < $c; $i++)
 				{
-					$values[$i] = htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
 
 				return $values;
@@ -302,21 +302,15 @@ class ExtraItem
 			case 'textarea' :
 				return nl2br($value);
 				
-			case 'checkbox' :
-				if(is_array($value))
-				{
-					return implode(', ', $value);
-				}
-				return $value;
-				
 			case 'date' :
 				return zdate($value, "Y-m-d");
 
+			case 'checkbox' :
 			case 'select' :
 			case 'radio' :
 				if(is_array($value))
 				{
-					return implode(', ', $value);
+					return implode(',', $value);
 				}
 				return $value;
 

From 005642a5e9559429f942a9a9245b76852bc5b902 Mon Sep 17 00:00:00 2001
From: "Jin Hu, Baek" <m@ake.kr>
Date: Tue, 8 Apr 2014 03:34:56 +0900
Subject: [PATCH 4/6] =?UTF-8?q?date=EB=B0=A9=EC=8B=9D=EC=9D=98=20=EC=9E=85?=
 =?UTF-8?q?=EB=A0=A5=ED=8F=BC=20=EC=95=88=EC=9D=98=20button=EC=9D=98=20cla?=
 =?UTF-8?q?ss=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

XE 공용 버튼 스타일링 추가
---
 classes/extravar/Extravar.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 97ff19968..62c1f3d9d 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -420,7 +420,8 @@ class ExtraItem
 				Context::loadJavascriptPlugin('ui.datepicker');
 
 				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" /> <input type="button" value="' . Context::getLang('cmd_delete') . '" id="dateRemover_' . $column_name . '" />';
+				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />'
+				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
 				$buff[] =	'<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';
 				$buff[] =	'(function($){';

From eb3cb858ec61b076c7b3f0808a0fefd184989cb6 Mon Sep 17 00:00:00 2001
From: "Jin Hu, Baek" <m@ake.kr>
Date: Tue, 8 Apr 2014 03:37:28 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=EC=98=A4=ED=83=80=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/extravar/Extravar.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 62c1f3d9d..93ea4427d 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -420,7 +420,7 @@ class ExtraItem
 				Context::loadJavascriptPlugin('ui.datepicker');
 
 				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />'
+				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
 				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
 				$buff[] =	'<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';

From 25f32178e01543ee4ea81113d783bc88f3f0e70a Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 28 Apr 2014 16:47:29 +0900
Subject: [PATCH 6/6] update README.md

---
 CONTRIBUTING.md | 25 +++++++++++++++++++++++++
 README.md       | 44 +++++++++++++++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..ae1039e7b
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,25 @@
+# Contribution Guide
+
+## Issue 작성
+Issue 작성 시 참고해주세요.
+
+* 작성하려는 이슈가 이미 있는지 검색 후 등록해주세요. 비슷한 이슈가 있다면 댓글로 추가 내용을 덧붙일 수 있습니다.
+* 이슈에는 하나의 문제 또는 제안을 작성해주세요. 절대 하나의 이슈에 2개 이상의 내용을 적지마세요.
+* 이슈는 가능한 상세하고 간결하게 작성해주세요
+	* 필요하다면 화면을 캡쳐하여 이미지를 업로드할 수 있습니다
+
+## Pull request(PR)
+* `master` 브랜치의 코드는 수정하지마세요
+* PR은 `develop` 브랜치만 허용합니다.
+* `develop` 브랜치를 부모로한 토픽 브랜치를 활용하면 편리합니다.
+
+
+## Coding Guidelines
+코드를 기여할 때 Coding conventions을 따라야합니다.
+
+* 모든 text 파일의 charset은 BOM이 없는 UTF-8입니다
+* newline은 UNIX type을 사용합니다. 일부 파일이 다른 type을 사용하더라도 절대 고치지 마세요!
+* 들여쓰기는 1개의 탭으로 합니다
+* class 선언과 function, if, foreach, for, while 등 중괄호의 `{}`는 다음 줄에 있어야 합니다
+	* 마찬가지로 선언 다음에는 공백을 두지 않습니다. ex) CORRECT `if(...)`, INCORRECT `if (...)`
+* **Coding convention에 맞지 않는 코드를 발견 하더라도 목적과 관계 없는 코드는 절대 고치지 마세요**
diff --git a/README.md b/README.md
index d82a721ce..702176abd 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,39 @@
-# XpressEngine
+XpressEngine
+============
+
+[![Build Status](https://travis-ci.org/xpressengine/xe-core.svg?branch=master)](https://travis-ci.org/xpressengine/xe-core)
+[![License](http://img.shields.io/badge/license-GNU%20LGPL-brightgreen.svg)](http://www.gnu.org/licenses/gpl.html)
+[![Latest release](http://img.shields.io/github/release/xpressengine/xe-core.svg)](https://github.com/xpressengine/xe-core/releases)
+
+XpressEngine(XE)은 PHP로 작성한 CMS(Content Management System)입니다.
+
+
+오픈소스 라이선스로 누구나 사용 또는 개작할 수 있으며, 개방형 프로젝트로서 누구나 개발에 참여할 수 있습니다.
+
+## Supprot
+* Official sitie (Korean) : http://www.xpressengine.com/
+
+## Maintainers
+@akasima @bnu @jhyeon1010 @khongchi @ngleader
 
 ## Authors
-adrian.vasile.constantin, aerofleet, @akasima, @andreimarin, araste, @bnu, bradly1, buffkj, c2joy, @canto, cbrghost, @ccata17, @ChanMyeong, chinaskyking, chschy, clench, @devjin, @dionisrom, @dorami, @dragan-dan, ducduydaovn, duvent, @Eundong, @florinutz, @flourscent, @flyskyko, @ForPeople, FruitsHake, guny, @haneul, hankm2004, haojilin, heemin, ikko, johnsonshu, juanlee0, k10206, kagami, @khongchi, @lansi951, @largeden, liahona, lickawtl, mayoojin, mglclub, @misol, mmx900, mooo, mosmartin, @nagoon97, @ngleader, nicetwo, ovclas, risapapa, rokmcssu, royallin, rubyeye, ryin005, sanghunjun, @sejin7940, @SMaker, sspa3141, @stellar12, supershop, @taggon, @ucorina, unryong, venister, wdlee91, welcomeju, @YJSoft, ysnglee2000, zero
+adrian.vasile.constantin, aerofleet, @akasima, @andreimarin, araste, @bnu, @bongkeun, bradly1, buffkj, c2joy, @canto, cbrghost, @ccata17, @ChanMyeong, chinaskyking, chschy, clench, @cometdev, @devdho, @devjin, @dionisrom, @dorami, @dragan-dan, ducduydaovn, duvent, @Eundong, @florinutz, @flourscent, @flyskyko, @ForPeople, FruitsHake, guny, @haneul, hankm2004, @hansim, haojilin, heemin, @hyeon0142, ikko, @izuzero, johnsonshu, juanlee0, k10206, kagami, @khongchi, @lansi951, @largeden, liahona, lickawtl, @mAKEkr, mayoojin, mglclub, @misol, mmx900, @mog422, mooo, mosmartin, @nagoon97, @ngleader, nicetwo, ovclas, @qw5414, @Rayyin, risapapa, rokmcssu, royallin, rubyeye, ryin005, @samswnlee, sanghunjun, @sejin7940, @smaker, @solidh, sspa3141, @stellar12, supershop, @taggon, @ucorina, unryong, venister, wdlee91, welcomeju, @YJSoft, ysnglee2000, zero
+
+## Contribution Guide
+`CONTRIBUTING.md`파일을 참고하세요.
 
 ## License
-Copyright (C) NAVER <http://www.navercorp.com>
+Copyright (C) NAVER Corp. <http://www.navercorp.com>
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This library is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.