Commit graph

1237 commits

Author SHA1 Message Date
chschy
7f49c2a104 modified phpdoc in editor class
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10912 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-19 05:05:55 +00:00
chschy
56256402fa added phpdoc in context class
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10910 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-19 04:55:59 +00:00
devjin
dea849713b r10908 revert
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10909 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-18 13:49:47 +00:00
devjin
dd1db009c6 issue 1993 grant does not check when module_srl is not exist.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10908 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-18 13:33:57 +00:00
flyskyko
33d2137574 issue 1981, fixed a bug on replace parent directory mark ../
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10904 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-17 08:53:50 +00:00
flyskyko
57c3aa5d9d fixed a mistypo
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10901 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-16 10:10:24 +00:00
misol
508c32963d Issue 2144 add to r10896 Context class fix.
and FrontEndFileHandler fix again.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10897 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-14 18:39:33 +00:00
misol
f71fcc8b31 Issue 2144 JS or CSS file index default value is 0 and the index should have interval value.(NO NULL value.)
And remove all file should refer to '$this->'.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10896 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-14 18:19:22 +00:00
flyskyko
ec06013652 merge from branch 1.5.0 (~r10870)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10871 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-12 00:24:11 +00:00
misol
cb1188a542 Issue 2136& Automatically inserted error return url should not contain some characters. Variables need to be processed by HTMLSPECIALCHARS function.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10868 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-11 15:44:26 +00:00
flyskyko
09bec7e84d fixed mistake on r10859
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10866 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-11 05:27:47 +00:00
ovclas
484111e9c1 issue layout copy feature add
layout file upload bug fix


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10864 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-11 01:41:07 +00:00
ucorina
485d7f043c Issue 2131: If page navigation and group by exist in xml query, total count doesn't work well
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10863 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-10 11:53:04 +00:00
flyskyko
30ad13026f fixed a mistake on r10775
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10861 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-10 09:12:01 +00:00
flyskyko
ae60abc551 issue 2128, fixed a problem. Display 'system_message.html not found' message when run not permitted action.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10859 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-10 05:54:14 +00:00
devjin
c131aefc3e issue 2127 "return ModuleObject" code added in ModuleHandler (when error occured)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10858 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-10 05:44:32 +00:00
ovclas
1a7a68efea issue 2109 Fixed a problem in_array function
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10832 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-05 00:16:31 +00:00
ucorina
e1ae5aab97 Issue 2114: XML Query 'null' operation does not work
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10831 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-04 09:00:38 +00:00
ovclas
d5a05fa70b isseu 2112 improve setRedirectUrl method
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10830 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-04 06:08:43 +00:00
ovclas
1ba722b8d1 isseu 2112 improve setRedirectUrl method
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10829 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-04 06:07:27 +00:00
ovclas
cfe9df9cde add phpDoc comment
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10825 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-03 08:19:45 +00:00
flyskyko
e7e74da1f8 issue 2094, fixed a bug. Validator message does not disappear after display message by message module.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10791 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-25 08:36:22 +00:00
ovclas
ebc5edeec7 add phpDoc comment
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10780 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-19 08:53:24 +00:00
misol
43999a0bb1 #2073 remove meaningless letters and regular expressions from template classes/template/TemplateHandler.class.php (There were double removing codes of comments)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10779 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-18 23:46:37 +00:00
ucorina
9846eb7375 Issue 2064: Do not show conditions with not supported operations
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10777 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-18 12:09:52 +00:00
ucorina
40a2d4a6ed Issue 2064: XML Query - added support for not_in
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10776 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-18 12:04:38 +00:00
misol
7fd8f55141 Remove meaningless PHP script open and close syntax.
?><?php would not appear on the template cache files.
 remove __DEBUG__ only syntaxes (as it is use less)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10775 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-16 01:58:18 +00:00
ovclas
3f0dd9cb06 add phpDoc style comment
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10774 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-14 02:33:44 +00:00
dragan-dan
744cc459ac fixed apc caching bug for deletion
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10773 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-13 12:56:09 +00:00
chschy
8b94528a72 adds comments for phpdoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10771 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-12 07:58:55 +00:00
chschy
7d2e67c9ad adds comments for phpdoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10770 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-12 07:09:21 +00:00
chschy
ebfe89ca32 add description of function
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10764 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-06-05 05:33:14 +00:00
chschy
5a510567d1 added comments for phpDoc - handler class
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10759 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-31 07:27:21 +00:00
ovclas
c65e9d3071 adds comments for phpDoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10739 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-25 10:14:48 +00:00
flyskyko
262928157c adds comments for phpDoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10735 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-24 07:02:11 +00:00
flyskyko
e3f346d44b adds comments for phpDoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10734 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-24 06:48:10 +00:00
flyskyko
a3193e105b Remove php5 syntax
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10733 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-24 06:00:39 +00:00
flyskyko
f0034715b2 adds comment for phpDoc and remove php5 syntax
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10732 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-24 05:57:21 +00:00
flyskyko
b1cbc20139 adds comments for phpDoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10731 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-24 02:51:02 +00:00
flyskyko
3625d3a02d adds comments for phpDoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10728 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-24 01:37:50 +00:00
flyskyko
e425c80720 adds comments for phpDoc
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10727 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-23 09:35:50 +00:00
ovclas
dc71fd8df0 merge error fix
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10718 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 06:29:43 +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
a4b3a914a5 reverse merge from 1.6.0 (r10563)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10716 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 06:12:20 +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
e3685a7bd8 reverse merge error fix (r10600 with r10563)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10713 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 01:22:41 +00:00
ovclas
63f9e43024 reverse merge from 1.6.0 (r10572)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10712 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 01:03:30 +00:00
ovclas
f0aa085c94 reverse merge from 1.6.0 (r10563)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10711 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 00:57:29 +00:00
ovclas
8f11300f70 reverse merge from 1.6.0 (r10369)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10707 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-05-17 00:24:30 +00:00