Commit graph

485 commits

Author SHA1 Message Date
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
flyskyko
0f04bd3f92 merge changes of luminous to maserati (~r12676)
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12680 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-02-04 08:09:07 +00:00
ovclas
714caf13e0 version up 1.5.4.2
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12561 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-16 01:29:06 +00:00
ovclas
f69cfd442b XSS Defence
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12560 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-16 01:14:06 +00:00
ovclas
ef5aa0b93f CSRF defence modify
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12511 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-04 03:05:16 +00:00
ovclas
1f18e5ac1d version up 1.5.4.1
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12504 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-02 07:13:42 +00:00
ovclas
2d90e77046 issue 2775 if use vid, check virtual site
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12502 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-02 06:17:06 +00:00
ovclas
15698ded4c issue 2775 compare with lower case
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12501 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-02 05:38:28 +00:00
ovclas
95690a41b5 issue 2775 if virtual site, check CSRF change
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12498 201d5d3c-b55e-5fd7-737f-ddc643e51545
2013-01-02 01:59:00 +00:00
ovclas
a1cd4df78e merge from 1.5.3.2 (r12460 ~ r12482)
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12491 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-28 02:34:15 +00:00
ovclas
8641b96831 version up 1.5.3.8
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@12472 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-27 01:14:13 +00:00
ovclas
a3266c1c53 CSRF defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@12460 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-26 04:52:07 +00:00
ovclas
8327266214 issue 2740 rollback json_encode2 function (Because in other feature error )
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12383 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-12 01:44:52 +00:00
ovclas
c7fb2d5ae8 issue 2740 add unique visitor statistics api
json_encode2 function modify (Because Maserati only supports php5.2.4 above)


git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12374 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-12-11 04:55:34 +00:00
ovclas
36a04a44ba Webshell defence and version up
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@12332 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-30 01:17:15 +00:00
ovclas
ea97a5db1e version up 1.5.3.6
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@12317 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-27 11:27:40 +00:00
ovclas
bd901fa68c version up
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@12307 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-27 05:39:05 +00:00
ovclas
d5f055d4f1 version up 1.5.3.4
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@12279 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-22 02:46:22 +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
ovclas
6f66f4f8b9 version up
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12170 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-12 02:48:24 +00:00
ovclas
7486e78757 issue 2652 getRequestUriByServerEnviroment method bug fix
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12050 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-02 10:51:13 +00:00
ovclas
86011ab063 merge from luminous (11139-12038)
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12040 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-11-02 07:20:00 +00:00
ovclas
a6261c58d7 issue 1860 add htmlpurifier to core
support for editor component, widget
check safe iframe in htmlpurifier instead of Embed class


git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11812 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-22 02:45:58 +00:00
ovclas
fa882475d1 XSS defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11733 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-16 06:05:25 +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
flyskyko
51bb8d1985 merger from branch luminous (~r11576)
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11580 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-10-04 05:04:23 +00:00
flyskyko
9f5e25a15e merge from branch 1.5.3.2 (~r11282)
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-19 07:56:40 +00:00
flyskyko
bbcef7ad51 version up to 1.5.3.3
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11282 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-18 04:15:31 +00:00
flyskyko
bcd610fd9f rollback r11012
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11223 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-13 02:49:17 +00:00
flyskyko
b1b6d999d4 version up to 1.5.3.2
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11222 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-13 02:22:34 +00:00
devjin
42eb19ae10 merge from 1.5.3.2(r11162 ~ r11201)
and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-11 02:52:49 +00:00
ovclas
5da785312c issue 2347 fix admin menu bug
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11177 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-07 00:47:15 +00:00
flyskyko
b37e172f65 version up to 1.5.3.2.beta
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11162 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-05 05:30:52 +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
ovclas
d884a771ca XSS Defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11091 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-27 06:16:41 +00:00
flyskyko
0b4f79f420 merge from 1.5.3.1 (r10978-r11049)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11050 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-20 07:56:33 +00:00
flyskyko
ca3403ff43 version up to 1.5.3.1
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11036 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-17 07:20:10 +00:00
flyskyko
d28e3e4176 merge from 1.5.3.2 (embed white list, 11024,11028, 11029,11031,11034)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11035 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-17 07:19:27 +00:00
devjin
e10897f8b9 issue 2239 moved a include code to func.inc.php.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11031 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-16 04:48:03 +00:00
ovclas
927c944ff3 issue 2239 Object, Embed, Iframe source allow by white list
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11024 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-13 02:19:17 +00:00
ChanMyeong
b041550c53 issue 2033 fixed. HTML DTD choosing option is removed. Support only HTML5.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11012 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-09 07:36:25 +00:00
flyskyko
97c23fb891 version up to 1.5.3.1.beta
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10980 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-06 02:48:28 +00:00
chschy
e5bcb968da update 1.5.3 version
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10943 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-26 02:52:40 +00:00
ovclas
9b4c99580e version up 1.5.2.7
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10816 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-02 05:07:03 +00:00
ovclas
49c03b2869 version up
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10795 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-26 01:19:11 +00:00
ovclas
7c5ed1b2b5 XSS Defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10794 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-26 01:02:16 +00:00
flyskyko
86296c899e adds comments for phpDoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10745 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-29 03:26:40 +00:00
ovclas
57a0cc59b1 reverse merge from 1.6.0 (r10156, r10469, r10370, r10369, r10365, r10111, r10110, r10108, r10064, r10063, r10060, r10054, r10052, r10051, r10050, r10049, r10044, r10042, r10041, r10030, r10029, r10024, r10014, r10013)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10715 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 05:52:06 +00:00