[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'bradegl/bug40040-02' into tor-browser-78.0.1esr-10.0-1
commit 3d5d9212e1f4ce272ef6a5a75459a7120e984b4e
Merge: 24dceb653768 2fa2abba5ec7
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date: Fri Jul 31 15:17:22 2020 +0000
Merge remote-tracking branch 'bradegl/bug40040-02' into tor-browser-78.0.1esr-10.0-1
browser/app/profile/firefox.js | 4 ++
.../customizableui/content/panelUI.inc.xhtml | 2 +-
.../components/customizableui/content/panelUI.js | 13 +++--
.../test/browser_panelUINotifications.js | 62 ++++++++++++++++++++++
browser/locales/en-US/browser/appmenu.ftl | 2 +
toolkit/mozapps/update/UpdateListener.jsm | 29 +++++-----
toolkit/mozapps/update/UpdateService.jsm | 39 ++++++--------
.../mozapps/update/tests/browser/browser.bits.ini | 1 +
toolkit/mozapps/update/tests/browser/browser.ini | 1 +
.../update/tests/browser/browser.legacy.bits.ini | 1 +
.../update/tests/browser/browser.legacy.ini | 1 +
.../browser/browser_aboutDialog_bc_downloading.js | 17 ++++++
.../browser_aboutDialog_bc_downloading_notify.js | 58 ++++++++++++++++++++
.../browser/browser_aboutDialog_fc_downloadAuto.js | 18 ++++++-
toolkit/mozapps/update/tests/data/shared.js | 1 +
15 files changed, 200 insertions(+), 49 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits