19 csets were pushed to core/adodbupdate: Merge from stable...
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/adodbupdate level 10.
WARNING: These changes bypassed the Quality Assurance Tests!
The following csets were applied:
ChangeSet
1.2050 05/03/03 17:21:28 judgej@acad-ajp. +2 -0
Merge from stable
html/xaradodb/adodb.inc.php
1.50 05/03/03 17:21:18 judgej@acad-ajp. +0 -2
No real changes
html/modules/installer/xaradmin.php
1.159 05/03/03 17:21:17 judgej@acad-ajp. +1 -22
Various
ChangeSet
1.2035.1.15 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.2035.1.14 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.2035.1.13 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.2035.1.12 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.2035.3.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.50.1 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.2035.2.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.2035.1.8 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.2035.1.7 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.156.1.2 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.2035.1.6 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.2035.1.5 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.2035.1.4 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.2035.1.3 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
ChangeSet
1.2035.1.2 05/02/27 16:06:53 [email protected] +1 -0
bug 3907 - make ADODB errors less apparent again to allow Postgres installations
html/xaradodb/adodb.inc.php
1.46.1.1 05/02/27 16:06:43 [email protected] +1 -1
bug 3907 - make ADODB errors less apparent again to allow Postgres installations
ChangeSet
1.2035.1.1 05/02/27 06:44:55 mikespub-L1MWAzIoyeYCZudI/[email protected] +2 -0
fix Postgres DB create/select at installation
BitKeeper/etc/logging_ok
1.184 05/02/27 06:44:55 mikespub-L1MWAzIoyeYCZudI/[email protected] +1 -0
Logging to [email protected] accepted
html/modules/installer/xaradmin.php
1.156.1.1 05/02/27 06:44:42 mikespub-L1MWAzIoyeYCZudI/[email protected] +15 -2
fix Postgres DB create/select at installation
Links for the differences:
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]
http://xaraya.com:15000/core/adodbupdate/[email protected]