Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DB-2258: merge with Firefox 69.0 #1339

Merged
merged 24 commits into from Aug 27, 2019
Merged

DB-2258: merge with Firefox 69.0 #1339

merged 24 commits into from Aug 27, 2019

Conversation

aleksei-cliqz
Copy link
Contributor

@aleksei-cliqz aleksei-cliqz commented Aug 27, 2019

No description provided.

mozilla and others added 24 commits Aug 16, 2019
        both modified:   l10n/de/browser/browser/customizeMode.ftl
	both modified:   l10n/de/browser/browser/preferences/connection.ftl
	both modified:   l10n/de/browser/browser/preferences/preferences.ftl
	deleted by them: l10n/de/browser/chrome/browser/aboutPrivateBrowsing.dtd
	deleted by them: l10n/de/browser/chrome/browser/aboutTabCrashed.dtd
	deleted by them: l10n/de/browser/chrome/browser/pageInfo.properties
	deleted by them: l10n/de/browser/chrome/browser/preferences/security.dtd
	deleted by them: l10n/de/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
	deleted by them: l10n/de/toolkit/chrome/global/aboutRights.dtd
	deleted by them: l10n/de/toolkit/chrome/global/aboutTelemetry.properties
	deleted by them: l10n/de/toolkit/chrome/global/printPageSetup.dtd
	both modified:   mozilla-release/browser/app/profile/firefox.js
	both modified:   mozilla-release/browser/base/content/aboutDialog.js
	both modified:   mozilla-release/browser/base/content/browser-addons.js
	both modified:   mozilla-release/browser/base/content/browser-contentblocking.js
	both modified:   mozilla-release/browser/base/content/browser-pageActions.js
	both modified:   mozilla-release/browser/base/content/browser-places.js
	both modified:   mozilla-release/browser/base/content/browser-sidebar.js
	both modified:   mozilla-release/browser/base/content/browser-siteIdentity.js
	both modified:   mozilla-release/browser/base/content/browser.js
	deleted by them: mozilla-release/browser/base/content/browser.xul
	both modified:   mozilla-release/browser/base/content/nsContextMenu.js
	both modified:   mozilla-release/browser/base/content/tabbrowser.js
	deleted by them: mozilla-release/browser/base/content/tabbrowser.xml
	both modified:   mozilla-release/browser/base/content/utilityOverlay.js
	both modified:   mozilla-release/browser/base/jar.mn
	both modified:   mozilla-release/browser/components/BrowserContentHandler.jsm
	both modified:   mozilla-release/browser/components/BrowserGlue.jsm
	both modified:   mozilla-release/browser/components/customizableui/CustomizableUI.jsm
	both modified:   mozilla-release/browser/components/customizableui/content/panelUI.inc.xul
	both modified:   mozilla-release/browser/components/customizableui/content/panelUI.js
	both modified:   mozilla-release/browser/components/enterprisepolicies/Policies.jsm
	both modified:   mozilla-release/browser/components/extensions/parent/ext-browser.js
	both modified:   mozilla-release/browser/components/extensions/parent/ext-chrome-settings-overrides.js
	both modified:   mozilla-release/browser/components/extensions/parent/ext-find.js
	both modified:   mozilla-release/browser/components/extensions/parent/ext-menus.js
	both modified:   mozilla-release/browser/components/extensions/parent/ext-tabs.js
	both modified:   mozilla-release/browser/components/extensions/parent/ext-windows.js
	both modified:   mozilla-release/browser/components/migration/ChromeProfileMigrator.jsm
	both modified:   mozilla-release/browser/components/migration/FirefoxProfileMigrator.jsm
	both modified:   mozilla-release/browser/components/migration/MigrationUtils.jsm
	both modified:   mozilla-release/browser/components/migration/content/migration.js
	both modified:   mozilla-release/browser/components/newtab/AboutNewTabService.jsm
	both modified:   mozilla-release/browser/components/newtab/jar.mn
	both modified:   mozilla-release/browser/components/newtab/lib/ASRouterPreferences.jsm
	both modified:   mozilla-release/browser/components/newtab/lib/BookmarkPanelHub.jsm
	both modified:   mozilla-release/browser/components/newtab/lib/TopStoriesFeed.jsm
	both modified:   mozilla-release/browser/components/places/PlacesUIUtils.jsm
	both modified:   mozilla-release/browser/components/preferences/in-content/home.js
	both modified:   mozilla-release/browser/components/preferences/in-content/main.js
	both modified:   mozilla-release/browser/components/preferences/in-content/preferences.js
	both modified:   mozilla-release/browser/components/preferences/in-content/privacy.js
	both modified:   mozilla-release/browser/components/preferences/in-content/privacy.xul
	both modified:   mozilla-release/browser/components/preferences/sitePermissions.js
	both modified:   mozilla-release/browser/components/sessionstore/SessionMigration.jsm
	both modified:   mozilla-release/browser/components/sessionstore/SessionStartup.jsm
	both modified:   mozilla-release/browser/components/sessionstore/SessionStore.jsm
	both modified:   mozilla-release/browser/components/sessionstore/content/aboutSessionRestore.js
	both modified:   mozilla-release/browser/components/shell/ShellService.jsm
	both modified:   mozilla-release/browser/components/urlbar/UrlbarInput.jsm
	both modified:   mozilla-release/browser/config/version_display.txt
	both modified:   mozilla-release/browser/installer/windows/nsis/installer.nsi
	both modified:   mozilla-release/browser/installer/windows/nsis/stub.nsi
	both modified:   mozilla-release/browser/installer/windows/nsis/uninstaller.nsi
	both modified:   mozilla-release/browser/locales/en-US/browser/aboutPrivateBrowsing.ftl
	both modified:   mozilla-release/browser/locales/en-US/browser/customizeMode.ftl
	both modified:   mozilla-release/browser/modules/AboutNewTab.jsm
	both modified:   mozilla-release/browser/modules/ContentClick.jsm
	both modified:   mozilla-release/browser/modules/ExtensionsUI.jsm
	both modified:   mozilla-release/browser/modules/HomePage.jsm
	both modified:   mozilla-release/browser/modules/webrtcUI.jsm
	both modified:   mozilla-release/browser/themes/shared/customizableui/panelUI.inc.css
	both modified:   mozilla-release/browser/themes/shared/jar.inc.mn
	both modified:   mozilla-release/devtools/client/aboutdebugging/components/Aboutdebugging.js
	both modified:   mozilla-release/devtools/client/aboutdebugging/components/addons/Panel.js
	both modified:   mozilla-release/devtools/client/menus.js
	both modified:   mozilla-release/devtools/server/actors/targets/browsing-context.js
	both modified:   mozilla-release/docshell/base/nsAboutRedirector.cpp
	both modified:   mozilla-release/dom/ipc/BrowserChild.h
	both modified:   mozilla-release/modules/libpref/init/StaticPrefList.h
	both modified:   mozilla-release/modules/libpref/init/all.js
	both modified:   mozilla-release/python/mozbuild/mozbuild/repackaging/msi.py
	both modified:   mozilla-release/services/settings/RemoteSettingsClient.jsm
	both modified:   mozilla-release/toolkit/components/enterprisepolicies/WindowsGPOParser.jsm
	both modified:   mozilla-release/toolkit/components/extensions/parent/ext-management.js
	both modified:   mozilla-release/toolkit/components/normandy/content/AboutPages.jsm
	both modified:   mozilla-release/toolkit/components/passwordmgr/LoginManagerParent.jsm
	both modified:   mozilla-release/toolkit/components/places/History.jsm
	both modified:   mozilla-release/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
	both modified:   mozilla-release/toolkit/components/search/SearchService.jsm
	both modified:   mozilla-release/toolkit/components/telemetry/app/TelemetryController.jsm
	both modified:   mozilla-release/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
	both modified:   mozilla-release/toolkit/components/url-classifier/SafeBrowsing.jsm
	both modified:   mozilla-release/toolkit/components/urlformatter/URLFormatter.jsm
	both modified:   mozilla-release/toolkit/content/aboutRights.js
	both modified:   mozilla-release/toolkit/content/browser-content.js
	both modified:   mozilla-release/toolkit/content/contentAreaUtils.js
	both modified:   mozilla-release/toolkit/content/globalOverlay.js
	both modified:   mozilla-release/toolkit/crashreporter/content/crashes.js
	both modified:   mozilla-release/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
	both modified:   mozilla-release/toolkit/modules/NewTabUtils.jsm
	both modified:   mozilla-release/toolkit/modules/PrivateBrowsingUtils.jsm
	both modified:   mozilla-release/toolkit/mozapps/extensions/AddonManager.jsm
	both modified:   mozilla-release/toolkit/mozapps/extensions/content/aboutaddons.js
	both modified:   mozilla-release/toolkit/mozapps/extensions/content/extensions.js
	both modified:   mozilla-release/toolkit/mozapps/extensions/internal/AddonRepository.jsm
	both modified:   mozilla-release/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
	both modified:   mozilla-release/toolkit/mozapps/extensions/internal/XPIInstall.jsm
	both modified:   mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm
	both modified:   mozilla-release/toolkit/mozapps/installer/windows/nsis/common.nsh
	both modified:   mozilla-release/toolkit/mozapps/update/UpdateService.jsm
	both modified:   mozilla-release/toolkit/mozapps/update/UpdateTelemetry.jsm
	both modified:   mozilla-release/toolkit/mozapps/update/content/history.js
	both modified:   mozilla-release/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
    both modified:   mozilla-release/browser/app/profile/firefox.js
    both modified:   mozilla-release/browser/base/content/aboutDialog.js
    both modified:   mozilla-release/browser/base/content/browser-addons.js
    both modified:   mozilla-release/browser/base/content/browser-contentblocking.js
    both modified:   mozilla-release/browser/base/content/browser-pageActions.js
    both modified:   mozilla-release/browser/base/content/browser-places.js
    both modified:   mozilla-release/browser/base/content/browser-sidebar.js
    both modified:   mozilla-release/browser/base/content/browser-siteIdentity.js
    both modified:   mozilla-release/browser/base/content/browser.js
    both modified:   mozilla-release/browser/base/content/nsContextMenu.js
    both modified:   mozilla-release/browser/base/content/utilityOverlay.js
    both modified:   mozilla-release/browser/base/jar.mn
    both modified:   mozilla-release/browser/components/BrowserContentHandler.jsm
    both modified:   mozilla-release/browser/components/BrowserGlue.jsm
    both modified:   mozilla-release/browser/components/customizableui/CustomizableUI.jsm
    both modified:   mozilla-release/browser/components/customizableui/content/panelUI.inc.xul
    both modified:   mozilla-release/browser/components/customizableui/content/panelUI.js
    both modified:   mozilla-release/browser/components/extensions/parent/ext-browser.js
    both modified:   mozilla-release/browser/components/extensions/parent/ext-chrome-settings-overrides.js
    both modified:   mozilla-release/browser/components/extensions/parent/ext-find.js
    both modified:   mozilla-release/browser/components/extensions/parent/ext-menus.js
    both modified:   mozilla-release/browser/components/extensions/parent/ext-tabs.js
    both modified:   mozilla-release/browser/components/extensions/parent/ext-windows.js
    both modified:   mozilla-release/browser/components/migration/ChromeProfileMigrator.jsm
    both modified:   mozilla-release/browser/components/migration/MigrationUtils.jsm
	modified:   mozilla-release/browser/components/migration/content/migration.js
	modified:   mozilla-release/browser/components/newtab/AboutNewTabService.jsm
	modified:   mozilla-release/browser/components/newtab/jar.mn
	modified:   mozilla-release/browser/components/newtab/lib/ASRouterPreferences.jsm
	modified:   mozilla-release/browser/components/newtab/lib/BookmarkPanelHub.jsm
	modified:   mozilla-release/browser/components/newtab/lib/TopStoriesFeed.jsm
	modified:   mozilla-release/browser/components/places/PlacesUIUtils.jsm
	modified:   mozilla-release/browser/components/preferences/in-content/home.js
	modified:   mozilla-release/browser/components/preferences/in-content/main.js
	modified:   mozilla-release/browser/components/preferences/in-content/preferences.js
	modified:   mozilla-release/browser/components/preferences/in-content/privacy.js
	modified:   mozilla-release/browser/components/preferences/in-content/privacy.xul
	modified:   mozilla-release/browser/components/preferences/sitePermissions.js
	modified:   mozilla-release/browser/components/sessionstore/SessionMigration.jsm
	modified:   mozilla-release/browser/components/sessionstore/SessionStartup.jsm
	modified:   mozilla-release/browser/components/sessionstore/SessionStore.jsm
	modified:   mozilla-release/browser/components/sessionstore/content/aboutSessionRestore.js
	modified:   mozilla-release/browser/components/shell/ShellService.jsm
	modified:   mozilla-release/browser/components/urlbar/UrlbarInput.jsm
	modified:   mozilla-release/browser/modules/AboutNewTab.jsm
	modified:   mozilla-release/browser/modules/ContentClick.jsm
	modified:   mozilla-release/browser/modules/ExtensionsUI.jsm
	modified:   mozilla-release/browser/modules/HomePage.jsm
	modified:   mozilla-release/browser/modules/webrtcUI.jsm
	modified:   mozilla-release/browser/themes/shared/customizableui/panelUI.inc.css
	modified:   mozilla-release/browser/themes/shared/jar.inc.mn
	modified:   mozilla-release/devtools/client/aboutdebugging/components/Aboutdebugging.js
	modified:   mozilla-release/devtools/client/aboutdebugging/components/addons/Panel.js
	modified:   mozilla-release/devtools/client/menus.js
	modified:   mozilla-release/devtools/server/actors/targets/browsing-context.js
    modified:   mozilla-release/docshell/base/nsAboutRedirector.cpp
    modified:   mozilla-release/dom/ipc/BrowserChild.h
    modified:   mozilla-release/modules/libpref/init/StaticPrefList.h
    modified:   mozilla-release/modules/libpref/init/all.js
    modified:   mozilla-release/python/mozbuild/mozbuild/repackaging/msi.py
    modified:   mozilla-release/services/settings/RemoteSettingsClient.jsm
    modified:   mozilla-release/toolkit/components/enterprisepolicies/WindowsGPOParser.jsm
    modified:   mozilla-release/toolkit/components/extensions/parent/ext-management.js
    modified:   mozilla-release/toolkit/components/normandy/content/AboutPages.jsm
    modified:   mozilla-release/toolkit/components/passwordmgr/LoginManagerParent.jsm
    modified:   mozilla-release/toolkit/components/places/History.jsm
    modified:   mozilla-release/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
    modified:   mozilla-release/toolkit/components/search/SearchService.jsm
    modified:   mozilla-release/toolkit/components/telemetry/app/TelemetryController.jsm
    modified:   mozilla-release/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
    modified:   mozilla-release/toolkit/components/url-classifier/SafeBrowsing.jsm
    modified:   mozilla-release/toolkit/components/urlformatter/URLFormatter.jsm
    modified:   mozilla-release/toolkit/content/aboutRights.js
    modified:   mozilla-release/toolkit/content/browser-content.js
    modified:   mozilla-release/toolkit/content/contentAreaUtils.js
    modified:   mozilla-release/toolkit/content/globalOverlay.js
    modified:   mozilla-release/toolkit/crashreporter/content/crashes.js
    modified:   mozilla-release/toolkit/modules/NewTabUtils.jsm
    modified:   mozilla-release/toolkit/modules/PrivateBrowsingUtils.jsm
    modified:   mozilla-release/toolkit/mozapps/extensions/AddonManager.jsm
    modified:   mozilla-release/toolkit/mozapps/extensions/content/aboutaddons.js
    modified:   mozilla-release/toolkit/mozapps/extensions/content/extensions.js
    modified:   mozilla-release/toolkit/mozapps/extensions/internal/AddonRepository.jsm
    modified:   mozilla-release/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
    modified:   mozilla-release/toolkit/mozapps/extensions/internal/XPIInstall.jsm
    modified:   mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm
    modified:   mozilla-release/toolkit/mozapps/update/UpdateService.jsm
    modified:   mozilla-release/toolkit/mozapps/update/UpdateTelemetry.jsm
    modified:   mozilla-release/toolkit/mozapps/update/content/history.js
    modified:   mozilla-release/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
        modified:   mozilla-release/browser/base/content/browser.js
    both modified:   mozilla-release/browser/locales/en-US/browser/customizeMode.ftl
    both modified:   mozilla-release/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
    both modified:   l10n/de/browser/browser/customizeMode.ftl
    both modified:   l10n/de/browser/browser/preferences/connection.ftl

    deleted by them: l10n/de/browser/chrome/browser/aboutPrivateBrowsing.dtd
      -> ./l10n/de/browser/browser/aboutPrivateBrowsing.ftl

    deleted by them: l10n/de/browser/chrome/browser/aboutTabCrashed.dtd
      -> ./l10n/de/browser/browser/aboutTabCrashed.ftl

    deleted by them: l10n/de/browser/chrome/browser/pageInfo.properties
      -> ./l10n/de/browser/browser/pageInfo.ftl

    deleted by them: l10n/de/browser/chrome/browser/preferences/security.dtd
      -> ./l10n/de/browser/browser/preferences/preferences.ftl

    deleted by them: l10n/de/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
      -> ./l10n/de/browser/browser/safebrowsing/blockedSite.ftl

    deleted by them: l10n/de/toolkit/chrome/global/aboutRights.dtd
      -> ./l10n/de/toolkit/toolkit/about/aboutRights.ftl

    deleted by them: l10n/de/toolkit/chrome/global/aboutTelemetry.properties
      -> ./l10n/de/toolkit/toolkit/about/aboutTelemetry.ftl

    deleted by them: l10n/de/toolkit/chrome/global/printPageSetup.dtd
      -> ./l10n/de/toolkit/toolkit/printing/printDialogs.ftl
    both modified:   mozilla-release/browser/components/enterprisepolicies/Policies.jsm
    both modified:   mozilla-release/browser/components/migration/FirefoxProfileMigrator.jsm
    both modified:   mozilla-release/browser/config/version_display.txt
    both modified:   mozilla-release/browser/installer/windows/nsis/stub.nsi
    both modified:   mozilla-release/browser/installer/windows/nsis/uninstaller.nsi
    both modified:   mozilla-release/toolkit/mozapps/installer/windows/nsis/common.nsh
    both modified:   mozilla-release/browser/installer/windows/nsis/installer.nsi
    both modified:   mozilla-release/browser/locales/en-US/browser/aboutPrivateBrowsing.ftl
    both modified:   l10n/de/browser/browser/preferences/preferences.ftl
    both modified: mozilla-release/browser/base/content/browser.xhtml
    deleted by them: mozilla-release/browser/base/content/browser.xul
      -> mozilla-release/browser/base/content/browser.xhtml
    modified: mozilla-release/browser/base/content/tabbrowser-tab.js
    modified: mozilla-release/browser/base/content/tabbrowser-tabs.js
    modified: mozilla-release/browser/base/jar.mn
    deleted by them: mozilla-release/browser/base/content/tabbrowser.xml
    modified: mozilla-release/browser/base/content/tabbrowser-tabs.js
    both modified: mozilla-release/browser/base/content/tabbrowser.js
    both modified:   l10n/de/browser/chrome/browser/tabbrowser.properties
    both modified:   mozilla-release/browser/components/enterprisepolicies/Policies.jsm
    both modified:   mozilla-release/browser/config/version_display.txt
    both modified:   mozilla-release/browser/themes/windows/browser.css
    modified:   l10n/de/browser/chrome/browser/tabbrowser.properties
    modified:   mozilla-release/browser/components/enterprisepolicies/Policies.jsm
    modified:   mozilla-release/browser/config/version_display.txt
    modified:   mozilla-release/browser/themes/windows/browser.css
@alver-cliqz alver-cliqz merged commit e2038d3 into master Aug 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants