This repository has been archived by the owner. It is now read-only.
Commits on Aug 2, 2018
-
Merge branch 'firefox-releases' into firefox-merge-v12
# Conflicts: # Cartfile # Cartfile.resolved # Client.xcodeproj/project.pbxproj # Client/Application/AdjustIntegration.swift # Client/Application/AppDelegate.swift # Client/Application/LeanplumIntegration.swift # Client/Assets/About/Licenses.html # Client/Assets/Images.xcassets/defaultFavicon.imageset/newtab-icon.png # Client/Assets/Images.xcassets/defaultFavicon.imageset/newtab-icon@2x.png # Client/Assets/Images.xcassets/defaultFavicon.imageset/newtab-icon@3x.png # Client/Assets/MainFrameAtDocumentEnd.js # Client/Assets/MainFrameAtDocumentStart.js # Client/Frontend/Browser/BrowserViewController.swift # Client/Frontend/Browser/Tab.swift # Client/Frontend/Browser/TopTabsViews.swift # Client/Frontend/Browser/URLBarView.swift # Client/Frontend/Settings/AppSettingsOptions.swift # Client/Frontend/Settings/ClearPrivateDataTableViewController.swift # Client/Frontend/UIConstants.swift # Client/Info.plist # Client/Telemetry/UnifiedTelemetry.swift # Extensions/NotificationService/Info.plist # Extensions/SendTo/Info.plist # Extensions/ShareTo/Info.plist # Extensions/ShareTo/ShareViewController.swift # Extensions/Today/Info.plist # Extensions/ViewLater/Info.plist # README.md # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/BuddyBuildSDK # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/Headers/BuddyBuildSDK.h # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/build.num # ThirdParty/Leanplum/Leanplum.framework/Headers/LPInbox.h # ThirdParty/Leanplum/Leanplum.framework/Headers/Leanplum.h # ThirdParty/Leanplum/Leanplum.framework/Info.plist # ThirdParty/Leanplum/Leanplum.framework/Modules/module.modulemap # shipping_locales.txt
Commits on Aug 1, 2018
Commits on Jul 27, 2018
-
Replace
upload_symbols_to_sentry(...)with `sentry_upload_dsym(...)……` as the first one is deprecated
Commits on Jul 26, 2018
Commits on Jul 20, 2018
Commits on Jul 19, 2018
Commits on Jul 13, 2018
Commits on Jun 20, 2018
Commits on May 15, 2018
-
-
Merge branch 'firefox-releases' into firefox-merge-v11
# Conflicts: # Cartfile # Cartfile.resolved # Client.xcodeproj/project.pbxproj # Client.xcodeproj/xcshareddata/xcschemes/Firefox.xcscheme # Client.xcodeproj/xcshareddata/xcschemes/FirefoxBeta.xcscheme # Client/Application/AppDelegate.swift # Client/Application/LeanplumIntegration.swift # Client/Assets/MainFrameAtDocumentEnd.js # Client/Assets/MainFrameAtDocumentStart.js # Client/Frontend/Browser/BrowserViewController.swift # Client/Frontend/Browser/TabLocationView.swift # Client/Info.plist # Extensions/NotificationService/Info.plist # Extensions/SendTo/Info.plist # Extensions/ShareTo/Info.plist # Extensions/Today/Info.plist # Extensions/ViewLater/Info.plist # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/BuddyBuildSDK # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/Headers/BuddyBuildSDK.h # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/build.num # ThirdParty/Leanplum/Leanplum.framework/Headers/LPInbox.h # ThirdParty/Leanplum/Leanplum.framework/Headers/Leanplum.h # ThirdParty/Leanplum/Leanplum.framework/Info.plist # ThirdParty/Leanplum/Leanplum.framework/Leanplum # ThirdParty/Leanplum/Leanplum.framework/Modules/module.modulemap # fastlane/actions/import_build_tools.rb # package.json
-