Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-08-23 10:05:02 +08:00
commit e6e3f61761
3 changed files with 2 additions and 4 deletions

View file

@ -11,7 +11,7 @@
#define BRANDING_RELNOTESPATH releasenotes.shtml #define BRANDING_RELNOTESPATH releasenotes.shtml
#define BRANDING_FIRSTRUNPATH firstrun/ #define BRANDING_FIRSTRUNPATH firstrun/
#define BRANDING_APPUPDATEURL aus.@BRANDING_BASEURL@ #define BRANDING_APPUPDATEURL aus.@BRANDING_BASEURL@
#define BRANDING_APPUPDATEPATH ?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL% #define BRANDING_APPUPDATEPATH ?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&toolkit=%WIDGET_TOOLKIT%&buildid=%BUILD_ID%&channel=%CHANNEL%
// Shared Branding Preferences // Shared Branding Preferences
// XXX: These should REALLY go back to application preferences // XXX: These should REALLY go back to application preferences

View file

@ -160,7 +160,7 @@ pref("app.update.silent", false);
pref("app.update.staging.enabled", true); pref("app.update.staging.enabled", true);
// Update service URL: // Update service URL:
pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%"); pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&toolkit=%WIDGET_TOOLKIT%&buildid=%BUILD_ID%&channel=%CHANNEL%");
// app.update.url.manual is in branding section // app.update.url.manual is in branding section
// app.update.url.details is in branding section // app.update.url.details is in branding section

View file

@ -12,8 +12,6 @@ pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue
// ===| Application Update Service |=========================================== // ===| Application Update Service |===========================================
pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%");
// The time interval between the downloading of mar file chunks in the // The time interval between the downloading of mar file chunks in the
// background (in seconds) // background (in seconds)
pref("app.update.download.backgroundInterval", 600); pref("app.update.download.backgroundInterval", 600);