Commit graph

439 commits

Author SHA1 Message Date
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
chschy
ab1372b514 Issue 2377: Admin Ui Refactoring - Settings - File Box
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11566 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-28 02:07:18 +00:00
flyskyko
01462039b6 Issue 2377: Admin Ui Refactoring - Settings - File Box
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11561 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-27 11:19:49 +00:00
ovclas
05c184d6e2 issue 2522 develop for shortcut menu insert
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11512 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-25 13:03:29 +00:00
ovclas
6a4e458710 issue 2364 menu copy debug.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11466 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-24 07:59:52 +00:00
ucorina
d3cb41a17b Issue 2511: Make XE menu work with virtual sites too
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11404 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-20 14:36:17 +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
d436cd26aa issue 2503, fixed a bug. execute timeout on sitemap page, if there are so many module instance.
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11377 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-19 07:13:52 +00:00
devjin
68e87187fb issue 2369 get list of module.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11335 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-19 02:50:37 +00:00
devjin
ffde9607d9 issue 2370, issue 2373, issue 2374 add the site design info.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11303 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-18 08:41:42 +00:00
ovclas
0e3d957f99 issue 2364 develop menu copy function with module copy
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11230 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-13 09:40:15 +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
devjin
3c4235309e issue 2365 update module link.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11207 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-11 07:20:14 +00:00
ovclas
ff608c540a issue 2363 create get grant method by xml api
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11206 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-11 07:09:42 +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
flyskyko
910814ac5e issue 2270, fixed a bug that exceed memory size on module instance list
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11147 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-04 02:24:56 +00:00
flyskyko
38e0c8e595 issue 2333, fixed a bug that always convert default url to lowcase and save to DB.
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11141 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-09-03 06:30:13 +00:00
devjin
87cc537eb2 issue 2123 added an error message.
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11127 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-30 12:03:32 +00:00
devjin
cdbdef7adc issue 2303 add a mobile content in type of ARTICLE page.
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11126 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-30 09:27:19 +00:00
ovclas
885c934805 remove debug code
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11117 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-30 01:42:12 +00:00
ovclas
8d0778b601 issue 2311 copy additional setting when module is copied.
And skin vars also.


git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11116 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-29 09:58:53 +00:00
devjin
b2e40525c5 set default value in extra variables.
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11113 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-29 07:35:45 +00:00
misol
d89c634dd0 HTML refining: html syntax fix, and add multi-language items on the admin pages
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11066 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-22 16:37:02 +00:00
devjin
b7df903799 issue 2205 modified a function that a new document create when copied page type of article.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11018 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-09 13:12:38 +00:00
devjin
2b6f473b26 issue 2168 set member skin through theme. And update path of theme skin using for '|@|'.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11016 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-09 12:09:18 +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
d97822999e merge from 1.5.3 (~r10951). required minify admin.min.js
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10952 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-27 03:04:27 +00:00
misol
dc2bc8395f Undo r10948
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10949 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-27 01:33:13 +00:00
misol
462e4ee570 Issue 2180 set agreement as NULL when it update the value.
1.5.3.1 branch has no agreement update value, so.. I commit on the 1.5.3 branch.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10948 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-27 01:21:16 +00:00
misol
967d9c399d Issue 2177 refining module.model.php getModuleList().
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10947 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-26 16:18:07 +00:00
nagoon97
804f42a8e1 Issue 2041: Starting module search UI modified for easier use
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10921 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-20 10:25:08 +00:00
flyskyko
53175d7c1e added omitted files on r10872
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10914 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-19 05:24:18 +00:00
chschy
beb9a9f89e issue 2154 XSS Defense in admin permission manage page
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10903 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-17 06:44:22 +00:00
devjin
d3bfe624b1 issue 2150 fixed host used to check domain.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10900 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-16 09:50:57 +00:00
chschy
4e1b64680d r1498 use existing value
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10885 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-13 04:33:49 +00:00
chschy
07788cc03e issue 1498 group modification of mobile skin, mobile layout
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10877 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-12 10:08:14 +00:00
chschy
883e81fd0a issue 2129 could not find a site domain when access short url because of case-sensitive
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10874 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-12 08:33:21 +00:00
chschy
4a3419ada7 delete r10860
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10873 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-12 08:22:49 +00:00
flyskyko
14961c7c9a issue 1571, Added a feature for setting of mobile skin
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10872 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-12 07:25:00 +00:00
chschy
fb8953c837 issue 2129 could not find a site domain when access short url because of case-sensitive
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10860 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-10 06:34:43 +00:00
flyskyko
6eab5837a5 added protection codes
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10848 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-09 01:51:52 +00:00
ovclas
d8c49ddeae issue 1110 add module category in mid list
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10843 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-06 08:53:22 +00:00
ovclas
2d285e60d1 issue 2003 fix checkbox value (string to array)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10835 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-05 05:49:57 +00:00
ovclas
ee1b1f0347 issue 2059 add target value in form
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10833 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-05 01:29:49 +00:00
ovclas
011120e5e0 issue 2112 improve setRedirectUrl method
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10828 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-04 06:00:47 +00:00
ovclas
aa8fa156ca issue 1110 add layout management in sitemap
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10826 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-03 08:20:49 +00:00
ovclas
f7330acf02 reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 06:27:55 +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
ovclas
3afad81016 reverse merge rollback
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10714 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 02:38:33 +00:00
ovclas
4f9581fde5 reverse merge from 1.6.0 (r10469)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10709 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 00:34:57 +00:00