[bugzilla-gnome-org-upstream/production: 19/19] Merge branch '4.4' into production



commit 6787e64309a81a2fe6846c0aba0da42b5dd69e94
Merge: 2b72a3c dc577fa
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Sun Jan 25 23:54:15 2015 +0100

    Merge branch '4.4' into production
    
    Conflicts:
        extensions/Example/lib/WebService.pm
    
    This merges release 4.4.7 into production.

 Bugzilla/Attachment.pm                            |    4 +-
 Bugzilla/Attachment/PatchReader.pm                |    2 +-
 Bugzilla/Bug.pm                                   |   12 +++--
 Bugzilla/CGI.pm                                   |    1 +
 Bugzilla/Config/Common.pm                         |   17 +++++++-
 Bugzilla/Config/MTA.pm                            |    3 +-
 Bugzilla/Constants.pm                             |    2 +-
 Bugzilla/DB.pm                                    |    9 +++-
 Bugzilla/Error.pm                                 |    2 +-
 Bugzilla/Install/CPAN.pm                          |    4 +-
 Bugzilla/Install/Filesystem.pm                    |    2 +-
 Bugzilla/Search.pm                                |   35 +++++++++++------
 Bugzilla/Send/Sendmail.pm                         |    2 +-
 Bugzilla/UserAgent.pm                             |    1 +
 Bugzilla/WebService.pm                            |    4 ++
 Bugzilla/WebService/Bug.pm                        |   33 ++++++++++------
 Bugzilla/WebService/Bugzilla.pm                   |    9 ++++
 Bugzilla/WebService/Classification.pm             |    4 ++
 Bugzilla/WebService/Group.pm                      |    5 ++
 Bugzilla/WebService/Product.pm                    |    9 ++++
 Bugzilla/WebService/Server/JSONRPC.pm             |    6 +++
 Bugzilla/WebService/Server/XMLRPC.pm              |   11 +++++
 Bugzilla/WebService/User.pm                       |   43 +++++++++++++--------
 Bugzilla/WebService/Util.pm                       |    6 +-
 attachment.cgi                                    |   13 ++++--
 collectstats.pl                                   |    2 +-
 docs/bugzilla.ent.tmpl                            |    6 +-
 docs/en/xml/using.xml                             |    5 --
 reports.cgi                                       |    2 +-
 search_plugin.cgi                                 |    2 +-
 showdependencygraph.cgi                           |    6 +-
 template/en/default/bug/dependency-tree.html.tmpl |    7 ++-
 template/en/default/global/code-error.html.tmpl   |    6 ++-
 template/en/default/global/user-error.html.tmpl   |    5 +-
 template/en/default/pages/release-notes.html.tmpl |   21 ++++++++++-
 testserver.pl                                     |    6 +-
 36 files changed, 215 insertions(+), 92 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]