[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.5-76-g3f33ee6

[Kevin Falcone]

The branch, 4.0-trunk has been updated
       via  3f33ee62caf3d7b37bc1395ffc6f552ad80b66ba (commit)
       via  ef856168bceecfb87f88383429f11982d57acf08 (commit)
       via  d0acc689e25ccb1ec60f5feea4f8d3b7d7e223de (commit)
       via  61d31ad11769388bff89df2593631a352196629c (commit)
      from  71c5b88dfe0461936824832de366301a295de7ea (commit)

Summary of changes:
 docs/UPGRADING-4.0                      |   15 +++++++++++++++
 share/html/Elements/SelectOwner         |   10 +++-------
 share/html/Search/Elements/PickCFs      |    2 +-
 share/html/Search/Elements/PickCriteria |    2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit 3f33ee62caf3d7b37bc1395ffc6f552ad80b66ba
Merge: 71c5b88 ef85616
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Feb 15 19:29:05 2012 -0500

    Merge branch '4.0/querybuilder-queue-limits' into 4.0-trunk
    
    Conflicts:
    	docs/UPGRADING-4.0

diff --cc docs/UPGRADING-4.0
index f4ed9c0,dad0485..4b64d2e
--- a/docs/UPGRADING-4.0
+++ b/docs/UPGRADING-4.0
@@@ -109,8 -109,16 +109,23 @@@ wit
  
  UPGRADING FROM 4.0.5 and earlier - Changes:
  
 +The fix for an attribute truncation bug on MySQL requires a small ALTER TABLE.
 +Be sure you run `make upgrade-database` to apply this change automatically.
 +The bug primarily manifested when uploading large logos in the theme editor on
 +MySQL.  Refer to etc/upgrade/4.0.6/schema.mysql for the actual ALTER TABLE that
 +will be run.
++
++*******
+ The web-based query builder now uses Queue limits to restrict the set of
+ displayed statuses and owners.  As part of this change, the %cfqueues
+ parameter was renamed to %Queues; if you have local modifications to any
+ of the following Mason templates, this feature will not function
+ correctly:
+ 
+     share/html/Elements/SelectOwner
+     share/html/Elements/SelectStatus
+     share/html/Prefs/Search.html
+     share/html/Search/Build.html
+     share/html/Search/Elements/BuildFormatString
+     share/html/Search/Elements/PickCFs
+     share/html/Search/Elements/PickCriteria

-----------------------------------------------------------------------