[Rt-commit] rt branch, 4.0-trunk, updated. rt-3.9.7-1184-gd7f0dd7

[Kevin Falcone]

The branch, 4.0-trunk has been updated
       via  d7f0dd7e5f781ed23eb053e45edb6bc5256fb879 (commit)
       via  c088dc5ab7849a0f4377db50c0d4ba9dc17916df (commit)
      from  d8acb6fc2bbc9b4798b0ae414f77c553153dbfbc (commit)

Summary of changes:
 sbin/rt-setup-database.in               |    4 ++--
 share/html/NoAuth/css/base/articles.css |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit c088dc5ab7849a0f4377db50c0d4ba9dc17916df
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Thu Jan 6 12:39:44 2011 -0500

    Allow 4.0.0rc1 or 4.0.0a1 as versions to upgrade from
    
    When b69e66 added support for rc1 or pre1 or a1 in upgrades and version
    numbers, it doesn't allow you to type one of those into the upgrade
    script, so upgrading an rc1 install to rc2 errors out unless you lie and
    say you had 3.9.9999 to trick it.

diff --git a/sbin/rt-setup-database.in b/sbin/rt-setup-database.in
index c5ac3c4..d104215 100755
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@ -308,7 +308,7 @@ sub action_upgrade {
         $upgrading_from = scalar <STDIN>;
         chomp $upgrading_from;
         $upgrading_from =~ s/\s+//g;
-    } while $upgrading_from !~ /^\d+\.\d+\.\d+$/;
+    } while $upgrading_from !~ /^\d+\.\d+\.\w+$/;
 
     my $upgrading_to = $RT::VERSION;
     return (0, "The current version $upgrading_to is lower than $upgrading_from")
@@ -343,7 +343,7 @@ sub action_upgrade {
             chomp $custom_upgrading_to;
             $custom_upgrading_to =~ s/\s+//g;
             last unless $custom_upgrading_to;
-        } while $custom_upgrading_to !~ /^\d+\.\d+\.\d+$/;
+        } while $custom_upgrading_to !~ /^\d+\.\d+\.\w+$/;
 
         if ( $custom_upgrading_to ) {
             return (

commit d7f0dd7e5f781ed23eb053e45edb6bc5256fb879
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Thu Jan 6 15:37:00 2011 -0500

    Port over css that limits the size of the article select list

diff --git a/share/html/NoAuth/css/base/articles.css b/share/html/NoAuth/css/base/articles.css
index b623678..2079acc 100644
--- a/share/html/NoAuth/css/base/articles.css
+++ b/share/html/NoAuth/css/base/articles.css
@@ -1,3 +1,7 @@
 #comp-Articles-Article-Search .label h2 {
     text-align: left;
 }
+
+.articles-select-article select {
+	max-width: 20em;
+}

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