[Rt-commit] rt branch, master, updated. rt-4.1.8-300-g35f6d01

Alex Vandiver alexmv at bestpractical.com
Thu May 9 18:13:21 EDT 2013


The branch, master has been updated
       via  35f6d015b9b37395e900fe0fdc1f77a173f50ada (commit)
       via  94ba32629272a1c8151831a1b45fa23661900d36 (commit)
       via  e7811f63fd4b9056ec1cc479f04c5034c244359f (commit)
       via  89f2ebf45c731a81406d4bcfe88959ed35398606 (commit)
       via  fea768629f006ce91a8ab440c2cd1326a281db9a (commit)
       via  3f6383752ebce0b31e02305d42262ffb19b5c455 (commit)
       via  7a33b13f6979870ed055ba2b4cce522f1f5cf847 (commit)
       via  9ea3b147ecd63fa3c055c103acdd3fa32a17bed2 (commit)
       via  321c559d00f08d373853ffac3085b74f7cfe3e68 (commit)
       via  85a9f4188a79fbb18328195618791865c9a82a85 (commit)
       via  efb310994cfe6998045b354266ab796c0ebf4b62 (commit)
       via  e869c7f707ed1c5f7cb4c731184b1782d731dea3 (commit)
      from  8d085e4ab846c2648ae810d43841d635435f6a1c (commit)

Summary of changes:
 .gitignore                                         |   1 +
 configure.ac                                       |   1 +
 docs/UPGRADING-4.2                                 |  12 ++
 etc/initialdata                                    | 206 +++++++++++++++++++--
 etc/upgrade/4.1.9/content                          | 190 +++++++++++++++++++
 etc/upgrade/switch-templates-to.in                 | 148 +++++++++++++++
 lib/RT/Interface/Email.pm                          |  25 +++
 lib/RT/Template.pm                                 |  13 +-
 lib/RT/Test.pm                                     |  49 +++++
 lib/RT/Test/GnuPG.pm                               |   2 +-
 lib/RT/Transaction.pm                              |  10 +-
 sbin/rt-test-dependencies.in                       |   4 +-
 share/html/Articles/Article/Elements/Preformatted  |  15 +-
 t/api/txn_content.t                                |   8 +-
 ...ts-outgoing.t => charsets-outgoing-plaintext.t} |   2 +-
 t/mail/charsets-outgoing.t                         |   6 +-
 ...pted.t => gnupg-outgoing-encrypted-plaintext.t} |   5 +-
 ...ng-plain.t => gnupg-outgoing-plain-plaintext.t} |   5 +-
 ...-signed.t => gnupg-outgoing-signed-plaintext.t} |   5 +-
 ...=> gnupg-outgoing-signed_encrypted-plaintext.t} |   5 +-
 t/mail/html-outgoing.t                             | 163 ++++++++++++++++
 t/mail/multipart.t                                 |   2 +-
 t/mail/{sendmail.t => sendmail-plaintext.t}        |   2 +-
 t/mail/sendmail.t                                  |  34 ++--
 t/web/attachment_encoding.t                        |   2 +-
 t/web/html_template.t                              |   2 +-
 t/web/scrips.t                                     |  23 +--
 27 files changed, 842 insertions(+), 98 deletions(-)
 mode change 100755 => 100644 etc/initialdata
 create mode 100644 etc/upgrade/4.1.9/content
 create mode 100644 etc/upgrade/switch-templates-to.in
 copy t/mail/{charsets-outgoing.t => charsets-outgoing-plaintext.t} (99%)
 copy t/mail/{gnupg-outgoing-encrypted.t => gnupg-outgoing-encrypted-plaintext.t} (89%)
 copy t/mail/{gnupg-outgoing-plain.t => gnupg-outgoing-plain-plaintext.t} (89%)
 copy t/mail/{gnupg-outgoing-signed.t => gnupg-outgoing-signed-plaintext.t} (89%)
 copy t/mail/{gnupg-outgoing-signed_encrypted.t => gnupg-outgoing-signed_encrypted-plaintext.t} (90%)
 create mode 100644 t/mail/html-outgoing.t
 copy t/mail/{sendmail.t => sendmail-plaintext.t} (99%)

- Log -----------------------------------------------------------------
commit 35f6d015b9b37395e900fe0fdc1f77a173f50ada
Merge: 8d085e4 94ba326
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu May 9 18:04:30 2013 -0400

    Merge branch '4.2/html-templates'
    
    Conflicts:
    	docs/UPGRADING-4.2
    	etc/initialdata

diff --cc docs/UPGRADING-4.2
index e6a94f1,f8f771a..6021736
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@@ -89,17 -89,15 +89,29 @@@ UPGRADING FROM RT 4.0.0 and greate
    This command deletes records from Transactions table. This script can only fix
    TimeWorked mismatch, but not TimeLeft or TimeEstimated.
  
 +* A new action, "Open Inactive Tickets", has been added, and on new
 +  installs the default scrip "On Correspond Open Tickets" has been
 +  replaced by "On Correspond Open Inactive Tickets".  The key difference
 +  between "Open Tickets" and "Open Inactive Tickets" is that the latter
 +  will not adjust the status of a ticket if it is already active.  This
 +  is particularly useful when creating complex workflows using
 +  Lifecycles.
 +
 +* CSS is no longer processed through Mason; it's served by a proper static file
 +  handler.  If you used the Begin or End callbacks of main.css in the aileron,
 +  web2, or ballard themes, you should transition to the @CSSFiles config option.
 +  If you need to target specific themes, you can use the class set on the <body>
 +  element (for example: body.aileron).  See docs/customizing/styling_rt.pd for
 +  more information on custom styles.
++
+ * There are now HTML versions of the standard plain text templates.  Running
+   make upgrade as described in the README will insert the new templates into
+   existing installs.  While new installs use the HTML templates by default,
+   upgrades from older versions don't automatically switch to the HTML versions.
+   To switch existing scrips, run:
+ 
+     /opt/rt4/etc/upgrade/switch-templates-to html
+ 
+   To switch from HTML back to text, run:
+ 
+     /opt/rtr/etc/upgrade/switch-templates-to text
 -
diff --cc etc/initialdata
index 47a9b38,da7e2f8..29b9163
mode 100755,100644..100644
--- a/etc/initialdata
+++ b/etc/initialdata
@@@ -533,10 -706,10 +709,10 @@@ Hour:         { $SubscriptionObj->SubVa
      {  Description    => 'On Correspond Notify Requestors and Ccs',
         ScripCondition => 'On Correspond',
         ScripAction    => 'Notify Requestors And Ccs',
-        Template       => 'Correspondence' },
+        Template       => 'Correspondence in HTML' },
 -    {  Description    => 'On Correspond Open Tickets',
 +    {  Description    => 'On Correspond Open Inactive Tickets',
         ScripCondition => 'On Correspond',
 -       ScripAction    => 'Open Tickets',
 +       ScripAction    => 'Open Inactive Tickets',
         Template       => 'Blank' },
      {  Description    => 'On Create Autoreply To Requestors',
         ScripCondition => 'On Create',
diff --cc sbin/rt-test-dependencies.in
index 8dfab51,280f8f0..c3e30ed
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@@ -208,9 -205,7 +209,8 @@@ HTML::FormatText::WithLinks::AndTable
  HTML::Mason 1.43
  HTML::Mason::PSGIHandler 0.52
  HTML::Quoted
 +HTML::RewriteAttributes 0.05
  HTML::Scrubber 0.08
- HTML::TreeBuilder
  HTTP::Message 6.0
  IPC::Run3
  JSON

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


More information about the Rt-commit mailing list