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
|
09dc853b4d
|
reverse merge from 1.6.0 (r10156)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10710 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-17 00:40:20 +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 |
|
ovclas
|
1321d26975
|
reverse merge from 1.6.0 (r10370)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10708 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-17 00:33:21 +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 |
|
ovclas
|
826878c104
|
reverse merge from 1.6.0 (r10365)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10706 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-17 00:21:10 +00:00 |
|
ovclas
|
4ca31d49b5
|
reverse merge from 1.6.0 (r10111)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10705 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-17 00:18:38 +00:00 |
|
ovclas
|
adc8d2bdd1
|
reverse merge from 1.6.0 (r10110)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10704 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 10:06:13 +00:00 |
|
ovclas
|
f194374a79
|
reverse merge from 1.6.0 (r10108)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10703 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 10:03:57 +00:00 |
|
ovclas
|
3629fadab8
|
reverse merge from 1.6.0 (r10064)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10702 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:56:36 +00:00 |
|
ovclas
|
fe75a29691
|
reverse merge from 1.6.0 (r10060)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10701 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:52:40 +00:00 |
|
ovclas
|
696a3164c3
|
reverse merge from 1.6.0 (r10054)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10700 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:48:38 +00:00 |
|
ovclas
|
6ab58529f8
|
reverse merge from 1.6.0 (r10052)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10699 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:47:22 +00:00 |
|
ovclas
|
c6c3fdcf12
|
reverse merge from 1.6.0 (r10051)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10698 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:46:12 +00:00 |
|
ovclas
|
5b58ed4481
|
reverse merge from 1.6.0 (r10050)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10697 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:44:54 +00:00 |
|
ovclas
|
5de49d00f7
|
reverse merge from 1.6.0 (r10049)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10696 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:42:38 +00:00 |
|
ovclas
|
7cacf8590a
|
reverse merge from 1.6.0 (r10044)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10695 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:38:19 +00:00 |
|
ovclas
|
c9e85cea27
|
reverse merge from 1.6.0 (r10041)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10694 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:35:25 +00:00 |
|
ovclas
|
636bc9437f
|
reverse merge from 1.6.0 (r10030)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10693 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:34:01 +00:00 |
|
ovclas
|
f6043e67a7
|
reverse merge from 1.6.0 (r10024)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10692 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:26:24 +00:00 |
|
ovclas
|
546da7c0bd
|
reverse merge from 1.6.0 (r10014)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10691 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:22:54 +00:00 |
|
ovclas
|
75f9ef95cf
|
reverse merge from 1.6.0 (r10013)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10690 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:21:05 +00:00 |
|
ovclas
|
ac1783e77f
|
reverse merge from 1.6.0 (r10578)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10689 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 09:02:50 +00:00 |
|
ovclas
|
2b7a348eae
|
reverse merge from 1.6.0 (r10594)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10688 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 07:29:36 +00:00 |
|
ovclas
|
8dea2fd567
|
reverse merge from 1.6.0 (r10595)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10687 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 07:27:06 +00:00 |
|
ovclas
|
68485bc529
|
reverse merge from 1.6.0 (r10596)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10686 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 07:22:54 +00:00 |
|
ovclas
|
6a809f1ce7
|
reverse merge from 1.6.0 (r10600)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10685 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 07:21:17 +00:00 |
|
ovclas
|
2966fded91
|
reverse merge from 1.6.0 (r10667)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10684 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 07:18:16 +00:00 |
|
ovclas
|
b52d9f1129
|
reverse merge from 1.6.0 (r10668)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10683 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-16 07:15:02 +00:00 |
|
dragan-dan
|
c25b22d669
|
added document last_updater to query and data importer
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10682 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-15 15:27:21 +00:00 |
|
ucorina
|
f867fb2466
|
Issue 1996: Arguments in subquery are not used when the subquery is part of the select statement
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10681 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-15 13:44:55 +00:00 |
|
chschy
|
72a4d6b0d1
|
added a test for custom rule xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10678 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-14 12:05:25 +00:00 |
|
flyskyko
|
914dc85249
|
issue 1990, fixed a bug. does not working expression rule of validator
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10677 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-14 09:39:26 +00:00 |
|
ovclas
|
8d1e6ca1ba
|
version up (1.5.2.5)
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10673 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-14 08:02:09 +00:00 |
|
ovclas
|
1aa87a3442
|
Webshell defense
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10672 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-11 09:35:07 +00:00 |
|
ovclas
|
4d4b66d0d2
|
issue 1980 Add use index to document select query
add low priority to document DML query
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10665 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-07 04:59:43 +00:00 |
|
ryin005
|
3bbddf032e
|
[issue 1864] add Chinese language to /addons/adminlogging/conf/info.xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10664 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-04 10:39:49 +00:00 |
|
ryin005
|
17d3bfa6e6
|
[issue 1865] add Chinese language to /addons/captcha/lang/lang.xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10663 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-04 10:37:06 +00:00 |
|
ryin005
|
37241e24bc
|
[issue 1867] add Chinese language to /addons/mobile/lang/lang.xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10662 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-04 10:33:43 +00:00 |
|
ryin005
|
f3a735d852
|
[issue 1868] add Chinese language to /common/lang/lang.xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10661 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-04 10:28:28 +00:00 |
|
ryin005
|
9340584057
|
[issue 1869] add Chinese language to /modules/addon/conf/module.xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10660 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-04 10:24:27 +00:00 |
|
ryin005
|
c303224ada
|
[issue 1870] add Chinese language to /modules/addon/lang/lang.xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10659 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-04 10:22:21 +00:00 |
|
ryin005
|
1a6aba126a
|
[issue 1871] add Chinese language to /modules/admin/conf/module.xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10658 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-04 10:09:30 +00:00 |
|
ryin005
|
d7dd54b32a
|
[issue 1872] Add Chinese language to /modules/admin/lang/lang.xml
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10657 201d5d3c-b55e-5fd7-737f-ddc643e51545
|
2012-05-04 10:00:32 +00:00 |
|