Commit graph

222 commits

Author SHA1 Message Date
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
bnu
aad8c7c5cf version update 1.7.4-beta.4 2013-12-06 10:33:40 +09:00
khongchi
5fae27d53c isCrawler, 관리자페이지 IP잠금, 사이트잠금 기능에서 ipfilter를 사용하도록 변경 2013-11-29 19:24:07 +09:00
bnu
0103a8dccf version update 1.7.4.-beta.3 2013-11-27 15:37:00 +09:00
khongchi
c1231b5b71 version update to 1.7.4.b2 2013-11-15 15:02:48 +09:00
khongchi
d425e42693 version update to 1.7.4.b1
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13192 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-08 07:59:07 +00:00
khongchi
3581db5932 remove cdn feature
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13187 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-08 06:04:28 +00:00
akasima
bce0a0b6d4 copyright add to php files
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13186 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-08 05:52:51 +00:00
ngleader
dbc18a4f99 change author
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13180 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-11-07 02:42:42 +00:00
ngleader
749c2092cc version update to 1.7.3.6
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13172 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-09-30 12:58:05 +00:00
ngleader
7d91bb2f1a xe version update 1.7.3.5
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13165 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-09-26 02:43:34 +00:00
misol
f70ce644ce Close Connection when there is no connection value.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-09-25 15:29:32 +00:00
chschy
1379f68c92 issue 2948, changed variable definition to __XE__
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12730 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-12 03:11:05 +00:00
flyskyko
9f0e24d59b issue 2119. supporting php 5.4. config
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12698 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-05 04:36:52 +00:00
ovclas
7928ad163b issue 2662 conding convention in config
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12232 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-15 08:04:47 +00:00
flyskyko
69809301b2 rollback mistake in r11701
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11707 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-15 08:59:38 +00:00
flyskyko
539e67f644 Issue 2385: Admin UI Refactoring - Advanced - Widgets
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11701 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-15 07:01:36 +00:00
ChanMyeong
97fb99ca87 Version display update. Added comment for version naming rule.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11148 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-04 02:59:25 +00:00
ovclas
196f0962b4 version up
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11094 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-27 06:51:26 +00:00