33 csets were pushed to core/extraget: Merge [email protected]:/var/bk/xaraya/c...
judgej-111RdWWlOxkOkXtL6OYfHgC/[email protected] (Jason Judge)
| Newsgroups | gmane.comp.cms.xaraya.bk-notices |
|---|---|
| Organization | Xaraya |
| Message-ID | <[email protected]> |
Changes were applied by judgej to core/extraget level 10.
WARNING: These changes bypassed the Quality Assurance Tests!
The following csets were applied:
ChangeSet
1.2064 05/03/09 10:14:31 judgej@acad-ajp. +1 -0
Merge [email protected]:/var/bk/xaraya/core/stable
into acad-ajp.:F:/bk/core/extraget
html/includes/xarMod.php
1.307 05/03/09 10:14:26 judgej@acad-ajp. +0 -0
Auto merged
ChangeSet
1.2061.1.1 05/03/08 13:41:50 [email protected] +1 -0
adodb-mysql.inc.php:
Bug 4192: replace SelectLimit() with corrected version from adodb 4.60
html/xaradodb/drivers/adodb-mysql.inc.php
1.28 05/03/08 13:40:29 [email protected] +10 -24
Bug 4192: replace SelectLimit() with corrected version from adodb 4.60
ChangeSet
1.2060.1.1 05/03/08 14:36:16 marc@marclaptop. +1 -0
build.properties:
add Japanse to the list of installer languages
build.properties
1.18 05/03/08 13:51:49 marc@marclaptop. +1 -1
add Japanse to the list of installer languages
ChangeSet
1.2061 05/03/08 09:24:56 [email protected] +1 -0
_findfile.php:
Allow javascript to be located in a sub-directory of the templates include directory.
html/modules/base/xarjavascriptapi/_findfile.php
1.7 05/03/08 09:24:08 [email protected] +2 -2
Allow javascript to be located in a sub-directory of the templates include directory.
ChangeSet
1.2060 05/03/07 15:51:11 marcel-111RdWWlOxkOkXtL6OYfHgC/[email protected] +1 -0
deep:
Make deep script aware whether it is in a repo, both should work
Change mode to -rwxrwxrwx
BitKeeper/custom/deep
1.3 05/03/07 15:50:25 marcel-111RdWWlOxkOkXtL6OYfHgC/[email protected] +11 -4
Make deep script aware whether it is in a repo, both should work
ChangeSet
1.2059 05/03/07 16:23:17 marc@marclaptop. +1 -0
.del-releaselog.txt~f20cc8de:
Delete: BitKeeper/custom/releaselog.txt
BitKeeper/deleted/.del-releaselog.txt~f20cc8de
1.2 05/03/07 16:18:04 marc@marclaptop. +0 -0
Delete: BitKeeper/custom/releaselog.txt
BitKeeper/custom/deep
1.2 05/03/07 15:11:41 random-111RdWWlOxkOkXtL6OYfHgC/[email protected] +0 -0
Change mode to -rwxrwxrwx
ChangeSet
1.2058 05/03/07 15:37:29 marc@marclaptop. +2 -0
releaselog.txt, deep:
new file
BitKeeper/custom/releaselog.txt
1.1 05/03/07 15:29:08 marc@marclaptop. +78 -0
BitKeeper/custom/releaselog.txt
1.0 05/03/07 15:29:08 marc@marclaptop. +0 -0
BitKeeper file C:/Program Files/Apache Group/Apache2/htdocs/stable/BitKeeper/custom/releaselog.txt
BitKeeper/custom/deep
1.1 05/03/07 15:28:55 marc@marclaptop. +76 -0
BitKeeper/custom/deep
1.0 05/03/07 15:28:55 marc@marclaptop. +0 -0
BitKeeper file C:/Program Files/Apache Group/Apache2/htdocs/stable/BitKeeper/custom/deep
ChangeSet
1.2057 05/03/06 11:09:04 [email protected] +1 -0
Change the default behavior on reusing client cache without revalidation.
Least surprising default behavior.
html/includes/caching/page.php
1.20 05/03/06 11:09:02 [email protected] +1 -1
Change the default behavior on reusing client cache without revalidation.
This means a user will have to enable this feature specifically
to allow clients to reuse cache without revalidation. Hopefully
this will mean people will know what behavior to expect when this
feature is enabled.
ChangeSet
1.2056 05/03/06 17:29:36 [email protected] +1 -0
fix logout link in account page
html/modules/roles/xartemplates/user-account.xd
1.18 05/03/06 17:29:28 [email protected] +2 -2
fix logout link in account page
ChangeSet
1.2055 05/03/06 16:14:40 [email protected] +3 -0
bug 4141 - data label template
html/modules/dynamicdata/xaruserapi/handlelabeltag.php
1.6 05/03/06 16:14:29 [email protected] +2 -6
bug 4141 - data label template
html/modules/dynamicdata/class/properties.php
1.68 05/03/06 16:14:29 [email protected] +33 -8
bug 4141 - data label template
html/modules/dynamicdata/xartemplates/user-label.xd
1.1 05/03/06 16:14:08 [email protected] +10 -0
html/modules/dynamicdata/xartemplates/user-label.xd
1.0 05/03/06 16:14:08 [email protected] +0 -0
BitKeeper file D:/wintools/cygwin/home/stable/html/modules/dynamicdata/xartemplates/user-label.xd
ChangeSet
1.2052.1.1 05/03/06 16:59:17 jojodee-CZ0/[email protected] +2 -0
Remove exta authid from template as only one form here now.
Set default value of $overview - should be zero and mod var set to true when $overview is 1
html/modules/adminpanels/xartemplates/admin-modifyconfig.xd
1.48 05/03/06 16:59:13 jojodee-CZ0/[email protected] +0 -1
Remove extrnious $authid - not longer reqired as there is only one form here now.
html/modules/adminpanels/xaradmin/updateconfig.php
1.24 05/03/06 16:59:13 jojodee-CZ0/[email protected] +3 -3
Set correct default value for $overview and set modvar true if $overview equals 1
ChangeSet
1.2053 05/03/06 01:09:40 [email protected] +2 -0
bug 1575 - Oracle tweaks
html/includes/datastores/Dynamic_VariableTable_DataStore.php
1.23 05/03/06 01:09:32 [email protected] +8 -1
bug 1575 - Oracle tweaks
html/includes/datastores/Dynamic_FlatTable_DataStore.php
1.20 05/03/06 01:09:32 [email protected] +4 -2
bug 1575 - Oracle tweaks
ChangeSet
1.2052 05/03/05 18:15:13 [email protected] +12 -0
bug 1575 - Oracle installation (not supported)
html/includes/xarSession.php
1.97 05/03/05 18:12:09 [email protected] +1 -0
bug 1575 - Oracle installation (not supported)
html/includes/xarSession.php
1.96 05/03/05 18:05:17 [email protected] +13 -3
bug 1575 - Oracle installation (not supported)
html/modules/roles/xaruserapi/get.php
1.17 05/03/05 17:41:33 [email protected] +5 -2
bug 1575 - Oracle installation (not supported)
html/modules/privileges/xarprivileges.php
1.172 05/03/05 17:18:26 [email protected] +7 -7
bug 1575 - Oracle installation (not supported)
html/modules/roles/xarroles.php
1.85 05/03/05 17:18:21 [email protected] +4 -4
bug 1575 - Oracle installation (not supported)
html/modules/blocks/xaruserapi/getall.php
1.7 05/03/05 17:18:15 [email protected] +22 -22
bug 1575 - Oracle installation (not supported)
html/modules/installer/xaradmin.php
1.159 05/03/05 16:52:30 [email protected] +2 -1
bug 1575 - Oracle installation (not supported)
html/modules/modules/xaradminapi/getlist.php
1.23 05/03/05 16:52:03 [email protected] +3 -3
bug 1575 - Oracle installation (not supported)
html/modules/adminpanels/xarinit.php
1.53 05/03/05 16:50:04 [email protected] +11 -11
bug 1575 - Oracle installation (not supported)
html/includes/xarTableDDL.php
1.69 05/03/05 16:49:40 [email protected] +20 -6
bug 1575 - Oracle installation (not supported)
html/includes/xarMod.php
1.305.1.1 05/03/05 16:49:40 [email protected] +6 -3
bug 1575 - Oracle installation (not supported)
html/includes/xarDB.php
1.60 05/03/05 16:49:40 [email protected] +2 -2
bug 1575 - Oracle installation (not supported)
html/includes/xarBlocks.php
1.141 05/03/05 16:49:39 [email protected] +4 -4
bug 1575 - Oracle installation (not supported)
ChangeSet
1.2051 05/03/05 13:16:13 [email protected] +2 -0
mysterious Document contains no data error with eAccelerator
html/includes/log/loggers/simple.php
1.26 05/03/05 13:15:43 [email protected] +2 -2
mysterious Document contains no data error with eAccelerator
html/includes/xarLog.php
1.63 05/03/05 13:15:31 [email protected] +1 -1
mysterious Document contains no data error with eAccelerator
ChangeSet
1.2050 05/03/03 16:43:08 [email protected] +2 -0
Backport of patch applied to xar.com for dtd less serving. (RSS in this case)
html/includes/xarBLCompiler.php
1.272 05/03/03 16:43:06 [email protected] +1 -1
backport of patch applied to xar.com for dtd less serving
html/includes/blnodes/tags/blocklayout.php
1.7 05/03/03 16:43:06 [email protected] +2 -2
backport of patch applied to www.xar.com repo for dtd less serving
ChangeSet
1.2049 05/03/03 14:20:44 [email protected] +1 -0
plain view had far right shift, <br/> fixes it for me, improve as see fit
apparently this is a FF bug.
html/modules/blocks/xartemplates/includes/plain.xd
1.16 05/03/03 14:20:43 [email protected] +2 -0
plain view had far right shift, <br/> fixes it for me, improve as see fit
ChangeSet
1.2048 05/03/03 09:54:48 [email protected] +1 -0
missing background image - happened on the backport from corecss
html/themes/Xaraya_Classic/images/itemarrowdown.gif
1.1 05/03/03 09:54:38 [email protected] +3 -0
html/themes/Xaraya_Classic/images/itemarrowdown.gif
1.0 05/03/03 09:54:38 [email protected] +0 -0
BitKeeper file /Users/andyv/Sites/stable/html/themes/Xaraya_Classic/images/itemarrowdown.gif
ChangeSet
1.2047 05/03/01 16:20:20 John.Cox@mcnabb. +2 -0
commenting out the transforms from earlier.
html/modules/base/xarblocks/text.php
1.28 05/03/01 16:20:16 John.Cox@mcnabb. +3 -2
commenting out the transforms from earlier.
html/modules/base/xarblocks/html.php
1.32 05/03/01 16:20:15 John.Cox@mcnabb. +3 -1
commenting out the transforms from earlier.
ChangeSet
1.2044.1.1 05/03/01 11:25:08 John.Cox@mcnabb. +2 -0
I know I saw some bugs on this, but can't find them now...
html/modules/base/xarblocks/text.php
1.27 05/03/01 11:25:03 John.Cox@mcnabb. +2 -0
transforms for html and text blocks.
html/modules/base/xarblocks/html.php
1.31 05/03/01 11:25:03 John.Cox@mcnabb. +2 -0
transforms for html and text blocks.
ChangeSet
1.2016.1.18 05/03/01 09:35:27 [email protected] +1 -0
the hardcoded numitems prevented the datalist from using the url for getting the numitems param
html/modules/dynamicdata/xartemplates/admin-view.xd
1.30 05/03/01 09:35:25 [email protected] +1 -1
the hardcoded numitems prevented the datalist from using the url for getting the numitems param
ChangeSet
1.2041.1.1 05/02/28 08:44:24 John.Cox@mcnabb. +1 -0
bug 4159 disable minage when set to 0.
html/modules/roles/xaruser/register.php
1.33 05/02/28 08:44:20 John.Cox@mcnabb. +8 -1
bug 4159 disable minage when set to 0.
ChangeSet
1.2043 05/02/28 06:24:57 rabbitt-111RdWWlOxkOkXtL6OYfHgC/[email protected] +1 -0
login.php:
Comments say 15 minutes but 54000 seconds is 15 hours.
Did a little simplification as well.
(ie: store the time to unlock instead of the time it was locked)
html/modules/roles/xaruser/login.php
1.29 05/02/28 06:23:35 rabbitt-111RdWWlOxkOkXtL6OYfHgC/[email protected] +10 -7
Comments say 15 minutes but 54000 seconds is 15 hours.
Did a little simplification as well.
(ie: store the time to unlock instead of the time it was locked)
ChangeSet
1.2042 05/02/28 05:58:31 rabbitt-111RdWWlOxkOkXtL6OYfHgC/[email protected] +1 -0
xaradmin.php:
Please be careful in the future with merging stuff locally.
when you merged your stuff locally marcel, you completely wiped out my fix for postgresql install (which should work fine with SQLite as well).
Just reintroducing that fix (which imo, is cleaner and should work on all dbs we use -without- having to add another case statement to the switch that was introduced).
html/modules/installer/xaradmin.php
1.158 05/02/28 05:54:49 rabbitt-111RdWWlOxkOkXtL6OYfHgC/[email protected] +20 -20
Please be careful in the future with merging stuff locally.
when you merged your stuff locally marcel, you completely wiped out my fix for postgresql install (which should work fine with SQLite as well).
Just reintroducing that fix (which imo, is cleaner and should work on all dbs we use -without- having to add another case statement to the switch that was introduced).
ChangeSet
1.2041 05/02/27 19:00:47 John.Cox@mcnabb. +1 -0
fixed bug 3420 potential security enhancement. used session vars, so original user is not screwed by hacker.
html/modules/roles/xaruser/login.php
1.28 05/02/27 19:00:40 John.Cox@mcnabb. +23 -6
fixed bug 3420 potential security enhancement. used session vars, so original user is not screwed by hacker.
ChangeSet
1.2040 05/02/27 18:06:35 John.Cox@mcnabb. +4 -0
bug 2773 disable email from users
html/modules/roles/xartemplates/user-view.xd
1.67 05/02/27 18:06:31 John.Cox@mcnabb. +11 -7
bug 2773 disable email from users
html/modules/roles/xartemplates/user-display.xd
1.19 05/02/27 18:06:30 John.Cox@mcnabb. +11 -9
bug 2773 disable email from users
html/modules/roles/xartemplates/admin-modifyconfig.xd
1.57 05/02/27 18:06:30 John.Cox@mcnabb. +15 -1
bug 2773 disable email from users
html/modules/roles/xaradmin/modifyconfig.php
1.19 05/02/27 18:06:30 John.Cox@mcnabb. +2 -0
bug 2773 disable email from users
ChangeSet
1.2039 05/02/27 17:40:23 John.Cox@mcnabb. +1 -0
bug 2367 error message for double validationerror message for double validation
html/modules/roles/xaruser/getvalidation.php
1.21 05/02/27 17:40:19 John.Cox@mcnabb. +6 -0
bug 2367
ChangeSet
1.2038 05/02/27 18:23:38 [email protected] +1 -0
articles sequence number FIXME
tools/import/slashcode/import_slashcode_stories.php
1.5 05/02/27 18:23:29 [email protected] +2 -0
articles sequence number FIXME
Links for the differences:
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]
http://xaraya.com:15000/core/extraget/[email protected]