Opened on 04/20/2015 at 09:45:04 AM
Closed on 05/07/2015 at 08:16:12 PM
Last modified on 06/30/2015 at 09:33:59 AM
#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.
Attachments (0)
Change History (10)
comment:1 Changed on 04/21/2015 at 09:11:14 AM by fhd
- Keywords 2015q2 added
comment:2 Changed on 04/28/2015 at 11:23:53 AM by rjeschke
comment:3 Changed on 04/28/2015 at 01:16:02 PM 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 on 05/06/2015 at 07:28:14 AM by fhd
- Owner set to fhd
comment:5 Changed on 05/06/2015 at 07:29:24 AM by fhd
- Milestone set to Flux-next
comment:6 Changed on 05/07/2015 at 09:43:39 AM 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 on 05/07/2015 at 08:16:12 PM 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 on 05/20/2015 at 09:00:48 AM by fhd
- Sensitive unset
comment:9 Changed on 05/22/2015 at 09:39:28 PM by fhd
comment:10 Changed on 06/30/2015 at 09:33:59 AM by philll
- Platform changed from Android to Adblock Browser for Android
See #2673
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.