Ms2ger
3813557cac
Merge m-i to b-s.
2013-02-28 14:46:10 +01:00
Ms2ger
5155aa92f0
Merge m-c to m-i on a CLOSED TREE.
2013-02-28 14:42:12 +01:00
Ed Morley
ab179550e6
Backed out changeset b01c5df06269 (bug 841717) for causing bug 846106 on a CLOSED TREE
2013-02-28 11:34:44 +00:00
Ms2ger
79c09cf500
Merge mozilla-central to build-system.
2013-02-28 12:11:53 +01:00
Ms2ger
7ecd3d917f
Merge services-central to m-c.
2013-02-28 12:08:14 +01:00
Ms2ger
8c8f28f373
Merge fx-team to m-c.
2013-02-28 12:06:24 +01:00
Gregory Szorc
89d297a677
Merge mozilla-central into build-system
...
The 3 merged files had no conflicts and were manually verified to ensure
no incompatible changes crept in.
2013-02-27 21:02:02 -08:00
Gregory Szorc
f0b7e3972c
Merge mozilla-central into build-system
...
There were merges in configure.in and some Makefile.in. None had any
conflicts. I spot verified the Makefile.in changes and confirmed that
the changes did not touch any DIRS* variables.
2013-02-27 10:03:52 -08:00
Tim Taubert
6a3107f903
Bug 727765 - part 2 - let Panorama use PageThumbs to draw screenshots to TabCanvases; r=jaws
2013-02-27 13:37:45 +01:00
Phil Ringnalda
9ebbdf1241
Merge m-c to fx-team
2013-02-26 14:32:37 -08:00
Ms2ger
cd9c6150fe
Merge m-c to b-s.
2013-02-26 19:09:25 +01:00
Gregory Szorc
758d7a8978
Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger
2013-02-25 12:47:18 -08:00
Ed Morley
a25a4df5d7
Merge mozilla-central to mozilla-inbound
2013-02-27 11:07:25 +00:00
Richard Newman
8ba9584d11
Bug 843980 - Switch tests to check for category entries, not service existence. r=mconnor
2013-02-22 08:15:53 -08:00
Tim Taubert
f680438fbc
Bug 829568 - part 1 followup - correct a little typo in a comment r=me DONTBUILD
2013-02-25 22:40:41 +01:00
Raymond Lee
6d14864b91
bug 839034 - move markPageAsXXX methods to nsINavHistoryService r=mak sr=gavin
2013-02-27 10:54:09 +08:00
Tim Taubert
e315738a73
merge m-c to fx-team
2013-02-20 15:37:23 +01:00
Tim Taubert
9b5781041b
Bug 830656 - Don't report errors when wipe() tries to remove non-existant session files; r=yoric
2013-02-19 19:34:25 +01:00
Tim Taubert
dc272234f3
Bug 842513 - Specify character sets for sample files and data URLs used in tests; r=felipe
2013-02-19 19:32:29 +01:00
Tim Taubert
b35b1aa0d9
merge m-c to fx-team
2013-02-19 10:39:49 +01:00
Tim Taubert
bc5d3cb377
Bug 829568 - part 3 - restore the initial session in case the user opens a non-private window; r=felipe
2013-02-18 18:57:48 +01:00
Tim Taubert
312ea44d70
Bug 829568 - part 2 - back up the initial session when starting up with a private window; r=felipe
2013-02-15 13:20:48 +01:00
Tim Taubert
2a93821a9c
Bug 829568 - part 1 - don't save (invalid) states without any windows; r=felipe
2013-02-15 12:28:00 +01:00
Matt Brubeck
29a03fb2d7
Bug 840287 - Move NewTabUtils.jsm into toolkit [r=ttaubert]
...
--HG--
rename : browser/modules/NewTabUtils.jsm => toolkit/modules/NewTabUtils.jsm
rename : browser/modules/test/unit/chromeappsstore.sqlite => toolkit/modules/tests/xpcshell/chromeappsstore.sqlite
rename : browser/modules/test/unit/test_newtab-migrate-v1.js => toolkit/modules/tests/xpcshell/test_newtab-migrate-v1.js
2013-02-16 20:16:16 -08:00
Matt Brubeck
72ace35626
Bug 811548 - Move PageThumbs.jsm from /browser to /toolkit
...
--HG--
rename : browser/components/thumbnails/BrowserPageThumbs.manifest => toolkit/components/thumbnails/BrowserPageThumbs.manifest
rename : browser/components/thumbnails/Makefile.in => toolkit/components/thumbnails/Makefile.in
rename : browser/components/thumbnails/PageThumbs.jsm => toolkit/components/thumbnails/PageThumbs.jsm
rename : browser/components/thumbnails/PageThumbsProtocol.js => toolkit/components/thumbnails/PageThumbsProtocol.js
rename : browser/components/thumbnails/PageThumbsWorker.js => toolkit/components/thumbnails/PageThumbsWorker.js
rename : browser/components/thumbnails/test/Makefile.in => toolkit/components/thumbnails/test/Makefile.in
rename : browser/components/thumbnails/test/background_red.html => toolkit/components/thumbnails/test/background_red.html
rename : browser/components/thumbnails/test/background_red_redirect.sjs => toolkit/components/thumbnails/test/background_red_redirect.sjs
rename : browser/components/thumbnails/test/browser_thumbnails_bug726727.js => toolkit/components/thumbnails/test/browser_thumbnails_bug726727.js
rename : browser/components/thumbnails/test/browser_thumbnails_capture.js => toolkit/components/thumbnails/test/browser_thumbnails_capture.js
rename : browser/components/thumbnails/test/browser_thumbnails_expiration.js => toolkit/components/thumbnails/test/browser_thumbnails_expiration.js
rename : browser/components/thumbnails/test/browser_thumbnails_privacy.js => toolkit/components/thumbnails/test/browser_thumbnails_privacy.js
rename : browser/components/thumbnails/test/browser_thumbnails_redirect.js => toolkit/components/thumbnails/test/browser_thumbnails_redirect.js
rename : browser/components/thumbnails/test/browser_thumbnails_storage.js => toolkit/components/thumbnails/test/browser_thumbnails_storage.js
rename : browser/components/thumbnails/test/browser_thumbnails_storage_migrate3.js => toolkit/components/thumbnails/test/browser_thumbnails_storage_migrate3.js
rename : browser/components/thumbnails/test/head.js => toolkit/components/thumbnails/test/head.js
rename : browser/components/thumbnails/test/privacy_cache_control.sjs => toolkit/components/thumbnails/test/privacy_cache_control.sjs
2013-02-16 20:15:41 -08:00
Dão Gottwald
040a6d6dc6
Bug 838713 - Skip slow-startup check if startup was interrupted. r=jaws
2013-02-20 00:15:38 +01:00
Marco Bonardo
e1e9b58bec
Bug 842577 - Remove from History is visible for a paused download.
...
r=mconley
2013-02-19 17:48:41 +01:00
Ryan VanderMeulen
360e368cab
Merge m-c to inbound.
2013-02-19 04:47:00 -05:00
Raymond Lee
25ac357a40
Another attempt at fixing bug 822284; r=ehsan
2013-02-07 18:16:04 +08:00
Christian Sonne
3b1cfaa71e
Bug 842185 - "Remove From History" doesn't work r=mak
2013-02-18 01:31:04 -08:00
Christian Sonne
1a0b7acc7e
Bug 816254 - Add logging to Downloads Panel r=mak
2013-02-15 17:34:18 -08:00
Josh Matthews
4faff0974a
Bug 843247 - Allow external links to be opened in private windows in perma-private mode. r=ehsan
2013-02-26 18:15:57 -05:00
Ehsan Akhgari
90f36ef27c
Bug 832325 - Finish the initialization of nsSessionStartup correctly if permanent PB is turned on; r=ttaubert
2013-02-23 01:45:37 -05:00
Ehsan Akhgari
68c70ad5f6
Bug 845063 - Remove the dummy global private browsing service; r=jdm
2013-02-25 17:57:28 -05:00
Ehsan Akhgari
364f71a1cc
Backed out changeset 30f7cbdcc2a1 (bug 845063) because of build bustage on a CLOSED TREE
2013-02-25 22:32:50 -05:00
Ehsan Akhgari
2d40efd622
Bug 845063 - Remove the dummy global private browsing service; r=jdm
...
--HG--
extra : rebase_source : 400d1240f8cb016d4183c64cab353a753b3fe74d
2013-02-25 17:57:28 -05:00
Gregory Szorc
3db370a7d6
Bug 840177 - Part 6: Record urlbar searches in Firefox Health Report; r=gavin
2013-02-14 14:47:49 -08:00
Gregory Szorc
a8d719ab59
Bug 840177 - Part 4: Record search bar searches in Firefox Health Report; r=gavin
2013-02-13 14:33:24 -08:00
Ryan VanderMeulen
b39cc7050b
Merge m-c to inbound.
2013-02-12 21:26:49 -05:00
Ryan VanderMeulen
cfb35019f6
Merge m-c to inbound.
2013-02-12 21:25:43 -05:00
Marco Bonardo
7ca87781f3
Bug 837117 (follow-up) - Downloaded items change position in the downloads view if Clear List is selected
...
r=mconley
2013-02-12 23:50:37 +01:00
Ryan VanderMeulen
b2815d5a41
Merge m-c to inbound.
2013-02-12 15:05:37 -05:00
Tim Taubert
43c911f3aa
merge m-c to fx-team
2013-02-12 19:08:06 +01:00
Sunny
13e0d9a6c5
Bug 689821 - Clean up browser/components/preferences/sync.js. r=rnewman
2013-02-12 15:16:32 -08:00
Tim Taubert
6ea9d683ea
Bug 239254 - [Linux] Migrate existing thumbnails to their new local path; r=yoric
2013-02-11 15:47:22 +01:00
Mike Conley
2da1d50e98
Bug 839054 - Both "Open Containing Folder" and "Show in Finder" were being used in the Downloads Panel on OSX. r=mak.
2013-02-12 11:33:49 -05:00
Ryan VanderMeulen
2861e3219f
Merge m-c to inbound.
2013-02-11 13:51:32 -05:00
Mike Hommey
640e79f848
Bug 755724 - Move browser application in a subdirectory. r=jimm
2013-02-11 14:10:16 +01:00
Florian Quèze
a18ca35008
Bug 838552 - nsSessionStartup.js' debug code is noisy, r=Yoric.
2013-02-10 23:08:32 +01:00
Jim Mathies
472c77a798
Bug 839793 - TelemetryTimestamps.jsm imported using the wrong path. r=glandium
2013-02-09 12:28:38 -06:00
