Opened 5 years ago

Closed 5 years ago

Last modified 4 years ago

#2352 closed change (fixed)

Merge upstream changes from FENNEC_37_0_2_RELEASE

Reported by: fhd Assignee: fhd
Priority: P2 Milestone: Adblock-Browser-for-Android-beta-1.0.0.2015052021
Module: Adblock-Browser-for-Android Keywords: 2015q2
Cc: Blocked By:
Blocking: Platform: Adblock Browser for Android
Ready: yes Confidential: no
Tester: Verified working: no
Review URL(s):

Description (last modified by fhd)

Background

Adblock Browser is currently based on Firefox for Android 34 beta. We need to keep up with upstream, so we should update to Firefox for Android 37.0.2, the current release.

There have been 33260 commits between our current version and the next one, so it's beyond reason to list the changes.

What to change

Merge all changes from the FENNEC_37_0_2_RELEASE tag into adblockbrowser.

Change History (10)

comment:1 Changed 5 years ago by fhd

  • Keywords 2015q2 added

comment:2 Changed 5 years ago by rjeschke

Because of https://bugzilla.mozilla.org/show_bug.cgi?id=1076439 we should switch directly to Firefox/35:

curl -ILA "Mozilla/5.0 (Android; Mobile; rv:34.0) Gecko/34.0 Firefox/34.0" https://plus.google.com/communities/103349576921336760265 -> 404

curl -ILA "Mozilla/5.0 (Android; Mobile; rv:35.0) Gecko/35.0 Firefox/35.0" https://plus.google.com/communities/103349576921336760265 -> 200

Otherwise our users won't be able to view G+ communities from inside Adblock Browser.

comment:3 Changed 5 years ago by fhd

  • Description modified (diff)
  • Summary changed from Update to Firefox 34 release to Update to Firefox 35 release

Yup, we need to go for 35.

comment:4 Changed 5 years ago by fhd

  • Owner set to fhd

comment:5 Changed 5 years ago by fhd

  • Milestone set to Flux-next

comment:6 Changed 5 years ago by fhd

  • Description modified (diff)
  • Summary changed from Update to Firefox 35 release to Merge upstream changes from FENNEC_37_0_2_RELEASE

comment:7 Changed 5 years ago by fhd

  • Resolution set to fixed
  • Status changed from new to closed

Done. Major conflicts where around preferences and the updater. Unfortunately I couldn't really put my changes there up for review (was a massive diff I couldn't manage to upload to Rietveld), but they were actually quite minimal.

comment:8 Changed 5 years ago by fhd

  • Sensitive unset

comment:10 Changed 4 years ago by philll

  • Platform changed from Android to Adblock Browser for Android

See #2673

Note: See TracTickets for help on using tickets.