[Rt-commit] rt branch, create-action, updated. 07619cb41ba6f0a3e4dfdfe93c348955bea2b098

sartak at bestpractical.com sartak at bestpractical.com
Thu Nov 5 20:07:00 EST 2009


The branch, create-action has been updated
       via  07619cb41ba6f0a3e4dfdfe93c348955bea2b098 (commit)
       via  89cba24be778542f3237d8c4323813f7264737eb (commit)
       via  af525c71ca4397beabb31762ed5cc4b45089fd71 (commit)
       via  281dd66cc9037be26b96bb62e12ceccc8213f1dc (commit)
       via  677590506c21a1045a8e4341ff3bb290593b36fb (commit)
       via  d70f7443202628cac9694cd1c3f790703e1776e5 (commit)
       via  c73b757f8f18660a0d80bbebc69977afa4b2b09c (commit)
       via  202e9e99ff51d78e3f28fd7577ebe31899171e44 (commit)
       via  dcf69b65e2805aa160cd6bc4a4846e62afde93f8 (commit)
       via  f1cd431fbfe5ed16778ea1bfc10f3dfd68039bdd (commit)
       via  da5d00db20d316af38d3d49a802be01c90886d34 (commit)
       via  1cc9e1144e13ae58881e7f01c2f459023c342e55 (commit)
       via  7fee39c3c7454dfa7b5a686c0d5e06bea0c9f6ab (commit)
      from  44d18bef2718c16fb84a2a24fd542bf76133e9f2 (commit)

Summary of changes:
 lib/RT/Action/UserSettings.pm                      |   88 +++++++++++++-------
 lib/RT/DateTime.pm                                 |    3 +
 lib/RT/View.pm                                     |    3 -
 .../Admin/Tools/Shredder/Elements/SelectPlugin     |    2 +-
 share/html/Elements/ListMenu                       |    2 +-
 share/html/Elements/ShowLinks                      |    2 +-
 share/html/REST/1.0/Forms/ticket/default           |    5 +-
 share/html/SelfService/Create.html                 |    2 +-
 share/html/SelfService/CreateTicketInQueue.html    |    2 +-
 share/html/Ticket/Elements/ShowDates               |    2 +-
 t/api/action-createtickets.t                       |    2 +-
 t/approval/basic.t                                 |    2 +-
 t/mail/gateway.t                                   |    9 ++-
 t/web/basic.t                                      |   11 +--
 t/web/crypt-gnupg.t                                |    2 +-
 t/web/gnupg-select-keys-on-create.t                |    8 +-
 t/web/ticket-create-utf8.t                         |    6 +-
 t/web/ticket_owner.t                               |    2 +-
 18 files changed, 93 insertions(+), 60 deletions(-)

- Log -----------------------------------------------------------------
commit 07619cb41ba6f0a3e4dfdfe93c348955bea2b098
Merge: 44d18be 89cba24
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Nov 5 20:06:45 2009 -0500

    Merge branch '3.999' into create-action
    
    Conflicts:
    	lib/RT/View.pm

diff --cc lib/RT/View.pm
index edeef77,d8aef8e..de8c90e
--- a/lib/RT/View.pm
+++ b/lib/RT/View.pm
@@@ -57,12 -57,6 +57,9 @@@ alias RT::View::Admin under 'admin/'
  require RT::View::Ticket;
  alias RT::View::Ticket under 'ticket/';
  
- require RT::View::SetupWizard;
- alias RT::View::SetupWizard under '__jifty/admin/setupwizard';
- 
 +require RT::View::SelfService;
 +alias RT::View::SelfService under 'selfservice/';
 +
  require RT::View::RuleBuilder;
  alias RT::View::RuleBuilder under 'rulebuilder/';
  

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


More information about the Rt-commit mailing list