[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.0-220-gf61d035

[Dustin Graves]

The branch, 4.4-trunk has been updated
       via  f61d0353ef2cb8fe7e42a975d732eb9c5d1a2b38 (commit)
       via  9e7da569747c0d635467460888645d83c56894cc (commit)
       via  415264de9234ab08f0c66d29e4c1d076678b8a40 (commit)
      from  74bb4cfe3c7dbb275e680867245d9d5ce9fdf3b0 (commit)

Summary of changes:
 etc/RT_Config.pm.in                     | 27 ++++++++++++++
 lib/RT/Config.pm                        |  1 +
 lib/RT/Dashboard/Mailer.pm              | 44 +++++++++++++++++++++++
 share/html/Dashboards/Render.html       | 13 +++++++
 share/html/Dashboards/Subscription.html | 12 +++++++
 t/mail/dashboards.t                     | 64 +++++++++++++++++++++++++++++++--
 6 files changed, 158 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit f61d0353ef2cb8fe7e42a975d732eb9c5d1a2b38
Merge: 74bb4cf 9e7da56
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Tue May 17 19:12:59 2016 +0000

    Merge branch '4.4/dashboard-language' into 4.4-trunk
    
    Conflicts:
    	share/html/Dashboards/Subscription.html

diff --cc share/html/Dashboards/Subscription.html
index cb5ba16,73f2557..262f853
--- a/share/html/Dashboards/Subscription.html
+++ b/share/html/Dashboards/Subscription.html
@@@ -235,12 -237,9 +244,13 @@@ my %fields = 
      Recipients  => { Users => [], Groups => [] },
      Fow         => 1,
      Counter     => 0,
+     Language    => '',
 +    SuppressIfEmpty => 0,
  );
  
 +$m->callback( %ARGS, CallbackName => 'SubscriptionFields', FieldsRef => \%fields,
 +     SubscriptionObj => $SubscriptionObj, DashboardObj => $Dashboard);
 +
  # update any fields with the values from the subscription object
  if ($SubscriptionObj) {
      for my $field (keys %fields) {

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