Gregory Szorc
56a7634c1c
Merge mozilla-central into build-system
2013-03-13 08:20:09 -07:00
Ed Morley
8fdd610fb0
Bug 736036 - Disable several intermittent Panorama tests since it is going away soon so they won't be fixed
2013-03-13 10:54:34 +00:00
Gregory Szorc
3d694a85c0
Merge mozilla-central into build-system
...
dom/interfaces/svg/Makefile.in and dom/media/Makefile.in had merge
conflicts. They were resolved by hand. The former needed 2 IDLs removed.
The latter had a context conflict for EXPORTS_NAMESPACES.
2013-03-12 13:04:55 -07:00
Mike Shal
ec5b39bd8b
Bug 818246 - Part 9: Move XPIDL_FLAGS to moz.build; r=gps
2013-03-11 22:05:00 -07:00
Mike Shal
2eb7c496cb
Bug 818246 - Part 7: Move XPIDL_MODULE to moz.build; rs=gps
2013-03-11 22:00:00 -07:00
Gregory Szorc
0d33ac5f93
Bug 818246 - Part 5: Move XPIDLSRCS into moz.build (manual); r=glandium
2013-03-12 10:20:41 -07:00
Gregory Szorc
629b5d86c6
Bug 818246 - Part 4: Move XPIDLSRCS into moz.build (auto); rs=glandium
...
This is the result of running
|mach mozbuild-migrate --list XPIDLSRCS SDK_XPIDLSRCS XPIDL_SOURCES| and
reverting xpcom/sample/*.
2013-03-12 10:17:46 -07:00
Gabriele Svelto
c085a1a3ec
Bug 689256 - Record invalid PROCESS_CREATION timestamps and adjust tests to cope with them. r=glandium
2013-03-08 12:37:16 +01:00
Matthew Noorenberghe
085f2473e2
Bug 848943 - Wait for popupshown to know when the context menu is ready. r=gavin
2013-03-12 08:38:42 -04:00
Gregory Szorc
795c5eeeff
Bug 818246 - Part 1: Remove unncessary definitions of XPIDL_MODULE; r=glandium
...
XPIDL_MODULE defaults to MODULE. These Makefile.in were setting
XPIDL_MODULE to the same value as MODULE.
--HG--
extra : rebase_source : e96bd34d5949d0ab94cecbec35d6c9f4bffec01e
2013-03-07 05:03:51 -08:00
Josh Matthews
5abfef8e64
Bug 842290 - Make privacy preference tab always check for permanent private browsing status changing, regardless of whether pref changes apply instantly. r=ehsan
2013-03-06 09:51:00 -05:00
Ryan VanderMeulen
1ce4fb8a84
Backed out changeset f856bcb5097f (bug 689256) for xpcshell orange on a CLOSED TREE.
2013-03-06 14:37:34 -05:00
Gabriele Svelto
994415fc7b
Bug 689256 - Record invalid PROCESS_CREATION timestamps and adjust tests to cope with them. r=glandium
2013-03-05 18:24:21 +01:00
Asaf Romano
4524be9c4a
Bug 842553 - Double clicking an in-progress download in the Library opens its containing folder. r=mak
2013-03-06 11:43:28 +02:00
Monica Chew
61e68439b7
Bug 841212 - Add 'Allow first party only' to permissions.js. r=margaret
2013-03-11 20:24:52 -04:00
Seth Fowler
ac9bcbd55d
Bug 846132 - (Part 2) Update CopyFrame callers to use GetFrame. r=jdm
2013-03-05 15:39:48 -08:00
Phil Ringnalda
757c265563
No bug, remove trailing whitespace to trigger builds on a CLOSED TREE
2013-03-04 21:44:53 -08:00
Josh Matthews
aee38f2b86
Bug 844671 - Only sync remote tabs to non-private windows. r=rnewman
2013-03-01 09:14:49 -05:00
Trevor Saunders
c40af5bf91
bug 407956 - make nsITreeView not take a nsISupportsArray* r=neil, bz sr=neil
2013-01-06 19:54:42 -05:00
Henri Sivonen
26f5277020
Bug 846221 - Make the pref UI explain intl.charset.default better. r=gavin.
2013-03-01 10:05:58 +02:00
Ms2ger
c6832bb745
Merge m-i to b-s.
2013-02-28 14:46:10 +01:00
Ms2ger
c512245107
Merge m-c to m-i on a CLOSED TREE.
2013-02-28 14:42:12 +01:00
Ed Morley
e9e48c1faa
Backed out changeset b01c5df06269 (bug 841717) for causing bug 846106 on a CLOSED TREE
2013-02-28 11:34:44 +00:00
Ms2ger
1d54d70126
Merge mozilla-central to build-system.
2013-02-28 12:11:53 +01:00
Ms2ger
578cb797a7
Merge services-central to m-c.
2013-02-28 12:08:14 +01:00
Ms2ger
870cfccf07
Merge fx-team to m-c.
2013-02-28 12:06:24 +01:00
Gregory Szorc
27c42e83c6
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
803629b9c6
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
01b9631cb4
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
daff3c84fb
Merge m-c to fx-team
2013-02-26 14:32:37 -08:00
Ms2ger
2801c25ab8
Merge m-c to b-s.
2013-02-26 19:09:25 +01:00
Gregory Szorc
8f9112102d
Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger
2013-02-25 12:47:18 -08:00
Ed Morley
6e6164088a
Merge mozilla-central to mozilla-inbound
2013-02-27 11:07:25 +00:00
Richard Newman
b7df436719
Bug 843980 - Switch tests to check for category entries, not service existence. r=mconnor
2013-02-22 08:15:53 -08:00
Tim Taubert
cfb9ef62bb
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
8c95503498
bug 839034 - move markPageAsXXX methods to nsINavHistoryService r=mak sr=gavin
2013-02-27 10:54:09 +08:00
Tim Taubert
0ea597520b
merge m-c to fx-team
2013-02-20 15:37:23 +01:00
Tim Taubert
3bbb3dbc16
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
b9b04bd0ce
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
5fd3369425
merge m-c to fx-team
2013-02-19 10:39:49 +01:00
Tim Taubert
e68d5f3063
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
35784e5146
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
00aaabad70
Bug 829568 - part 1 - don't save (invalid) states without any windows; r=felipe
2013-02-15 12:28:00 +01:00
Matt Brubeck
bb9d091338
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
ee84cf85ff
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
73e279724e
Bug 838713 - Skip slow-startup check if startup was interrupted. r=jaws
2013-02-20 00:15:38 +01:00
Marco Bonardo
60046ba02f
Bug 842577 - Remove from History is visible for a paused download.
...
r=mconley
2013-02-19 17:48:41 +01:00
Ryan VanderMeulen
84f6ba835d
Merge m-c to inbound.
2013-02-19 04:47:00 -05:00
Raymond Lee
35a3afd020
Another attempt at fixing bug 822284; r=ehsan
2013-02-07 18:16:04 +08:00
Christian Sonne
e6c8a2167a
Bug 842185 - "Remove From History" doesn't work r=mak
2013-02-18 01:31:04 -08:00