Commit Graph

951 Commits

Author SHA1 Message Date
Robert Strong
3488e8d0ed Move channel-prefs.js back to original location - Bug 756325 - channel-prefs.js appears in new 'preferences' location on fresh installation but remains in 'pref' for updated existing installation. r=bbondy 2012-05-30 15:17:54 -07:00
Ed Morley
8f3214576b Merge mozilla-central to mozilla-inbound 2012-05-30 18:24:56 +01:00
Jim Mathies
2f9fb6b070 Bug 740721 - (re)enable simple gesture zoom support on Windows in Firefox. Fixes touch input display problems on Win7 and Win8. r=dao 2012-05-30 08:23:07 -05:00
Gervase Markham
638c878b13 Bug 759095 - upgrade license to MPL 2, and other licensing cleanups.
--HG--
extra : rebase_source : da55a4937383eda2baf7c9a362501da8ee664146
2012-05-29 16:52:43 +01:00
Wes Kocher
759dc45537 Bug 752161 - Plugin check pref set to mozilla.com instead of mozilla.org causing a useless redirect and making it vulnerable to redirects in mozilla.com r=gavin 2012-05-30 01:12:09 -05:00
Steven Michaud
408c10d28d Bug 759364 - Run the Silverlight plugin OOP in 32-bit mode on OS X. r=josh 2012-05-29 17:34:34 -05:00
Brian R. Bondy
c0011e85da Bug 758206 - Telemetry for preload/prefetch. r=taras 2012-05-27 22:40:49 -04:00
Brian R. Bondy
3a3bed30cd Bug 727864 - Enable DLL preloading when MozillaMaintenance service disabled prefetch. r=jimm 2012-05-27 22:40:48 -04:00
Matthew Noorenberghe
574960425a Bug 732303 - Redesign safe mode dialog with the profile reset option. r=dolske, ui-r=limi
--HG--
extra : rebase_source : de3907b72625eee1ae897b8991aaeebf38f97480
2012-03-09 15:21:03 -08:00
Ryan VanderMeulen
6ec2b1b725 Merge m-c to inbound 2012-05-26 09:33:46 -04:00
ffxbld
e7ba0548fb Automated blocklist update from host linux-ix-slave26 2012-05-26 03:07:25 -07:00
Ben Hearsum
777922671d bug 723176: support mac dmg signing in the build system - turn on signing of mac builds again. r=ted
--HG--
extra : rebase_source : 7aa71b8b31f975411b491966e859df15b8d9071f
2012-05-25 09:25:07 -04:00
Ed Morley
984de288d8 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-05-25 14:25:53 +01:00
Jim Mathies
20eb979e64 Bug 750911 - Add a third 'flags' parameter to XRE_main and add support for WindowsEnvironmentType. r=bsmedberg 2012-05-25 05:01:29 -05:00
Ed Morley
bffc23481f Merge mozilla-central to mozilla-inbound 2012-05-25 22:44:48 +01:00
Ehsan Akhgari
9373d339ec Bug 758101 - Re-enable background updates on mozilla-central; r=rstrong
--HG--
extra : rebase_source : 30c936bd2d5a52c4a4070becf425394d75db92ec
2012-05-23 23:49:48 -04:00
Ryan VanderMeulen
9cc3b4b17b Merge m-c to inbound 2012-05-23 22:39:33 -04:00
Ben Hearsum
bebaefa5bc Backout all patches from bug 723176, because we still have problems with our CodeResources file. 2012-05-23 22:30:25 -04:00
Ben Hearsum
97420f6967 bug 723176: support mac dmg signing in the build system - don't sign removed-files. r=ted 2012-05-23 20:27:09 -04:00
Ehsan Akhgari
d9928845f5 Bug 757971 - Pref off background updates until all of the known issues with it are resolved; r=rstrong
Landing on a CLOSED TREE
2012-05-23 16:00:01 -04:00
Ben Hearsum
b9fd76da85 bug 723176: support mac dmg signing in the build system. r=khuey/ted 2012-05-22 17:13:26 -04:00
Ehsan Akhgari
904efc4f7a Bug 307181 - Stage Firefox updates in the background after they're downloaded, and replace the application directory on restart; r=rstrong,bbondy
When Firefox downloads an update, it previously kept the update around to apply
it on the next restart.  This patch changes this so that the updater program
is launched in the background as soon as the update has finished downloading
in order to stage the updated version of the application by copying the
existing installation directory to a temporary location and applying the update
on top of it, and replace the existing installation directory with the staged
directory on the next restart.

