Skip to content

Commit

Permalink
Merge branch '2.4.3-releng' into 2.4-trunk
Browse files Browse the repository at this point in the history 
    revert 2.4.3 version bump back to 2.4.HEAD
  • Loading branch information
@jibsheet
jibsheet committed Dec 30, 2010
2 parents 71c2c88 + 3d74e7e commit 477afee
Show file tree
Hide file tree
Showing 102 changed files with 166 additions and 116 deletions.
2 changes: 2 additions & 0 deletions MANIFEST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ html/Callbacks/RTFM/Ticket/Create.html/BeforeCreate
html/Callbacks/RTFM/Ticket/Create.html/BeforeMessageBox
html/Callbacks/RTFM/Ticket/Elements/Tabs/Default
html/Callbacks/RTFM/Ticket/Update.html/BeforeMessageBox
html/Elements/RT__FM__ClassCollection/ColumnMap
html/NoAuth/webrtfm.css
html/RTFM/Article/Delete.html
html/RTFM/Article/Display.html
Expand Down Expand Up @@ -109,6 +110,7 @@ html/RTFM/Elements/Tabs
html/RTFM/Elements/UpdatedArticles
html/RTFM/index.html
html/RTFM/Topics.html
html/Search/Elements/Article
html/SelfService/Article/autohandler
html/SelfService/Article/Display.html
html/SelfService/Article/Search.html
Expand Down
2 changes: 1 addition & 1 deletion META.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ requires:
perl: 5.8.3
resources:
license: http://opensource.org/licenses/gpl-license.php
version: 2.4.HEAD
version: 2.4.3
2 changes: 1 addition & 1 deletion html/Admin/Global/CustomFields/RTFM-Class-RTFM-Article.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Classes/CustomFields.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Classes/GroupRights.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Classes/Modify.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Classes/Topics.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Classes/UserRights.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Classes/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Elements/ClassTabs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Elements/GlobalTabs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Elements/Header
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Elements/Tabs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Elements/Topics
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Global/GroupRights.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Global/Topics.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Global/UserRights.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/Global/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Admin/RTFM/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Admin/Elements/CustomFieldTabs/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Admin/Elements/Tabs/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Admin/Global/CustomFields/index.html/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Admin/index.html/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Elements/EditLinks/ExtraLinkInstructions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Elements/Header/Head
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Elements/MessageBox/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Elements/Tabs/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/RTIR/Elements/Tabs/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/SelfService/Elements/Tabs/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Ticket/Create.html/BeforeCreate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Ticket/Create.html/BeforeMessageBox
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Ticket/Elements/Tabs/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/Ticket/Update.html/BeforeMessageBox
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/Callbacks/RTFM/autohandler/Default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
32 changes: 16 additions & 16 deletions html/Elements/RT__FM__ClassCollection/ColumnMap
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
%# BEGIN BPS TAGGED BLOCK {{{
%#
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <jesse@bestpractical.com>
%#
%#
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
%#
%#
%#
%# LICENSE:
%#
%#
%# This work is made available to you under the terms of Version 2 of
%# the GNU General Public License. A copy of that license should have
%# been provided with this software, but in any event can be snarfed
%# from www.gnu.org.
%#
%#
%# This work is distributed in the hope that it will be useful, but
%# WITHOUT ANY WARRANTY; without even the implied warranty of
%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
%# General Public License for more details.
%#
%#
%# You should have received a copy of the GNU General Public License
%# along with this program; if not, write to the Free Software
%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
%# 02110-1301 or visit their web page on the internet at
%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
%#
%#
%# http://www.gnu.org/copyleft/gpl.html.
%#
%#
%# CONTRIBUTION SUBMISSION POLICY:
%#
%#
%# (The following paragraph is not intended to limit the rights granted
%# to you to modify and distribute this software under the terms of
%# the GNU General Public License and is only of importance to you if
%# you choose to contribute your changes and enhancements to the
%# community by submitting them to Best Practical Solutions, LLC.)
%#
%#
%# By intentionally submitting any modifications, corrections or
%# derivatives to this work, or any other work intended for use with
%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
Expand All @@ -43,7 +43,7 @@
%# royalty-free, perpetual, license to use, copy, create derivative
%# works based on those contributions, and sublicense and distribute
%# those contributions and any derivatives thereof.
%#
%#
%# END BPS TAGGED BLOCK }}}
<%ARGS>
$Name
Expand Down
2 changes: 1 addition & 1 deletion html/NoAuth/webrtfm.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
2 changes: 1 addition & 1 deletion html/RTFM/Article/Delete.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
Expand Down
Loading

0 comments on commit 477afee

Please sign in to comment.