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

[Kevin Falcone]

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

falcone pushed a commit to branch master
in repository rtir.

commit 518514a644e875b5e64f36ab73fade0ac443bc42
Merge: f6249b0 723900e
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jul 18 14:36:19 2014 -0400

    Merge branch '3.0-trunk'
    
    Conflicts:
    	META.yml

 META.yml                            |   7 +-
 html/RTIR/Display.html              |  10 +
 html/RTIR/Incident/Display.html     |  10 +
 html/RTIR/Reporting/Report.html     |  13 +-
 html/RTIR/Reporting/index.html      |  19 +-
 inc/Module/Install/RTx.pm           | 193 ++++----
 inc/Module/Install/RTx/Factory.pm   |  53 ---
 inc/Module/Install/RTx/Runtime.pm   |  79 ++++
 inc/Module/Install/ReadmeFromPod.pm | 138 ++++++
 inc/YAML/Tiny.pm                    | 873 ++++++++++++++++++++++++++++++++++++
 inc/unicore/Name.pm                 | 417 +++++++++++++++++
 11 files changed, 1669 insertions(+), 143 deletions(-)

diff --cc META.yml
index cc207af,cea780d..1e6ec80
--- a/META.yml
+++ b/META.yml
@@@ -27,9 -26,13 +27,12 @@@ no_index
      - t
  requires:
    DBIx::SearchBuilder: 1.61
 -  Hook::LexWrap: 0
    Parse::BooleanLogic: 0
    Regexp::Common: 0
--  perl: 5.8.3
++  perl: 5.10.1
  resources:
    license: http://opensource.org/licenses/gpl-license.php
 -version: 3.0.HEAD
 +version: 3.1.HEAD
+ x_module_install_rtx_version: 0.34_05
 -x_requires_rt: 4.0.14
 -x_rt_too_new: 4.2.0
++x_requires_rt: 4.2.3
++x_rt_too_new: 4.4.0
diff --cc html/RTIR/Incident/Display.html
index 31a70d8,18bd1c1..230e755
--- a/html/RTIR/Incident/Display.html
+++ b/html/RTIR/Incident/Display.html
@@@ -265,9 -265,18 +266,17 @@@ if ( $ARGS{'BulkArticles'} && @Selected
  }
  
  unless( $new_ticket ) {
 -    $ARGS{UpdateAttachments} = delete $session{'Attachments'};
 -    push @results, ProcessUpdateMessage( ARGSRef => \%ARGS, TicketObj => $TicketObj );
 +    push @results, ProcessUpdateMessage( ARGSRef => \%ARGS, TicketObj => $TicketObj, Actions => \@results );
  }
  
+ if ( $ARGS{'MarkAsSeen'} ) {
+     $TicketObj->SetAttribute(
+         Name => 'User-'. $TicketObj->CurrentUser->id .'-SeenUpTo',
+         Content => $TicketObj->LastUpdated,
+     );
+     push @results, loc('Marked all messages as seen');
+ }
+ 
  MaybeRedirectForResults(
      Actions   => \@results,
      Path      => "/RTIR/Display.html",

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