[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.6-150-gea74ab5

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  ea74ab5b00eea23864cb9179d93f6ca57c3064b8 (commit)
       via  706de0ae537350d126ea9f49497b4c4fa9786abb (commit)
       via  d4aaf02b013980e6fcedb9827f514e8d24cd7d78 (commit)
       via  5ee82b31849eb4f3d48c24c2ecc19479f5dcfb3b (commit)
       via  84f5d268545186dc2c07cc357a5d0505bdeb2eed (commit)
       via  a714c9a7c793fe00cdb9fc5b83196641d95c847a (commit)
       via  b635bb14f1ccb53b7cd26f3ba7a48f50461f6065 (commit)
       via  2f53e82b528737b0158cd30a20d8aff56c310c89 (commit)
       via  c3238f0a15237a0d1bb4a4903e280337e5b9a08d (commit)
       via  3c678fc8928385d36fded38eea6ee392b06ae647 (commit)
       via  fd8c2eb743836e3275d04dade001717c2cf7827c (commit)
       via  efa93722f315cf57393cda66a32e9f727cb584cf (commit)
       via  85b53e2d2079a55a3a060ded6fe6c181b3e60ffd (commit)
       via  ffc34cd23b13a981ab363bff47b8be2b6cab45fd (commit)
       via  470ba297766e752301167668b662e218b92245fd (commit)
       via  a6d1f5900ef00d22b353ad3baa14a4791f3673a1 (commit)
       via  e5385c3887b387731f729787c955e21c06f47847 (commit)
       via  48bdc02dbe81054f2d90445edce0eb6efb5d311e (commit)
       via  da5b0ad85f64cc0bc48e697e760dedc805cfddef (commit)
       via  e45f25d6842dfc0c4e5f6289e636e9eb294c019a (commit)
      from  ba778b0f7a4497f4bae35a738d9b301318116ab3 (commit)

Summary of changes:
 bin/rt.in                                |    2 +-
 lib/RT/Dashboard.pm                      |   30 ++++++++++++++++++++++++++++++
 lib/RT/Interface/Email.pm                |   23 +++++++++++++----------
 lib/RT/Interface/Web.pm                  |    2 +-
 lib/RT/Record.pm                         |    2 +-
 lib/RT/Ticket.pm                         |   25 +++++++++++++++++++++++++
 share/html/Helpers/Autocomplete/Users    |    3 +++
 share/html/REST/1.0/Forms/ticket/default |   11 +++++++++++
 share/html/Ticket/Attachment/dhandler    |    7 ++++++-
 t/mail/dashboards.t                      |   30 ++----------------------------
 t/web/attachments.t                      |   14 ++++++++++++--
 t/web/command_line.t                     |    4 +++-
 t/web/command_line_with_unknown_field.t  |    7 ++++++-
 13 files changed, 114 insertions(+), 46 deletions(-)

- Log -----------------------------------------------------------------
commit 2f53e82b528737b0158cd30a20d8aff56c310c89
Merge: ba778b0 da5b0ad
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 8 12:34:27 2012 -0400

    Merge branch '4.0/object-in-add-custom-field-value-error-msg' into 4.0-trunk


commit b635bb14f1ccb53b7cd26f3ba7a48f50461f6065
Merge: 2f53e82 e45f25d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 8 13:01:52 2012 -0400

    Merge branch '4.0/no-charset-for-binary-attach' into 4.0-trunk
    
    Conflicts:
    	t/web/attachments.t

diff --cc t/web/attachments.t
index 0f2c60f,5bee62c..784cbbe
--- a/t/web/attachments.t
+++ b/t/web/attachments.t
@@@ -1,7 -1,7 +1,7 @@@
  #!/usr/bin/perl -w
  use strict;
  
- use RT::Test tests => 28;
 -use RT::Test tests => 30;
++use RT::Test tests => 33;
  
  use constant LogoFile => $RT::MasonComponentRoot .'/NoAuth/images/bpslogo.png';
  use constant FaviconFile => $RT::MasonComponentRoot .'/NoAuth/images/favicon.png';
@@@ -30,18 -31,9 +31,18 @@@ $m->content_contains('Attachments test'
  $m->content_contains('Some content', 'and content');
  $m->content_contains('Download bpslogo.png', 'page has file name');
  
 +open LOGO, "<", LogoFile or die "Can't open logo file: $!";
 +binmode LOGO;
 +my $logo_contents = do {local $/; <LOGO>};
 +close LOGO;
 +$m->follow_link_ok({text => "Download bpslogo.png"});
 +is($m->content_type, "image/png");
 +is($m->content, $logo_contents, "Binary content matches");
 +
 +$m->back;
  $m->follow_link_ok({text => 'Reply'}, "reply to the ticket");
  $m->form_name('TicketUpdate');
- $m->field('Attach',  LogoFile);
+ $m->field('Attach',  TextFile);
  $m->click('AddMoreAttach');
  is($m->status, 200, "request successful");
  

commit a714c9a7c793fe00cdb9fc5b83196641d95c847a
Merge: b635bb1 85b53e2
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 8 13:02:07 2012 -0400

    Merge branch '4.0/mobile-user-agent' into 4.0-trunk


commit 84f5d268545186dc2c07cc357a5d0505bdeb2eed
Merge: a714c9a c3238f0
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 8 13:02:28 2012 -0400

    Merge branch '4.0/skip-empty-values-in-email-completion' into 4.0-trunk


commit 5ee82b31849eb4f3d48c24c2ecc19479f5dcfb3b
Merge: 84f5d26 fd8c2eb
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 8 13:02:50 2012 -0400

    Merge branch '4.0/cli-create-ticket-with-unknown-field' into 4.0-trunk


commit d4aaf02b013980e6fcedb9827f514e8d24cd7d78
Merge: 5ee82b3 e5385c3
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 8 13:09:13 2012 -0400

    Merge branch '4.0/cli-raw-print-links' into 4.0-trunk


commit 706de0ae537350d126ea9f49497b4c4fa9786abb
Merge: d4aaf02 ffc34cd
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 8 13:12:54 2012 -0400

    Merge branch '4.0/delete-subscriptions-in-dashboard-deletion' into 4.0-trunk


commit ea74ab5b00eea23864cb9179d93f6ca57c3064b8
Merge: 706de0a a6d1f59
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 8 13:15:32 2012 -0400

    Merge branch '4.0/email-action-avoid-hardcoded-resolved-status' into 4.0-trunk


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