← Back to branch summary

~evan-goer/bugzilla-yui3/yui3

~evan-goer/bugzilla-yui3/yui3

Viewing all changes in revision 8542.

Committer: Evan Goer
Date: 2013-03-12 18:41:26 UTC
mfrom: (8510.1.77 trunk)
Revision ID: goer@yahoo-inc.com-20130312184126-1h52s7zm16zdbhdz

Merge upstream changes, resolve conflicts

files added:
extensions/Example/template/en/default/hook/search

extensions/Example/template/en/default/hook/search/tabs-search_tabs.html.tmpl

extensions/MoreBugUrl/lib/BitBucket.pm

template/en/default/email/new-user-details.txt.tmpl

files removed:
template/en/default/global/help.html.tmpl

files modified:
Bugzilla.pm

Bugzilla/Attachment/PatchReader.pm

Bugzilla/Bug.pm

Bugzilla/BugUrl/Debian.pm

Bugzilla/BugUrl/GitHub.pm

Bugzilla/BugUrl/Google.pm

Bugzilla/BugUrl/Launchpad.pm

Bugzilla/BugUrl/SourceForge.pm

Bugzilla/Config/GroupSecurity.pm

Bugzilla/Config/MTA.pm

Bugzilla/DB/Schema.pm

Bugzilla/Field.pm

Bugzilla/Flag.pm

Bugzilla/Install/DB.pm

Bugzilla/Install/Requirements.pm

Bugzilla/Install/Util.pm

Bugzilla/JobQueue.pm

Bugzilla/JobQueue/Runner.pm

Bugzilla/Mailer.pm

Bugzilla/Search.pm

Bugzilla/Search/ClauseGroup.pm

Bugzilla/Template.pm

Bugzilla/WebService.pm

Bugzilla/WebService/Product.pm

Bugzilla/WebService/Util.pm

buglist.cgi

collectstats.pl

editusers.cgi

extensions/MoreBugUrl/Extension.pm

extensions/MoreBugUrl/lib/GetSatisfaction.pm

extensions/MoreBugUrl/lib/PHP.pm

extensions/MoreBugUrl/lib/RT.pm

extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl

jobqueue.pl

quips.cgi

report.cgi

show_bug.cgi

skins/standard/buglist.css

t/011pod.t

template/en/default/admin/params/groupsecurity.html.tmpl

template/en/default/admin/products/list.html.tmpl

template/en/default/admin/users/userdata.html.tmpl

template/en/default/attachment/diff-header.html.tmpl

template/en/default/bug/comments.html.tmpl

template/en/default/bug/edit.html.tmpl

template/en/default/bug/show-header.html.tmpl

template/en/default/flag/list.html.tmpl

template/en/default/global/footer.html.tmpl

template/en/default/global/header.html.tmpl

template/en/default/global/user-error.html.tmpl

template/en/default/list/list.html.tmpl

template/en/default/list/table.html.tmpl

template/en/default/pages/release-notes.html.tmpl

template/en/default/reports/report.html.tmpl

template/en/default/search/boolean-charts.html.tmpl

template/en/default/search/tabs.html.tmpl

testserver.pl

whine.pl

xt/lib/Bugzilla/Test/Search/FieldTest.pm

Show diffs side-by-side

added added

removed removed

Bugzilla/Attachment/PatchReader.pm

Bugzilla/Bug.pm

Bugzilla/BugUrl/Debian.pm

Bugzilla/BugUrl/GitHub.pm

Bugzilla/BugUrl/Google.pm

Bugzilla/BugUrl/Launchpad.pm

Bugzilla/BugUrl/SourceForge.pm

Bugzilla/Config/GroupSecurity.pm

Bugzilla/Config/MTA.pm

Bugzilla/DB/Schema.pm

Bugzilla/Field.pm

Bugzilla/Flag.pm

Bugzilla/Install/DB.pm

Bugzilla/Install/Requirements.pm

Bugzilla/Install/Util.pm

Bugzilla/JobQueue.pm

Bugzilla/JobQueue/Runner.pm

Bugzilla/Mailer.pm

Bugzilla/Search.pm

Bugzilla/Search/ClauseGroup.pm

Bugzilla/Template.pm

Bugzilla/WebService.pm

Bugzilla/WebService/Product.pm

Bugzilla/WebService/Util.pm

collectstats.pl

extensions/Example/template/en/default/hook/search/

extensions/Example/template/en/default/hook/search/tabs-search_tabs.html.tmpl

extensions/MoreBugUrl/Extension.pm

extensions/MoreBugUrl/lib/BitBucket.pm

extensions/MoreBugUrl/lib/GetSatisfaction.pm

extensions/MoreBugUrl/lib/PHP.pm

extensions/MoreBugUrl/lib/RT.pm

extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl

skins/standard/buglist.css

template/en/default/admin/params/groupsecurity.html.tmpl

template/en/default/admin/products/list.html.tmpl

template/en/default/admin/users/userdata.html.tmpl

template/en/default/attachment/diff-header.html.tmpl

template/en/default/bug/comments.html.tmpl

template/en/default/bug/edit.html.tmpl

template/en/default/bug/show-header.html.tmpl

template/en/default/email/new-user-details.txt.tmpl

template/en/default/flag/list.html.tmpl

template/en/default/global/help.html.tmpl

template/en/default/global/user-error.html.tmpl

template/en/default/list/list.html.tmpl

template/en/default/list/table.html.tmpl

template/en/default/pages/release-notes.html.tmpl

template/en/default/reports/report.html.tmpl

template/en/default/search/boolean-charts.html.tmpl

template/en/default/search/tabs.html.tmpl

xt/lib/Bugzilla/Test/Search/FieldTest.pm

Older »