15 csets were pushed to core/stable: Merge hsdev.com:/var/bk/xar/core/propsin...

Changes were applied by marcel to core/stable level 10.
    The following csets were applied:
    
    ChangeSet
      1.1922 05/04/08 09:59:56 marcel-097TUEbwl1/[email protected] +4 -0
      Merge hsdev.com:/var/bk/xar/core/propsinplace
      into hsdev.com:/var/bk/xar/core/xartest
    
      html/modules/roles/xartemplates/properties/showoutput-username.xd
        1.4 05/04/08 09:59:56 marcel-097TUEbwl1/[email protected] +0 -0
        Auto merged
    
      html/modules/roles/xartemplates/properties/showoutput-userlist.xd
        1.5 05/04/08 09:59:56 marcel-097TUEbwl1/[email protected] +0 -0
        Auto merged
    
      html/modules/roles/xartemplates/properties/showoutput-grouplist.xd
        1.5 05/04/08 09:59:55 marcel-097TUEbwl1/[email protected] +0 -0
        Auto merged
    
      html/modules/base/xartemplates/properties/showoutput-timezone.xd
        1.3 05/04/08 09:59:55 marcel-097TUEbwl1/[email protected] +0 -0
        Auto merged
    
      html/modules/roles/xartemplates/properties/showoutput-username.xd
        1.2.1.2 05/04/08 09:59:55 marcel-097TUEbwl1/[email protected] +0 -0
        Merge rename: html/modules/dynamicdata/xartemplates/user-showoutput-username.xd -> html/modules/roles/xartemplates/properties/showoutput-username.xd
    
      html/modules/roles/xartemplates/properties/showoutput-userlist.xd
        1.3.1.2 05/04/08 09:59:55 marcel-097TUEbwl1/[email protected] +0 -0
        Merge rename: html/modules/dynamicdata/xartemplates/user-showoutput-userlist.xd -> html/modules/roles/xartemplates/properties/showoutput-userlist.xd
    
      html/modules/roles/xartemplates/properties/showoutput-grouplist.xd
        1.3.1.2 05/04/08 09:59:55 marcel-097TUEbwl1/[email protected] +0 -0
        Merge rename: html/modules/dynamicdata/xartemplates/user-showoutput-grouplist.xd -> html/modules/roles/xartemplates/properties/showoutput-grouplist.xd
    
      html/modules/base/xartemplates/properties/showoutput-timezone.xd
        1.1.1.2 05/04/08 09:59:55 marcel-097TUEbwl1/[email protected] +0 -0
        Merge rename: html/modules/dynamicdata/xartemplates/user-showoutput-timezone.xd -> html/modules/base/xartemplates/properties/showoutput-timezone.xd
    
    ChangeSet
      1.1921 05/04/07 14:19:57 [email protected] +1 -0
      Add flush property cache to the upgrade
      Fix blank screen issue (have I?)
    
      html/upgrade.php
        1.117 05/04/07 14:19:56 [email protected] +214 -208
        - add a generic upgrades section at the end, which flushes the property cache
        - dont catch the output nor return, so the upgrade *can* be run multiple times
    
    ChangeSet
      1.1886.1.174 05/03/31 03:41:03 [email protected] +23 -0
      updated properties to be stored in their respective modules
    
      html/modules/roles/xarproperties/Dynamic_Username_Property.php
        1.13 05/03/31 03:41:00 [email protected] +3 -6
        updating property to use xarTplProperty function
    
      html/modules/roles/xarproperties/Dynamic_UserList_Property.php
        1.21 05/03/31 03:41:00 [email protected] +3 -8
        updating property to use xarTplProperty function
    
      html/modules/roles/xarproperties/Dynamic_GroupList_Property.php
        1.13 05/03/31 03:41:00 [email protected] +4 -7
        updating property to use xarTplProperty function
    
      html/modules/modules/xarproperties/Dynamic_Module_Property.php
        1.9 05/03/31 03:41:00 [email protected] +1 -1
        updating property to use xarTplProperty function
    
      html/modules/base/xarproperties/Dynamic_TimeZone_Property.php
        1.12 05/03/31 03:41:00 [email protected] +3 -6
        updating property to use xarTplProperty function
    
      html/modules/base/xarproperties/Dynamic_TColorPicker_Property.php
        1.10 05/03/31 03:41:00 [email protected] +5 -7
        updating property to use xarTplProperty function
    
      html/modules/base/xarproperties/Dynamic_Calendar_Property.php
        1.24 05/03/31 03:41:00 [email protected] +4 -6
        updating property to use xarTplProperty function
    
      html/includes/xarTemplate.php
        1.236 05/03/31 03:41:00 [email protected] +15 -15
        updating function definition
    
      html/includes/properties/Dynamic_ExtendedDate_Property.php
        1.4 05/03/31 03:41:00 [email protected] +2 -2
        changing path name .. could use a better way to load these tho
    
      html/modules/roles/xartemplates/properties/validation-userlist.xd
        1.2 05/03/31 03:36:33 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/admin-validation-userlist.xd -> html/modules/roles/xartemplates/properties/validation-userlist.xd
    
      html/modules/base/xartemplates/properties/validation-calendar.xd
        1.2 05/03/31 03:13:05 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/admin-validation-calendar.xd -> html/modules/base/xartemplates/properties/validation-calendar.xd
    
      html/modules/base/xartemplates/showoutput-tcolorpicker.xd
        1.3 05/03/31 02:31:43 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/user-showoutput-tcolorpicker.xd -> html/modules/base/xartemplates/showoutput-tcolorpicker.xd
    
      html/modules/base/xartemplates/properties/showinput-tcolorpicker.xd
        1.4 05/03/31 02:31:02 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/admin-showinput-tcolorpicker.xd -> html/modules/base/xartemplates/properties/showinput-tcolorpicker.xd
    
      html/modules/base/xarproperties/Dynamic_TColorPicker_Property.php
        1.9 05/03/31 02:28:53 [email protected] +0 -0
        Rename: html/includes/properties/Dynamic_TColorPicker_Property.php -> html/modules/base/xarproperties/Dynamic_TColorPicker_Property.php
    
      html/modules/base/xartemplates/properties/showoutput-timezone.xd
        1.2 05/03/31 02:23:24 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/user-showoutput-timezone.xd -> html/modules/base/xartemplates/properties/showoutput-timezone.xd
    
      html/modules/base/xartemplates/properties/showinput-timezone.xd
        1.5 05/03/31 02:22:47 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/admin-showinput-timezone.xd -> html/modules/base/xartemplates/properties/showinput-timezone.xd
    
      html/modules/base/xarproperties/Dynamic_TimeZone_Property.php
        1.11 05/03/31 02:21:34 [email protected] +0 -0
        Rename: html/includes/properties/Dynamic_TimeZone_Property.php -> html/modules/base/xarproperties/Dynamic_TimeZone_Property.php
    
      html/modules/base/xartemplates/properties/showinput-calendar.xd
        1.10 05/03/31 02:17:37 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/admin-showinput-calendar.xd -> html/modules/base/xartemplates/properties/showinput-calendar.xd
    
      html/modules/base/xartemplates/properties/showoutput-calendar.xd
        1.4 05/03/31 02:16:17 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/user-showoutput-calendar.xd -> html/modules/base/xartemplates/properties/showoutput-calendar.xd
    
      html/modules/base/xarproperties/Dynamic_Calendar_Property.php
        1.23 05/03/31 02:15:01 [email protected] +0 -0
        Rename: html/modules/base/properties -> html/modules/base/xarproperties/Dynamic_Calendar_Property.php
    
      html/modules/base/properties
        1.22 05/03/31 02:11:16 [email protected] +0 -0
        Rename: html/includes/properties/Dynamic_Calendar_Property.php -> html/modules/base/properties
    
      html/modules/modules/xarproperties/Dynamic_Module_Property.php
        1.8 05/03/31 00:29:54 [email protected] +0 -0
        Rename: html/includes/properties/Dynamic_Module_Property.php -> html/modules/modules/xarproperties/Dynamic_Module_Property.php
    
      html/modules/roles/xartemplates/properties/showoutput-username.xd
        1.3 05/03/31 00:16:14 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/user-showoutput-username.xd -> html/modules/roles/xartemplates/properties/showoutput-username.xd
    
      html/modules/roles/xartemplates/properties/showinput-username.xd
        1.5 05/03/31 00:15:58 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/admin-showinput-username.xd -> html/modules/roles/xartemplates/properties/showinput-username.xd
    
      html/modules/roles/xartemplates/properties/showoutput-userlist.xd
        1.4 05/03/31 00:15:43 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/user-showoutput-userlist.xd -> html/modules/roles/xartemplates/properties/showoutput-userlist.xd
    
      html/modules/roles/xartemplates/properties/showinput-userlist.xd
        1.6 05/03/31 00:15:14 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/admin-showinput-userlist.xd -> html/modules/roles/xartemplates/properties/showinput-userlist.xd
    
      html/modules/roles/xarproperties/Dynamic_Username_Property.php
        1.12 05/03/31 00:13:22 [email protected] +0 -0
        Rename: html/includes/properties/Dynamic_Username_Property.php -> html/modules/roles/xarproperties/Dynamic_Username_Property.php
    
      html/modules/roles/xarproperties/Dynamic_UserList_Property.php
        1.20 05/03/31 00:13:02 [email protected] +0 -0
        Rename: html/includes/properties/Dynamic_UserList_Property.php -> html/modules/roles/xarproperties/Dynamic_UserList_Property.php
    
      html/modules/roles/xartemplates/properties/showinput-grouplist.xd
        1.7 05/03/31 00:05:39 [email protected] +0 -0
        Rename: html/modules/roles/xartemplates/properties/admin-showinput-grouplist.xd -> html/modules/roles/xartemplates/properties/showinput-grouplist.xd
    
      html/modules/roles/xartemplates/properties/showoutput-grouplist.xd
        1.4 05/03/31 00:05:11 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/user-showoutput-grouplist.xd -> html/modules/roles/xartemplates/properties/showoutput-grouplist.xd
    
      html/modules/roles/xartemplates/properties/admin-showinput-grouplist.xd
        1.6 05/03/31 00:04:08 [email protected] +0 -0
        Rename: html/modules/dynamicdata/xartemplates/admin-showinput-grouplist.xd -> html/modules/roles/xartemplates/properties/admin-showinput-grouplist.xd
    
      html/modules/roles/xarproperties/Dynamic_GroupList_Property.php
        1.12 05/03/31 00:01:09 [email protected] +0 -0
        Rename: html/includes/properties/Dynamic_GroupList_Property.php -> html/modules/roles/xarproperties/Dynamic_GroupList_Property.php
    
    ChangeSet
      1.1886.1.173 05/03/25 08:58:56 marcel-097TUEbwl1/[email protected] +1 -0
      Merge hsdev.com:/var/bk/xar/core/xartest
      into hsdev.com:/var/bk/xar/core/propsinplace
    
      html/includes/xarTemplate.php
        1.235 05/03/25 08:58:56 marcel-097TUEbwl1/[email protected] +0 -0
        Auto merged
    
    ChangeSet
      1.1886.1.172 05/03/09 10:07:52 marcel-097TUEbwl1/[email protected] +1 -0
      Merge hsdev.com:/var/bk/xar/core/xartest
      into hsdev.com:/var/bk/xar/core/propsinplace
    
      html/modules/dynamicdata/class/properties.php
        1.70 05/03/09 10:07:52 marcel-097TUEbwl1/[email protected] +0 -0
        Auto merged
    
    ChangeSet
      1.1886.1.170 05/03/06 11:44:43 [email protected] +1 -0
      - reverse the meaning of tpltype and propertyname, so we can have fallback behaviour similar to user-showinput.xd etc.
    
      html/includes/xarTemplate.php
        1.234 05/03/06 11:44:41 [email protected] +2 -2
        - reverse the meaning of tpltype and propertyname, so we can have fallback behaviour similar to user-showinput.xd etc.
    
    ChangeSet
      1.1886.1.169 05/03/04 11:38:02 [email protected] +2 -0
      Basic completion of allowing properties in a modules/xarproperties directory, with the templates being in xartemplates/properties.
      
      The templates are named:
      - propname-showoutput.xd
      - propname-showinput.xd
      - propname-validation.xd
      (or any other type the dev wants to pass in through xarTplProperty)
    
      html/modules/dynamicdata/xaradminapi/importpropertytypes.php
        1.10 05/03/04 11:38:00 [email protected] +8 -8
        - doh, look in the right directories
        - update the aliases first, then the base, cos only then the aliaseslist will be a list (did this work before?)
        - when using bindvars, need to pass them to the db to.
    
      html/includes/xarTemplate.php
        1.233 05/03/04 11:38:00 [email protected] +27 -1
        Bring in xarTplProperty() analogous to xarTplBlock
    
    ChangeSet
      1.1886.1.168 05/03/03 18:57:01 [email protected] +1 -0
      Make sure the filepath is also returned, if the db doesnt have the props yet
      Work for bug #4056
    
      html/modules/dynamicdata/xaradminapi/importpropertytypes.php
        1.9 05/03/03 18:57:00 [email protected] +1 -0
        Make sure the filepath is also returned, if the db doesnt have the props yet
    
    ChangeSet
      1.1886.1.167 05/03/03 18:47:04 [email protected] +1 -0
      Using bindvars. 
      Work for bug #4056
    
      html/modules/dynamicdata/xaradminapi/importpropertytypes.php
        1.8 05/03/03 18:47:02 [email protected] +17 -36
        Using bindvars. 
        Work for bug #4056
    
    ChangeSet
      1.1886.1.166 05/03/03 16:56:04 [email protected] +1 -0
      typo
      changes for bug #4056
    
      html/modules/dynamicdata/xaradminapi/importpropertytypes.php
        1.7 05/03/03 16:56:02 [email protected] +1 -1
        typo
    
    ChangeSet
      1.1886.1.165 05/03/03 15:49:12 [email protected] +2 -0
      Check for properties in modules/modname/xarproperties in the same way as in the includes/properties directory
      Changes for bug #4056
    
      html/modules/dynamicdata/xaradminapi/importpropertytypes.php
        1.6 05/03/03 15:49:11 [email protected] +108 -121
        Check in all the detected directories
    
      html/modules/dynamicdata/class/properties.php
        1.69 05/03/03 15:49:11 [email protected] +1 -1
        typo
    
    ChangeSet
      1.1886.1.164 05/03/03 14:46:02 [email protected] +1 -0
      Return the filepath from the database, part of bug #4056
    
      html/modules/dynamicdata/class/properties.php
        1.68 05/03/03 14:46:00 [email protected] +3 -2
        Return the filepath from the database, part of bug #4056
    
Links for the differences:
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]