Merge lp://staging/~chrisccoulson/ubufox/ff-4.0 into lp://staging/~asac/ubufox/main
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~chrisccoulson/ubufox/ff-4.0 |
| Merge into: | lp://staging/~asac/ubufox/main |
| Diff against target: |
1712 lines (+502/-433) 40 files modified
chrome.manifest (+4/-3) components/aboutStartpage.js (+8/-5) content/overlay.js (+0/-91) content/pluginInstallerDatasource.js (+35/-23) content/pluginInstallerService.js (+301/-59) content/pluginInstallerWizard.js (+106/-100) content/pluginInstallerWizard.xul (+3/-3) content/ubuntuAddonsOverlay.ffox2.xul (+0/-53) content/ubuntuAddonsOverlay.xul (+0/-53) content/updateRestart.js (+11/-14) defaults/preferences/ubufox-pfs.js (+1/-1) install.rdf (+3/-2) locale/af-ZA/ubufox.properties (+1/-1) locale/ar/ubufox.properties (+1/-1) locale/bg/ubufox.properties (+1/-1) locale/ca/ubufox.properties (+1/-1) locale/cs-CZ/ubufox.properties (+1/-1) locale/de-DE/ubufox.properties (+1/-1) locale/el-GR/ubufox.properties (+1/-1) locale/en-US/ubufox.properties (+1/-1) locale/es/ubufox.properties (+1/-1) locale/eu/ubufox.properties (+1/-1) locale/fi-FI/ubufox.properties (+1/-1) locale/fr/ubufox.properties (+1/-1) locale/gl-ES/ubufox.properties (+1/-1) locale/hu-HU/ubufox.properties (+1/-1) locale/it-IT/ubufox.properties (+1/-1) locale/ja/ubufox.properties (+1/-1) locale/lt-LT/ubufox.properties (+1/-1) locale/nl-NL/ubufox.properties (+1/-1) locale/pl-PL/ubufox.properties (+1/-1) locale/pt-BR/ubufox.properties (+1/-1) locale/ro/ubufox.properties (+1/-1) locale/ru-RU/ubufox.properties (+1/-1) locale/sl-SI/ubufox.properties (+1/-1) locale/sv-SE/ubufox.properties (+1/-1) locale/uk/ubufox.properties (+1/-1) locale/zh-CN/ubufox.properties (+1/-1) pfs/db/sources.list.10.10 (+2/-0) pfs/db/sources.list.11.04 (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~chrisccoulson/ubufox/ff-4.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexander Sack | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 224. By Chris Coulson
-
* Get the distributionID field for the pfs URL from the preferences, rather than hard-coding a value
- 223. By Chris Coulson
-
* Specify for the extension to be unpacked by the installer. Without this, the prefs aren't used
- 222. By Chris Coulson
-
* Ensure that licenseAccepted is always defind, so we don't fail to install a plugin that has no licenseURL
- 221. By Chris Coulson
-
* Make createPluginSet
GroupBox work properly
* Fix a typo
* Fix use of the aptPlugins array - 220. By Chris Coulson
-
* Add sources.list for 10.10 and 11.04
* Ensure the wizard jumps to the last page when no plugins are found, by not checking the undefined mPluginInfoAptArrayLength
* Fix a missing-brace error - 219. By Chris Coulson
-
* Drop the AddonsOverlay and associated code, this hasn't worked for several releases
since we started using software-center, and nobody really noticed so far. We can reimplement this at a later date if wanted, but
it throws JS exceptions when loading in FF4.0 now - 218. By Chris Coulson
-
* Merge the plugin finder code from Firefox 4. This now uses AddonManager, so the
MinVersion needs to be bumped
* Drop the FF2.0 specific code - 217. By Chris Coulson
-
* Look in the new location for the restart-required trigger, it has moved to a location not monitored by update-notifier now, so we only get the restart required notification in the browser
- 216. By Chris Coulson
-
* In the restart notifier, don't hardcode a list of filenames for different browser versions, but just use MOZ_APP_LAUNCHER instead. This will indirectly fix LP: #511250 and should prevent it from happening again
- update content/updateRestart. js - 215. By Chris Coulson
-
* First cut at adding Firefox 4.0 support:
- Rename AboutHome to AboutStartup, and have it handle about:startup now (to not conflict with the new about:home handler in Firefox
- Set default home page to about:startpage
- Add support for the XPCOM changes in Gecko 2.0
