[Bugzilla] [Patch 2/2]: Merge branch 'upstream'
Vitaliy Margolen
wine-patches at kievinfo.com
Sat Mar 6 20:58:36 CST 2010
Conflicts:
Bugzilla/DB/Mysql.pm
skins/contrib/Dusk/.cvsignore
skins/standard/global.css
skins/standard/index.css
template/en/default/global/header.html.tmpl
template/en/default/index.html.tmpl
---
Bugzilla.pm | 88 ++-
Bugzilla/Attachment.pm | 189 ++--
Bugzilla/Auth/Login/Env.pm | 1 +
Bugzilla/Auth/Login/Stack.pm | 14 +-
Bugzilla/Auth/Persist/Cookie.pm | 1 +
Bugzilla/Auth/Verify/DB.pm | 17 +-
Bugzilla/Auth/Verify/Stack.pm | 14 +-
Bugzilla/Bug.pm | 574 +++++++----
Bugzilla/BugMail.pm | 143 +--
Bugzilla/CGI.pm | 123 ++-
Bugzilla/Chart.pm | 9 +-
Bugzilla/Classification.pm | 206 ++---
Bugzilla/Config.pm | 23 +-
Bugzilla/Config/Admin.pm | 10 +-
Bugzilla/Config/Attachment.pm | 6 -
Bugzilla/Config/BugChange.pm | 12 -
Bugzilla/Config/BugFields.pm | 12 +-
Bugzilla/Config/Common.pm | 30 +-
Bugzilla/Config/Core.pm | 7 -
Bugzilla/Config/MTA.pm | 8 +-
Bugzilla/Config/Query.pm | 2 +-
Bugzilla/Constants.pm | 40 +-
Bugzilla/DB.pm | 163 +++-
Bugzilla/DB/Mysql.pm | 132 ++-
Bugzilla/DB/Oracle.pm | 52 +-
Bugzilla/DB/Pg.pm | 36 +-
Bugzilla/DB/Schema.pm | 444 ++++++--
Bugzilla/DB/Schema/Oracle.pm | 2 +-
Bugzilla/Field.pm | 385 ++++++-
Bugzilla/Field/Choice.pm | 445 ++++++++
Bugzilla/Flag.pm | 58 +-
Bugzilla/Group.pm | 91 ++-
Bugzilla/Hook.pm | 172 +++
Bugzilla/Install.pm | 6 +-
Bugzilla/Install/DB.pm | 104 ++-
Bugzilla/Install/Filesystem.pm | 130 ++-
Bugzilla/Install/Localconfig.pm | 116 ++-
Bugzilla/Install/Requirements.pm | 225 ++--
Bugzilla/Install/Util.pm | 29 +-
Bugzilla/Job/Mailer.pm | 57 +
Bugzilla/JobQueue.pm | 110 ++
Bugzilla/JobQueue/Runner.pm | 223 ++++
Bugzilla/Mailer.pm | 22 +-
Bugzilla/Object.pm | 165 +++-
Bugzilla/Product.pm | 675 ++++++++++++-
Bugzilla/Search.pm | 464 ++++++---
Bugzilla/Search/Quicksearch.pm | 2 +-
Bugzilla/Series.pm | 33 +-
Bugzilla/Status.pm | 90 ++-
Bugzilla/Template.pm | 72 +-
Bugzilla/Template/Parser.pm | 66 --
Bugzilla/Token.pm | 16 +-
Bugzilla/User.pm | 396 ++++----
Bugzilla/User/Setting/Timezone.pm | 71 ++
Bugzilla/Util.pm | 223 +++--
Bugzilla/WebService.pm | 195 ++--
Bugzilla/WebService/Bug.pm | 1086 ++++++++++++++++++--
Bugzilla/WebService/Bugzilla.pm | 120 ++-
Bugzilla/WebService/Constants.pm | 43 +-
Bugzilla/WebService/Product.pm | 10 +-
Bugzilla/WebService/Server.pm | 42 +
Bugzilla/WebService/Server/XMLRPC.pm | 244 +++++
Bugzilla/WebService/User.pm | 235 +++++-
Bugzilla/WebService/Util.pm | 101 ++
QUICKSTART | 84 --
README | 101 ++-
UPGRADING | 3 -
UPGRADING-pre-2.8 | 412 --------
attachment.cgi | 74 +-
buglist.cgi | 325 +++----
chart.cgi | 2 +-
checksetup.pl | 9 +-
colchange.cgi | 33 +-
collectstats.pl | 144 ++--
config.cgi | 6 +-
contrib/bugzilla-queue | 109 ++
contrib/bzdbcopy.pl | 2 -
describecomponents.cgi | 7 +-
describekeywords.cgi | 3 +
docs/bugzilla.ent | 13 +-
docs/en/xml/Bugzilla-Guide.xml | 11 +-
docs/en/xml/about.xml | 2 +-
docs/en/xml/administration.xml | 48 +-
docs/en/xml/bugzilla.ent | 13 +-
docs/en/xml/customization.xml | 23 +-
docs/en/xml/glossary.xml | 3 +-
docs/en/xml/installation.xml | 108 +--
docs/en/xml/integration.xml | 120 ---
docs/en/xml/modules.xml | 8 -
docs/en/xml/requiredsoftware.xml | 77 --
docs/en/xml/security.xml | 98 +--
docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm | 14 +-
docs/makedocs.pl | 7 -
duplicates.cgi | 29 +-
duplicates.xul | 133 ---
editclassifications.cgi | 130 +--
editfields.cgi | 8 +-
editflagtypes.cgi | 27 +-
editgroups.cgi | 79 +--
editkeywords.cgi | 6 +-
editparams.cgi | 7 +-
editproducts.cgi | 862 ++--------------
editusers.cgi | 45 +-
editvalues.cgi | 396 +-------
editwhines.cgi | 2 +-
email_in.pl | 16 +-
enter_bug.cgi | 30 +-
extensions/example/code/auth-login_methods.pl | 27 +
extensions/example/code/auth-verify_methods.pl | 27 +
extensions/example/code/bug-columns.pl | 27 +
extensions/example/code/bug-end_of_create.pl | 35 +
extensions/example/code/bug-fields.pl | 27 +
extensions/example/code/config-add_panels.pl | 25 +
extensions/example/code/config-modify_panels.pl | 32 +
extensions/example/code/mailer-before_send.pl | 28 +
extensions/example/code/page-before_template.pl | 33 +
extensions/example/code/product-confirm_delete.pl | 2 +-
extensions/example/lib/AuthLogin.pm | 32 +
extensions/example/lib/AuthVerify.pm | 31 +
.../template/en/default/pages/example.html.tmpl | 32 +
importxml.pl | 11 +-
index.cgi | 17 +-
install-module.pl | 18 +-
jobqueue.pl | 79 ++
js/TUI.js | 208 ++---
js/attachment.js | 106 ++-
js/change-columns.js | 142 +++
js/duplicates.js | 153 ---
js/field.js | 239 ++++-
js/global.js | 112 ++
js/util.js | 117 +++
js/yui/calendar.js | 26 +-
js/yui/cookie.js | 7 +
js/yui/yahoo-dom-event.js | 14 +-
page.cgi | 7 +-
post_bug.cgi | 2 +-
process_bug.cgi | 59 +-
query.cgi | 24 +-
relogin.cgi | 22 +-
report.cgi | 58 +-
request.cgi | 28 +-
sanitycheck.cgi | 36 +-
sanitycheck.pl | 2 -
search_plugin.cgi | 12 +-
show_activity.cgi | 12 +-
show_bug.cgi | 12 +-
showdependencygraph.cgi | 4 +-
showdependencytree.cgi | 9 +-
skins/contrib/Dusk/global.css | 49 +-
skins/contrib/Dusk/index.css | 25 +
skins/contrib/Dusk/index/account.gif | Bin 0 -> 6869 bytes
skins/contrib/Dusk/index/bug.gif | Bin 0 -> 6370 bytes
skins/contrib/Dusk/index/search.gif | Bin 0 -> 6661 bytes
skins/standard/buglist.css | 32 +
skins/standard/create_attachment.css | 70 ++
skins/standard/global.css | 120 ++-
skins/standard/global/down.png | Bin 0 -> 335 bytes
skins/standard/global/left.png | Bin 0 -> 339 bytes
skins/standard/global/right.png | Bin 0 -> 339 bytes
skins/standard/global/up.png | Bin 0 -> 318 bytes
skins/standard/index.css | 116 ++-
skins/standard/index/account.gif | Bin 0 -> 7130 bytes
skins/standard/index/bug.gif | Bin 0 -> 6586 bytes
skins/standard/index/front.png | Bin 47235 -> 0 bytes
skins/standard/index/search.gif | Bin 0 -> 6907 bytes
skins/standard/show_bug.css | 28 +-
skins/standard/yui/calendar.css | 6 +-
skins/standard/yui/sprite.png | Bin 3123 -> 3745 bytes
summarize_time.cgi | 34 +-
t/005no_tabs.t | 55 -
t/005whitespace.t | 82 ++
t/007util.t | 44 +-
t/008filter.t | 2 +-
t/009bugwords.t | 2 +-
.../en/default/account/auth/login-small.html.tmpl | 143 ++-
template/en/default/account/auth/login.html.tmpl | 2 +-
template/en/default/account/cancel-token.txt.tmpl | 2 +-
template/en/default/account/create.html.tmpl | 2 +-
.../en/default/account/email/change-new.txt.tmpl | 5 +-
.../en/default/account/email/change-old.txt.tmpl | 5 +-
.../en/default/account/email/confirm-new.html.tmpl | 5 +-
.../en/default/account/email/request-new.txt.tmpl | 7 +-
.../account/password/forgotten-password.txt.tmpl | 5 +-
template/en/default/account/prefs/email.html.tmpl | 6 +-
.../en/default/account/prefs/permissions.html.tmpl | 4 +-
.../default/account/prefs/saved-searches.html.tmpl | 3 +-
.../en/default/account/profile-activity.html.tmpl | 1 +
template/en/default/admin/admin.html.tmpl | 20 +-
.../en/default/admin/components/list.html.tmpl | 16 +-
.../en/default/admin/custom_fields/cf-js.js.tmpl | 59 ++
.../default/admin/custom_fields/create.html.tmpl | 60 +-
.../en/default/admin/custom_fields/edit.html.tmpl | 75 +-
.../en/default/admin/custom_fields/list.html.tmpl | 26 +-
.../admin/fieldvalues/confirm-delete.html.tmpl | 113 ++-
.../en/default/admin/fieldvalues/create.html.tmpl | 36 +-
.../en/default/admin/fieldvalues/edit.html.tmpl | 57 +-
.../en/default/admin/fieldvalues/footer.html.tmpl | 9 +-
.../en/default/admin/fieldvalues/list.html.tmpl | 35 +-
template/en/default/admin/flag-type/list.html.tmpl | 30 +-
template/en/default/admin/groups/edit.html.tmpl | 2 +-
template/en/default/admin/groups/list.html.tmpl | 116 +--
.../en/default/admin/milestones/list.html.tmpl | 9 +-
template/en/default/admin/params/admin.html.tmpl | 6 +-
.../en/default/admin/params/attachment.html.tmpl | 7 +-
.../en/default/admin/params/bugchange.html.tmpl | 6 -
.../en/default/admin/params/bugfields.html.tmpl | 11 +-
template/en/default/admin/params/core.html.tmpl | 4 -
template/en/default/admin/params/index.html.tmpl | 9 +-
template/en/default/admin/params/mta.html.tmpl | 10 +
.../admin/products/confirm-delete.html.tmpl | 28 +-
.../en/default/admin/products/create.html.tmpl | 2 -
template/en/default/admin/products/edit.html.tmpl | 7 +-
.../en/default/admin/products/footer.html.tmpl | 7 +-
.../admin/products/groupcontrol/edit.html.tmpl | 48 +-
.../admin/products/groupcontrol/updated.html.tmpl | 14 +-
template/en/default/admin/products/list.html.tmpl | 29 +-
.../en/default/admin/products/updated.html.tmpl | 93 +--
.../default/admin/sanitycheck/messages.html.tmpl | 15 +-
template/en/default/admin/table.html.tmpl | 76 +-
.../default/admin/users/confirm-delete.html.tmpl | 4 +-
template/en/default/admin/users/list.html.tmpl | 39 +-
template/en/default/admin/users/userdata.html.tmpl | 2 +-
template/en/default/attachment/create.html.tmpl | 3 +-
template/en/default/attachment/created.html.tmpl | 4 +-
.../attachment/createformcontents.html.tmpl | 15 +-
.../en/default/attachment/diff-header.html.tmpl | 184 +----
template/en/default/attachment/edit.html.tmpl | 10 +-
template/en/default/attachment/list.html.tmpl | 46 +-
template/en/default/attachment/updated.html.tmpl | 4 +-
template/en/default/bug/activity/table.html.tmpl | 9 +-
template/en/default/bug/comments.html.tmpl | 103 +-
template/en/default/bug/create/create.html.tmpl | 84 ++-
template/en/default/bug/create/created.html.tmpl | 8 +-
template/en/default/bug/dependency-tree.html.tmpl | 4 +-
template/en/default/bug/edit.html.tmpl | 205 ++--
template/en/default/bug/field-events.js.tmpl | 40 +
template/en/default/bug/field.html.tmpl | 129 +++-
template/en/default/bug/format_comment.txt.tmpl | 60 ++
template/en/default/bug/knob.html.tmpl | 5 +-
template/en/default/bug/process/header.html.tmpl | 3 +-
template/en/default/bug/process/midair.html.tmpl | 12 +
template/en/default/bug/show-multiple.html.tmpl | 4 +-
template/en/default/bug/show.html.tmpl | 4 +-
template/en/default/bug/show.xml.tmpl | 52 +-
template/en/default/bug/summarize-time.html.tmpl | 49 +-
.../en/default/bug/votes/list-for-bug.html.tmpl | 5 +-
template/en/default/config.js.tmpl | 2 +-
template/en/default/config.rdf.tmpl | 8 +-
template/en/default/email/newchangedmail.txt.tmpl | 13 +-
template/en/default/email/sanitycheck.txt.tmpl | 2 +-
template/en/default/email/whine.txt.tmpl | 6 +-
template/en/default/filterexceptions.pl | 47 +-
template/en/default/flag/list.html.tmpl | 17 +-
.../default/global/choose-classification.html.tmpl | 3 -
template/en/default/global/code-error.html.tmpl | 49 +-
template/en/default/global/common-links.html.tmpl | 55 +-
template/en/default/global/field-descs.none.tmpl | 35 +-
template/en/default/global/header.html.tmpl | 62 +-
template/en/default/global/messages.html.tmpl | 128 ++-
template/en/default/global/setting-descs.none.tmpl | 4 +
.../en/default/global/site-navigation.html.tmpl | 16 +-
template/en/default/global/useful-links.html.tmpl | 4 -
template/en/default/global/user-error.html.tmpl | 273 +++--
template/en/default/global/user.html.tmpl | 39 +
template/en/default/global/variables.none.tmpl | 1 +
template/en/default/index.html.tmpl | 47 +-
template/en/default/list/change-columns.html.tmpl | 60 +-
template/en/default/list/edit-multiple.html.tmpl | 39 +-
template/en/default/list/list.atom.tmpl | 9 +-
template/en/default/list/list.csv.tmpl | 3 +-
template/en/default/list/list.html.tmpl | 51 +-
template/en/default/list/list.ics.tmpl | 6 +-
template/en/default/list/list.rdf.tmpl | 1 +
template/en/default/list/quips.html.tmpl | 4 +-
template/en/default/list/table.html.tmpl | 77 ++-
template/en/default/pages/fields.html.tmpl | 14 +
template/en/default/pages/release-notes.html.tmpl | 773 ++++++++++++++-
template/en/default/pages/sudo.html.tmpl | 4 +-
template/en/default/reports/chart.html.tmpl | 4 +-
template/en/default/reports/components.html.tmpl | 6 +-
template/en/default/reports/create-chart.html.tmpl | 30 +-
template/en/default/reports/duplicates.rdf.tmpl | 50 -
template/en/default/reports/report-table.csv.tmpl | 39 +-
template/en/default/reports/report-table.html.tmpl | 34 +-
template/en/default/reports/report.html.tmpl | 6 +-
.../en/default/reports/series-common.html.tmpl | 10 +-
template/en/default/request/email.txt.tmpl | 3 +-
template/en/default/request/queue.html.tmpl | 11 +-
.../en/default/search/boolean-charts.html.tmpl | 58 +-
template/en/default/search/form.html.tmpl | 63 +-
template/en/default/search/knob.html.tmpl | 4 +
.../en/default/search/search-advanced.html.tmpl | 2 +-
template/en/default/search/search-help.html.tmpl | 4 +-
template/en/default/search/search-plugin.xml.tmpl | 6 +-
.../default/search/search-report-select.html.tmpl | 7 +
template/en/default/search/type-select.html.tmpl | 29 +
template/en/default/setup/strings.txt.pl | 62 ++
template/en/default/sidebar.xul.tmpl | 19 +-
template/en/default/whine/mail.html.tmpl | 6 +-
template/en/default/whine/mail.txt.tmpl | 6 +-
template/en/default/whine/multipart-mime.txt.tmpl | 1 +
template/en/default/whine/schedule.html.tmpl | 6 +-
testserver.pl | 16 +-
token.cgi | 162 ++--
userprefs.cgi | 60 +-
votes.cgi | 34 +-
whine.pl | 22 +-
xmlrpc.cgi | 37 +-
308 files changed, 13003 insertions(+), 7026 deletions(-)
create mode 100644 Bugzilla/Field/Choice.pm
create mode 100644 Bugzilla/Job/Mailer.pm
create mode 100644 Bugzilla/JobQueue.pm
create mode 100644 Bugzilla/JobQueue/Runner.pm
delete mode 100644 Bugzilla/Template/Parser.pm
create mode 100644 Bugzilla/User/Setting/Timezone.pm
create mode 100644 Bugzilla/WebService/Server.pm
create mode 100644 Bugzilla/WebService/Server/XMLRPC.pm
create mode 100644 Bugzilla/WebService/Util.pm
delete mode 100644 QUICKSTART
delete mode 100644 UPGRADING
delete mode 100644 UPGRADING-pre-2.8
create mode 100644 contrib/bugzilla-queue
mode change 100644 => 100755 contrib/cvs-update.pl
mode change 100644 => 100755 contrib/gnats2bz.pl
mode change 100755 => 100644 contrib/gnatsparse/README
mode change 100644 => 100755 contrib/jb2bz.py
mode change 100644 => 100755 contrib/merge-users.pl
mode change 100644 => 100755 contrib/sendbugmail.pl
mode change 100644 => 100755 contrib/sendunsentbugmail.pl
mode change 100644 => 100755 contrib/yp_nomail.sh
delete mode 100644 docs/en/xml/integration.xml
delete mode 100644 docs/en/xml/requiredsoftware.xml
delete mode 100644 duplicates.xul
create mode 100644 extensions/example/code/auth-login_methods.pl
create mode 100644 extensions/example/code/auth-verify_methods.pl
create mode 100644 extensions/example/code/bug-columns.pl
create mode 100644 extensions/example/code/bug-end_of_create.pl
create mode 100644 extensions/example/code/bug-fields.pl
create mode 100644 extensions/example/code/config-add_panels.pl
create mode 100644 extensions/example/code/config-modify_panels.pl
create mode 100644 extensions/example/code/mailer-before_send.pl
create mode 100644 extensions/example/code/page-before_template.pl
create mode 100644 extensions/example/lib/AuthLogin.pm
create mode 100644 extensions/example/lib/AuthVerify.pm
create mode 100644
extensions/example/template/en/default/pages/example.html.tmpl
mode change 100644 => 100755 install-module.pl
create mode 100755 jobqueue.pl
create mode 100644 js/change-columns.js
delete mode 100644 js/duplicates.js
create mode 100644 js/global.js
create mode 100644 js/yui/cookie.js
mode change 100644 => 100755 mod_perl.pl
mode change 100644 => 100755 sanitycheck.pl
create mode 100644 skins/contrib/Dusk/index.css
create mode 100644 skins/contrib/Dusk/index/account.gif
create mode 100644 skins/contrib/Dusk/index/bug.gif
create mode 100644 skins/contrib/Dusk/index/search.gif
create mode 100644 skins/standard/global/down.png
create mode 100644 skins/standard/global/left.png
create mode 100644 skins/standard/global/right.png
create mode 100644 skins/standard/global/up.png
create mode 100644 skins/standard/index/account.gif
create mode 100644 skins/standard/index/bug.gif
delete mode 100644 skins/standard/index/front.png
create mode 100644 skins/standard/index/search.gif
delete mode 100644 t/005no_tabs.t
create mode 100644 t/005whitespace.t
create mode 100644 template/en/default/admin/custom_fields/cf-js.js.tmpl
mode change 100755 => 100644 template/en/default/admin/params/radius.html.tmpl
create mode 100644 template/en/default/bug/field-events.js.tmpl
create mode 100644 template/en/default/bug/format_comment.txt.tmpl
create mode 100644 template/en/default/global/user.html.tmpl
delete mode 100644 template/en/default/reports/duplicates.rdf.tmpl
create mode 100644 template/en/default/search/type-select.html.tmpl
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Merge-branch-upstream.patch.gz
Type: application/x-gzip
Size: 440225 bytes
Desc: not available
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20100306/08f2fa1d/attachment-0001.bin>
More information about the wine-patches
mailing list