Because the replacing step is typically very fast, this patch eliminates the
wait for the update to be applied on restart, making it unnecessary to show a
progress dialog when restarting.

--HG--
rename : toolkit/mozapps/update/test/chrome/test_0092_finishedBackground.xul => toolkit/mozapps/update/test/chrome/test_0093_stagedBackground.xul
rename : toolkit/mozapps/update/test/unit/test_0110_general.js => toolkit/mozapps/update/test/unit/test_0113_general.js
rename : toolkit/mozapps/update/test/unit/test_0111_general.js => toolkit/mozapps/update/test/unit/test_0114_general.js
rename : toolkit/mozapps/update/test/unit/test_0112_general.js => toolkit/mozapps/update/test/unit/test_0115_general.js
rename : toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js
rename : toolkit/mozapps/update/test/unit/test_0110_general.js => toolkit/mozapps/update/test_svc/unit/test_0113_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0111_general.js => toolkit/mozapps/update/test_svc/unit/test_0114_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0112_general.js => toolkit/mozapps/update/test_svc/unit/test_0115_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test_svc/unit/test_0172_fileLocked_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js => toolkit/mozapps/update/test_svc/unit/test_0173_fileLocked_xp_win_partial_svc.js
2012-05-22 10:50:04 -04:00
Ryan VanderMeulen
d5bfe2c3ca Merge m-c to inbound 2012-05-23 20:56:31 -04:00
Dão Gottwald
49678f9e2d Bug 755646 - Hide UI for toggling tabs on top unless the user disabled tabs on top. r=dolske 2012-05-24 02:03:56 +02:00
Ehsan Akhgari
375277f4b6 Merge mozilla-central into mozilla-inbound on a CLOSED TREE 2012-05-23 17:31:12 -04:00
Dave Townsend
8bbbe24fb5 Bug 740795 part A - file moves for pdf.js not being shipped as an extension, r=bsmedberg
--HG--
rename : browser/app/profile/extensions/uriloader@pdf.js/LICENSE => browser/extensions/pdfjs/LICENSE
rename : browser/app/profile/extensions/uriloader@pdf.js/README.mozilla => browser/extensions/pdfjs/README.mozilla
rename : browser/app/profile/extensions/uriloader@pdf.js/bootstrap.js => browser/extensions/pdfjs/bootstrap.js
rename : browser/app/profile/extensions/uriloader@pdf.js/components/PdfStreamConverter.js => browser/extensions/pdfjs/components/PdfStreamConverter.js
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/debugger.js => browser/extensions/pdfjs/content/web/debugger.js
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/bookmark.svg => browser/extensions/pdfjs/content/web/images/bookmark.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/check.svg => browser/extensions/pdfjs/content/web/images/check.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/comment.svg => browser/extensions/pdfjs/content/web/images/comment.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/document-print.svg => browser/extensions/pdfjs/content/web/images/document-print.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/download.svg => browser/extensions/pdfjs/content/web/images/download.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-down.svg => browser/extensions/pdfjs/content/web/images/go-down.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-up.svg => browser/extensions/pdfjs/content/web/images/go-up.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/loading-icon.gif => browser/extensions/pdfjs/content/web/images/loading-icon.gif
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-outline.svg => browser/extensions/pdfjs/content/web/images/nav-outline.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-thumbs.svg => browser/extensions/pdfjs/content/web/images/nav-thumbs.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-down.svg => browser/extensions/pdfjs/content/web/images/pin-down.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-up.svg => browser/extensions/pdfjs/content/web/images/pin-up.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-in.svg => browser/extensions/pdfjs/content/web/images/zoom-in.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-out.svg => browser/extensions/pdfjs/content/web/images/zoom-out.svg
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer-snippet-firefox-extension.html => browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.css => browser/extensions/pdfjs/content/web/viewer.css
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.html => browser/extensions/pdfjs/content/web/viewer.html
rename : browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.js => browser/extensions/pdfjs/content/web/viewer.js
rename : browser/app/profile/extensions/uriloader@pdf.js/extension-files => browser/extensions/pdfjs/extension-files
rename : browser/app/profile/extensions/uriloader@pdf.js/icon.png => browser/extensions/pdfjs/icon.png
rename : browser/app/profile/extensions/uriloader@pdf.js/icon64.png => browser/extensions/pdfjs/icon64.png
rename : browser/app/profile/extensions/uriloader@pdf.js/install.rdf.in => browser/extensions/pdfjs/install.rdf.in
rename : browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in => browser/extensions/pdfjs/test/Makefile.in
rename : browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js => browser/extensions/pdfjs/test/browser_pdfjs_main.js
rename : browser/app/profile/extensions/uriloader@pdf.js/test/file_pdfjs_test.pdf => browser/extensions/pdfjs/test/file_pdfjs_test.pdf
extra : rebase_source : c23010d45ed5b5295f0de773084a156a3bf6caec
2012-05-18 12:42:01 -04:00
Tim Taubert
abe97c25ea merge m-c to fx-team 2012-05-22 15:20:39 +02:00
Gavin Sharp
7b2a45fdee Fix comment that wasn't updated by bug 693743's patch, r=Unfocused 2012-05-21 15:58:02 -07:00
Panos Astithas
2fc9edc412 Bug 756513 - Enable the script debugger by default; r=rcampbell 2012-05-22 09:30:03 +03:00
Gervase Markham
87620f5676 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
ffxbld
6b6c2446b4 Automated blocklist update from host linux-ix-slave25 2012-05-19 03:11:52 -07:00
Ryan VanderMeulen
01192035ee Merge m-c to inbound. 2012-05-22 20:21:39 -04:00
Gavin Sharp
5c25679f90 Bug 748389: consolidate Mac bundle identifier logic in configure, and use it to specify the Mac bundle ID of the installing app in installed web apps' bundles, r=ted, r=felipe
--HG--
extra : rebase_source : d47a29e43114bcd315b09320d5f46fa0f8c8786b
2012-04-29 16:00:12 -04:00
Gavin Sharp
54dee51b33 Bug 748389: add buildID to the CFBundleVersion field in our Info.plist so that Mac OS X can differentiate different Firefox builds when launching webapprt, r=ted, r=felipe, r=dwalkowski, feedback=smichaud
--HG--
extra : rebase_source : 18b69376038f71d6464b7b754d1dc9c65ac9a925
2012-04-26 13:46:29 -04:00
ffxbld
fc4f9ba287 Automated blocklist update from host linux-ix-slave26 2012-05-12 03:12:49 -07:00
Paul Rouget
7ee342d6dc Bug 724509 - Add an Option menu in the Inspector Toolbar. r=dao r=dcamp 2012-05-11 16:54:47 +02:00
Joe Walker
d564306c56 Bug 720641 - Integrate GCLI into developer tools global toolbar; r=dcamp,dão,robcee,zpao
--HG--
rename : browser/devtools/webconsole/test/browser_gcli_break.html => browser/devtools/shared/test/browser_gcli_break.html
rename : browser/devtools/webconsole/test/browser_gcli_commands.js => browser/devtools/shared/test/browser_gcli_commands.js
rename : browser/devtools/webconsole/test/browser_gcli_inspect.html => browser/devtools/shared/test/browser_gcli_inspect.html
rename : browser/devtools/webconsole/test/browser_gcli_inspect.js => browser/devtools/shared/test/browser_gcli_inspect.js
rename : browser/devtools/webconsole/test/browser_gcli_integrate.js => browser/devtools/shared/test/browser_gcli_integrate.js
rename : browser/devtools/webconsole/test/browser_gcli_require.js => browser/devtools/shared/test/browser_gcli_require.js
rename : browser/devtools/webconsole/test/browser_gcli_web.js => browser/devtools/shared/test/browser_gcli_web.js
2012-05-10 18:33:54 +01:00
Devan Sayles
b6caf044a2 Bug 735471 - Add a pref to switch between window'd preferences and in-content preferences. r=jaws,bmcbride 2012-05-08 19:31:51 -07:00
Chris Pearce
9b6d83ea59 Bug 716107 part 6 - Add UI to approve DOM fullscreen entry. r=dao 2012-05-09 09:47:19 +12:00
Victor Porof
1b9d795461 Bug 748927 - Add UI elements for the remote debugging case: starting a server and selecting the server to connect to; r=past 2012-04-27 17:18:02 -04:00
Ms2ger
54e6c80889 No bug - Add a missing 'let' to testpilot's setup.js. 2012-05-05 11:00:06 +02:00
Ehsan Akhgari
9cfb53c03f Merge mozilla-central into mozilla-inbound 2012-05-04 16:29:42 -04:00
Tim Taubert
4bb364b015 merge m-c to fx-team 2012-05-04 16:20:36 +02:00
Dão Gottwald
3bc0ffc98e Bug 748385 - Remove browser.identity.ssl_domain_display. r=mano 2012-05-04 20:37:20 +02:00
Joey Armstrong
844ee8d341 Bug 739710 - Makefile.in edits to use mkdir_deps function: file batch #2. r=ted 2012-05-03 06:22:33 -04:00
Victor Porof
be9fcb410b Bug 741324 - Make it possible to start a debugger in a new firefox instance; r=past,paul,rcampbell 2012-04-12 18:47:56 +03:00
Ehsan Akhgari
1c4c90c1ae Merge backout; a=me 2012-05-02 16:22:51 -04:00
Ehsan Akhgari
eca4125e02 Backout the merge from fx-team because of Ts regressions (no bug)
This is the backed out range:
http://hg.mozilla.org/mozilla-central/pushloghtml?changeset=a974c45914eb
2012-05-02 16:20:02 -04:00
Victor Porof
5d75527e5b Bug 741324 - Make it possible to start a debugger in a new firefox instance; r=past,rcampbell,zpao 2012-04-12 18:47:56 +03:00
Joe Walker
2831a551ce Bug 720641 - Integrate GCLI into developer tools global toolbar; r=dcamp,dão,robcee,zpao
--HG--
rename : browser/devtools/webconsole/test/browser_gcli_break.html => browser/devtools/shared/test/browser_gcli_break.html
rename : browser/devtools/webconsole/test/browser_gcli_commands.js => browser/devtools/shared/test/browser_gcli_commands.js
rename : browser/devtools/webconsole/test/browser_gcli_inspect.html => browser/devtools/shared/test/browser_gcli_inspect.html
rename : browser/devtools/webconsole/test/browser_gcli_inspect.js => browser/devtools/shared/test/browser_gcli_inspect.js
rename : browser/devtools/webconsole/test/browser_gcli_integrate.js => browser/devtools/shared/test/browser_gcli_integrate.js
rename : browser/devtools/webconsole/test/browser_gcli_require.js => browser/devtools/shared/test/browser_gcli_require.js
rename : browser/devtools/webconsole/test/browser_gcli_web.js => browser/devtools/shared/test/browser_gcli_web.js
2012-04-25 10:12:06 +01:00