Commit graph

240 commits

Author SHA1 Message Date
bnu
9680eaa709 version up to 1.8.0 2015-04-08 14:11:47 +09:00
bnu
b6b2a283c2 Revert "Router 기능 추가"
This reverts commit 623ef0e36b.
2015-03-31 15:01:22 +09:00
bnu
e93d7bf467 version up to 1.8.0-beta.3 2015-03-24 15:43:57 +09:00
bnu
eaea1178ec #1334 설치 시 PHP 버전 체크 시 5.3.0 이상으로 변경 2015-03-23 13:33:32 +09:00
bnu
ee8cc665cf Merge branch 'hotfix/1.7.12' into develop
Conflicts:
	config/config.inc.php
2015-03-18 15:50:34 +09:00
bnu
8563c7d1c5 version up to 1.7.12 2015-03-18 15:16:39 +09:00
bnu
9587c6fcbe #1334 안전하지 않은 PHP 버전 사용에 대한 경고 및 쉬운설치 차단
- PHP 5.3이하 버전 사용에 대한 경고문 추가
- PHP 5.3이하 버전에서 XE Core 1.8로 업데이트 차단
2015-03-18 15:16:00 +09:00
bnu
5b353a5b72 version 1.8.0-beta.2 2015-03-10 20:29:06 +09:00
bnu
933eb5cefd Merge branch 'feature/route' into next 2015-02-23 13:40:44 +09:00
bnu
a7b311d645 Merge branch 'develop' into next 2015-02-19 01:31:48 +09:00
bnu
6aea065f13 version up to 1.7.11 2015-02-17 14:56:49 +09:00
bnu
2bbe9603a2 Merge branch 'develop' into next 2015-02-09 11:22:02 +09:00
bnu
8ccd8053c9 version up to 1.7.10 2015-02-06 12:26:40 +09:00
bnu
a837f1e00a Merge branch 'develop' into feature/pwhash 2015-01-15 16:46:17 +09:00
bnu
82a29a0c76 version up to 1.7.9 2015-01-05 15:31:24 +09:00
SMaker
623ef0e36b Router 기능 추가 2014-12-11 15:06:44 +09:00
bnu
5c9d88901f Revert "Router 기능 추가"
This reverts commit bbdd1874de.
2014-12-11 15:03:33 +09:00
Kijin Sung
ca439d4440 Add a new class for improved password hashing 2014-12-10 16:10:07 +09:00
bnu
4506ea440e Merge branch 'release/1.7.8' into develop
Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
2014-12-09 15:13:08 +09:00
bnu
a981375fb4 version up to 1.7.8 2014-12-09 14:24:56 +09:00
bnu
020b7645d2 slowlog를 위한 상수 추가 2014-12-09 14:24:56 +09:00
bnu
7167de7b88 Merge branch 'hotfix/1.7.7.2' into develop 2014-10-02 10:47:06 +09:00
bnu
53eb8fbf8f version up to 1.7.7.2 2014-10-02 10:46:21 +09:00
bnu
9356022c31 Merge branch 'hotfix/1.7.7.1' into develop 2014-09-24 11:16:35 +09:00
bnu
a13e4eb946 version up to 1.7.7.1 2014-09-24 11:16:16 +09:00
bnu
62a0578917 Merge branch 'hotfix/1.7.7' into develop 2014-09-23 14:01:11 +09:00
bnu
c9c5a00e4a version up to 1.7.7 2014-09-23 13:24:52 +09:00
bnu
5c4b313eeb Merge branch 'master' into develop
Conflicts:
	common/js/common.js
	common/js/xe.js
	common/js/xe.min.js
	modules/editor/skins/xpresseditor/js/xpresseditor.min.js
2014-09-17 14:27:29 +09:00
bnu
826d7f674b version 1.7.6 2014-09-17 14:26:32 +09:00
bnu
fc03dd27b1 Merge pull request #788 from YJSoft/devel-trigger
#785 slow trigger log 추가
2014-08-26 16:11:21 +09:00
akasima
8b62e69470 Merge branch 'feature/router' into develop 2014-08-07 17:01:30 +09:00
akasima
49daa9d95d modify version to 1.7.5.7 2014-08-05 14:29:55 +09:00
akasima
2c66e6786c modify version to 1.7.5.6 2014-07-28 11:32:44 +09:00
akasima
791149f029 modify version to 1.7.5.5 2014-07-22 18:53:28 +09:00
akasima
26b12ae189 modify version to 1.7.5.4 2014-07-21 12:21:44 +09:00
akasima
38b3fd2ce5 modify version to 1.7.5.3 2014-06-18 13:09:42 +09:00
YJSoft
024e64d2e2 #785 slow trigger 관련 설정 추가 2014-06-14 15:57:15 +09:00
akasima
498f05f64d modify version to 1.7.5.2 2014-06-10 15:14:18 +09:00
akasima
ddd573949b modify version to 1.7.5.1 2014-05-27 15:09:41 +09:00
akasima
5527510b63 Version update: 1.7.5 2014-05-13 11:10:57 +09:00
akasima
418fdd3c72 Version update: 1.7.5-beta2 2014-04-15 14:41:06 +09:00
bnu
41558822d8 fix #622 XE 버전에 대한 alpha, beta, rc 상태를 담은 상수 추가 2014-04-04 18:01:01 +09:00
akasima
894d2cdad3 Version update: 1.7.5-beta1 2014-03-20 10:13:12 +09:00
SMaker
bbdd1874de Router 기능 추가 2014-02-09 23:45:34 +09:00
bnu
1a361bb958 warning 메시지를 표시하지 않도록 변경 2014-02-09 15:34:11 +09:00
khongchi
4f310f9194 Version update: 1.7.4 2014-02-04 16:59:01 +09:00
bnu
e77251379a Revert "NOISSUE, Getting a real ip of client, when the server is under a proxy."
This reverts commit d49b2307e7.
2014-02-03 13:26:32 +09:00
khongchi
a4881d7556 version update 1.7.4-beta.6 2014-01-10 18:01:15 +09:00
ngleader
d49b2307e7 NOISSUE, Getting a real ip of client, when the server is under a proxy. 2013-12-28 12:12:22 +09:00
khongchi
0774d71e69 version update 1.7.4-beta.5 2013-12-18 18:19:23 +09:00