42 csets were pushed to core/userlocale: Merge [email protected]:/var/bk/xaraya/cor...

Changes were applied by voll to core/userlocale level 15.
    WARNING: These changes bypassed the Quality Assurance Tests!
    The following csets were applied:
    
    ChangeSet
      1.1893 05/03/12 11:41:56 [email protected] +2 -0
      Merge [email protected]:/var/bk/xaraya/core/stable
      into yahoo.com:/var/bk/xaraya/core/userlocale
    
      html/includes/xarUser.php
        1.153 05/03/12 11:41:55 [email protected] +0 -0
        Auto merged
    
      BitKeeper/etc/logging_ok
        1.175 05/03/12 11:41:53 [email protected] +0 -0
        auto-union
    
    ChangeSet
      1.1886.1.181 05/03/11 16:31:24 [email protected] +6 -0
      Make the objectlist family of templates manageable.
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-table.xd
        1.1 05/03/11 16:31:22 [email protected] +66 -0
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-subform.xd
        1.1 05/03/11 16:31:22 [email protected] +31 -0
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-list.xd
        1.1 05/03/11 16:31:22 [email protected] +55 -0
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-default.xd
        1.1 05/03/11 16:31:22 [email protected] +2 -0
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-table.xd
        1.0 05/03/11 16:31:22 [email protected] +0 -0
        BitKeeper file /var/bk/xar/core/xartest/html/modules/dynamicdata/xartemplates/includes/objectlist-table.xd
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-subform.xd
        1.0 05/03/11 16:31:22 [email protected] +0 -0
        BitKeeper file /var/bk/xar/core/xartest/html/modules/dynamicdata/xartemplates/includes/objectlist-subform.xd
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-list.xd
        1.0 05/03/11 16:31:22 [email protected] +0 -0
        BitKeeper file /var/bk/xar/core/xartest/html/modules/dynamicdata/xartemplates/includes/objectlist-list.xd
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-default.xd
        1.0 05/03/11 16:31:22 [email protected] +0 -0
        BitKeeper file /var/bk/xar/core/xartest/html/modules/dynamicdata/xartemplates/includes/objectlist-default.xd
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-cells.xd
        1.1 05/03/11 16:31:21 [email protected] +32 -0
    
      html/modules/dynamicdata/xartemplates/includes/objectlist-cells.xd
        1.0 05/03/11 16:31:21 [email protected] +0 -0
        BitKeeper file /var/bk/xar/core/xartest/html/modules/dynamicdata/xartemplates/includes/objectlist-cells.xd
    
      html/modules/dynamicdata/xartemplates/admin-objectlist.xd
        1.17 05/03/11 16:31:21 [email protected] +24 -264
        - put the different layouts in subtemplates so templates are more manageable
        - also create the objectlist-default.xd template which in turn includes the current default layout. If another layout is needed by default
        overriding that template is enough, which adds another road to changing the default, next to the url parameter.
    
    ChangeSet
      1.1886.151.1 05/03/11 15:42:40 [email protected] +4 -0
      Miscelaneous template related things when working on serving content as xml across the board.
    
      html/modules/dynamicdata/xaradmin/view.php
        1.17 05/03/11 15:42:38 [email protected] +1 -1
        - users & groups still not prepped everywhere
    
      html/modules/adminpanels/xarblocks/adminmenu.php
        1.105 05/03/11 15:42:38 [email protected] +1 -1
        - users & groups still not prepped everywhere
    
      html/includes/xarTemplate.php
        1.233 05/03/11 15:42:38 [email protected] +2 -2
        produce a bit less space.
    
      html/includes/xarBLCompiler.php
        1.273 05/03/11 15:42:38 [email protected] +5 -5
        - relax the first line requirement a bit, so we can start playing with multiple xml headers (like stylesheets). 
        they still need to occur before the root tag though. (this cycle is a repeat of the doctype story, which was fine, the xml headers location
        is actually wrong, because they ultimately belong to the output format and not to the template. For now we ignore that fact for a while
        just like we did with the doctype. )
    
    ChangeSet
      1.1886.150.1 05/03/10 22:10:41 voll-/[email protected] +3 -0
      Fixed bug 3164 - add moduservar for user locale, add checks for wrong locale
    
      html/upgrade.php
        1.116 05/03/10 22:10:29 voll-/[email protected] +4 -1
        Fixed bug 3164 - add moduservar for user locale, add checks for wrong locale
    
      html/modules/roles/xarinit.php
        1.111 05/03/10 22:10:29 voll-/[email protected] +2 -0
        Fixed bug 3164 - add moduservar for user locale, add checks for wrong locale
    
      html/includes/xarUser.php
        1.148.1.5 05/03/10 22:10:29 voll-/[email protected] +41 -9
        Fixed bug 3164 - add moduservar for user locale, add checks for wrong locale
    
    ChangeSet
      1.1886.149.1 05/03/09 21:46:22 jojodee-CZ0/[email protected] +1 -0
      Comment out the insertion of tinymce template that loads the js. Now done with event.
      We still need the attribute taging for tinymce to work in Specific Label mode.
      Leave the comments for people using versions less than 0.4.0 
    
      html/modules/dynamicdata/xartemplates/admin-showinput-tinymce.xd
        1.5 05/03/09 21:46:17 jojodee-CZ0/[email protected] +3 -1
        Comment out the insertion of tinymce template that loads the js. Now done with event.
        We still need the attribute taging for tinymce to work in Specific Label mode.
    
    ChangeSet
      1.1886.148.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.1886.147.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.1886.1.175 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.1886.1.174 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.1886.1.173 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.1886.1.172 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.1886.1.171 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.1886.1.170 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.1886.1.169 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.1886.146.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.1886.1.167 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.1886.1.166 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.306 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.1886.1.165 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.1886.1.164 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.1886.1.163 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.1886.1.162 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.1886.1.161 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.1886.145.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.1886.91.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.1886.144.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.1886.1.157 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.1886.1.156 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.1886.1.155 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.1886.1.154 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.1886.1.153 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.1886.1.152 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.1886.1.151 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.47 05/02/27 16:06:43 [email protected] +1 -1
        bug 3907 - make ADODB errors less apparent again to allow Postgres installations
    
    ChangeSet
      1.1886.1.150 05/02/27 06:44:55 mikespub-L1MWAzIoyeYCZudI/[email protected] +2 -0
      fix Postgres DB create/select at installation
    
      BitKeeper/etc/logging_ok
        1.170.1.14 05/02/27 06:44:55 mikespub-L1MWAzIoyeYCZudI/[email protected] +1 -0
        Logging to [email protected] accepted
    
      html/modules/installer/xaradmin.php
        1.157 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/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]