[Rt-commit] [rtir] 01/01: Merge branch '3.0-trunk' into 3.2-trunk

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch 3.2-trunk
in repository rtir.

commit 79346820732b3a70629c7865a57a2f35cfdd79d9
Merge: 94ed39c bb6a5d3
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Oct 29 17:32:55 2014 -0400

    Merge branch '3.0-trunk' into 3.2-trunk

 META.yml                                        |  2 +-
 html/Callbacks/RTIR/Elements/MakeClicky/Default |  4 +--
 html/RTIR/Elements/EditConstituency             | 14 +++++----
 inc/Module/AutoInstall.pm                       | 42 ++++++++++++++-----------
 inc/Module/Install.pm                           | 18 +++++------
 inc/Module/Install/AutoInstall.pm               |  2 +-
 inc/Module/Install/Base.pm                      |  2 +-
 inc/Module/Install/Can.pm                       |  2 +-
 inc/Module/Install/Fetch.pm                     |  2 +-
 inc/Module/Install/Include.pm                   |  2 +-
 inc/Module/Install/Makefile.pm                  |  4 +--
 inc/Module/Install/Metadata.pm                  |  6 ++--
 inc/Module/Install/Win32.pm                     |  2 +-
 inc/Module/Install/WriteAll.pm                  |  2 +-
 t/015-make-clicky.t                             |  9 ++++++
 15 files changed, 64 insertions(+), 49 deletions(-)

diff --cc html/RTIR/Elements/EditConstituency
index 8dcf6a8,c5aaeb7..d204c89
--- a/html/RTIR/Elements/EditConstituency
+++ b/html/RTIR/Elements/EditConstituency
@@@ -51,9 -51,9 +51,9 @@@
  %       my $selected = 0;
  %       my @category;
  %       my $id = $NamePrefix . $CustomField->Id;
- %       my $out = $m->scomp('SELF:options', %ARGS, SelectedRef => \$selected, CategoryRef => \@category, Object => $Object, Default => $Default);
+ %       my $out = $m->scomp('SELF:options', %ARGS, SelectedRef => \$selected, CategoryRef => \@category, Object => $Object, Default => \@Default);
  %       if (@category) {
 -<script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/NoAuth/js/cascaded.js"></script>
 +<script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/static/js/cascaded.js"></script>
  %#      XXX - Hide this select from w3m?
        <select onchange="filter_cascade('<% $id %>-Values', this.value)" name="<% $id %>-Category">
          <option value="" <% !$selected && 'selected' %>><&|/l&>-</&></option>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.