Commit graph

9526 commits

Author SHA1 Message Date
ucorina
5ee72554f1 Issue 2288: Bug in XML Query with "like" clause
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11081 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-24 10:06:32 +00:00
ovclas
8ee56fff9f merge from 1.5.3.2 for hotfix (r11067, r11069, r11070, r11073)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11074 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-23 04:28:20 +00:00
ovclas
31be172d7f rollback 11071
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11072 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-23 04:07:28 +00:00
ovclas
e0a3ffea7f merge from 1.5.3.2 (hotfix : r11061 ~ r11070)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11071 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-23 02:24:32 +00:00
flyskyko
94619c9a11 php4 problem
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11065 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-22 15:40:17 +00:00
flyskyko
5830740c52 issue 63 . make it able to use checking is_logged status in menu grant
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11063 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-22 14:00:52 +00:00
devjin
022b44b744 issue 2259 removed the agreement file when delete agreement text in member configuration.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11047 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-20 05:13:49 +00:00
ovclas
50cc3813b9 issue 2239 re-commit r11043 to branch 1.5.3.1
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11044 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-20 01:49:40 +00:00
ovclas
996000dfd8 issue 2239 remove ext check in iframe tag.
iframe tag shoud check only white domain list


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11042 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-17 09:18:35 +00:00
misol
6a633b3cb4 Remove 'getMemberMenu' from SSL action, because of XE Core bug...
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11040 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-17 08:54:05 +00:00
misol
18e2cec3d2 Remove 'tpl' directory *.html files from reserving template source file list.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11039 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-17 08:28:02 +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
ef0fdbe038 issue 1714 remvoe columnList in getMemberInfoByUserId.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11001 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-08 11:57:17 +00:00
flyskyko
192f119fc2 Change $this to self for backward compatibility
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10992 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-07 12:54:09 +00:00
misol
f9a2b2a75d Issue 2134 Add 'Member Leave' functions to 'SSL actions'.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10986 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-06 11:52:18 +00:00
misol
baeb4dd465 Issue 2215: fix SSL Action variable to be shown fairly.
Before: ssl_actions variable was defined at the bottom of the template file.
After: Define ssl_actions variable at the top of the page, and define JS File and CSS file variable at the top of the page.
(Defining order miss was found and I fix it.)

SSL XML communication via function 'exec_xml', defined on xe.js, need 'ssl_actions' variable but it was written as empty before, so I fix the variable to contain SSL actions as it intended to.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10985 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-06 11:34:12 +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
flyskyko
f3a6fc5573 issue 2163, some change
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10976 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-06 00:39:32 +00:00
ovclas
2f08f0c273 issue 1894 fixed update method with invalid argument
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10975 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-03 10:59:15 +00:00
devjin
f59eec72f0 issue 873 retouch.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10974 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-03 10:05:40 +00:00
devjin
71a4b27c52 issue 641 retouch
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10973 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-03 09:22:34 +00:00
flyskyko
a6f9cc5401 issue 2163, additional commit
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10972 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-03 06:56:51 +00:00
flyskyko
9c72597b95 issue 1263, changed a upload process on layout modify
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10971 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-03 06:55:02 +00:00
devjin
78e0330b21 issue 641 update email and resend auth mail.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10970 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-03 06:46:05 +00:00
flyskyko
f4aa1350bf issue 1925, additional commit
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10969 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-03 01:26:48 +00:00
devjin
ebe22cafa2 issue 225 all comment remove when removed comment of parent.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10968 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-02 08:49:46 +00:00
flyskyko
578008f085 additional commit for r10958
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10967 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-01 09:19:24 +00:00
devjin
9d9b6f1c12 issue 873 add multilanguage agreement.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10966 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-01 09:14:46 +00:00
devjin
1d4bb452d0 issue 1946 remove open id code in module of member.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10965 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-01 07:43:36 +00:00
flyskyko
e63896bbf9 merge from branch 1.5.0 (r10956)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10963 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-01 05:26:55 +00:00
flyskyko
69d539ca90 issue 2185, Fixed a bug related html entity on content/mobile content widget
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10962 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-08-01 05:15:23 +00:00
flyskyko
b3d066e9d9 issue 2194, added a option for select behavior open link
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10961 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-31 09:22:14 +00:00
chschy
bbc2adb855 issue 1968 add meta tag in html head.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10960 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-31 06:52:19 +00:00
flyskyko
cd4650b6d8 issue 2186, added protection codes prevent access empty property
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10959 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-31 06:48:30 +00:00
flyskyko
3f8aed1b8b issue 2192, Get thumbnail when rss/atom
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10958 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-31 05:10:30 +00:00
flyskyko
f240a210b6 issue 2193, use correct identifier on member pointer list
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10957 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-31 04:37:02 +00:00
ucorina
2681ef5502 Issue 2191: XML query condition 'like' error.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10956 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-30 15:24:45 +00:00
chschy
71aeed5009 issue 63. make it able to use checking is_logged status in menu grant
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10955 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-27 09:49:27 +00:00
devjin
339c6e6d29 issue 1894 modify name of layout in theme, add 'skin fixed' option on page info.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10954 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-27 05:42:00 +00:00
chschy
f7109b400e minify admin.min.js
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10953 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-27 03:05:58 +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
f54644489a 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@10950 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-27 01:34:01 +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
misol
8fdc8f2852 Issue 2134 Set SSL to 'Email controlling pages'
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10946 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-26 14:57:56 +00:00
misol
02c5535bdd Issue 2176 related to http://www.xpressengine.com/userForum/20977959
avoid DB addition error.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10945 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-26 13:54:06 +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
nagoon97
282f285b8d Issue 2041: Instance creation syntax simplified.
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10942 201d5d3c-b55e-5fd7-737f-ddc643e51545
2012-07-25 02:16:12 +00:00