Mike de Boer
a4498570d0
Bug 866104 - Wait for both engines to load. r=gavin
2013-05-10 12:24:51 +02:00
Ed Morley
ef42cc346d
Merge mozilla-central and inbound
2013-05-13 12:55:17 +01:00
Ed Morley
ce3fdf2758
Backed out changeset 2d5c2f191920 (bug 863445) for breaking Android Nightlies
...
--HG--
rename : mobile/android/base/fennec-ids-generator.py => build/mobile/robocop/parse_ids.py
2013-05-13 12:31:39 +01:00
Ed Morley
bcdd00043e
Backed out changeset dac51812454a (bug 863445)
2013-05-13 12:31:10 +01:00
Ed Morley
6ebadded6f
Merge mozilla-central and inbound
2013-05-13 10:22:42 +01:00
Ed Morley
2710e5d6a9
Backed out changeset 496846474ed3 (bug 864774)
2013-05-13 10:05:49 +01:00
Nick Alexander
298ff2d2c5
Merge mozilla-central into services-central.
2013-05-12 16:19:27 -07:00
L. David Baron
244d007fec
Merge mozilla-inbound and mozilla-central.
...
(The mozilla-central side of the merge is entirely a merge from fx-team into mozilla-central.)
2013-05-11 22:00:23 -07:00
Nick Alexander
b96eb5d3c3
Bug 863445 - Part 3: Make build/mobile/robocop/Makefile.in produce robocop-debug-signed.apk. r=jmaher
...
Also makes the developer-facing `make mochitest-robocop` run
robocop-debug-signed.apk, and deprecates `make
mochitest-robotium` (since we name this suite robocop on TBPL).
2013-05-11 16:53:49 -07:00
Nick Alexander
bc0efccf06
Bug 863445 - Part 1: Make mobile/android/base/Makefile.in generate $(DIST)/fennec_ids.txt. r=jmaher
...
--HG--
rename : build/mobile/robocop/parse_ids.py => mobile/android/base/fennec-ids-generator.py
2013-05-11 16:53:48 -07:00
Joe Walker
9751893e70
Merge mozilla-central into fx-team
2013-05-11 15:11:54 +01:00
Ryan VanderMeulen
c3ad278e44
Merge m-c to inbound on a CLOSED TREE.
2013-05-11 09:49:12 -04:00
Ryan VanderMeulen
cd944c80b9
Backed out changeset 080912624060 (bug 869209) for Android xpcshell failures.
...
CLOSED TREE
2013-05-11 08:14:34 -04:00
Joe Walker
463c85bd35
Backed out changeset 6ebf2274acf5 (Bug 852792) for xpcshell bustage
2013-05-11 12:13:09 +01:00
Joe Walker
21be16980e
Backed out changeset 752dca088d71 (Bug 865252) for xpcshell bustage
2013-05-11 12:08:58 +01:00
Nick Alexander
78284a8764
Backed out e7739a472f09, 3fd142236a0f, and 382ec69cdfb1 (Bug 863445) for Android rc1 and rc2 failures on a CLOSED TREE. r=me
...
--HG--
rename : mobile/android/base/fennec-ids-generator.py => build/mobile/robocop/parse_ids.py
2013-05-10 21:38:52 -07:00
Nick Alexander
2d0fd713b6
Bug 863445 - Part 3: Make build/mobile/robocop/Makefile.in produce robocop-debug-signed.apk. r=jmaher
...
Also makes the developer-facing `make mochitest-robocop` run
robocop-debug-signed.apk, and deprecates `make
mochitest-robotium` (since we name this suite robocop on TBPL).
2013-05-10 18:39:00 -07:00
Nick Alexander
e31e2f53cc
Bug 863445 - Part 1: Make mobile/android/base/Makefile.in generate $(DIST)/fennec_ids.txt. r=jmaher
...
--HG--
rename : build/mobile/robocop/parse_ids.py => mobile/android/base/fennec-ids-generator.py
2013-05-10 18:39:00 -07:00
Shane Caraveo
d27515a3cf
bug 869209 order social providers by frecency, r=mak
2013-05-10 12:06:34 -07:00
Nick Fitzgerald
3d14363f5c
Bug 865252 - Don't heavily prefer cache when loading source mapped sources; r=robcee
2013-05-11 10:22:38 +01:00
Nick Fitzgerald
4754d7fefd
Bug 852792 - load sources from the sourcesContent field in a source map, if available; r=robcee
2013-05-11 10:22:36 +01:00
Mihai Sucan
dd218ccf61
Bug 870220 - Web Console property inspector shows duplicate entries for navigator.plugins; r=robcee,vporof
2013-05-11 12:05:21 +03:00
Ryan VanderMeulen
30578632b7
Merge m-c to fx-team.
2013-05-10 15:00:46 -04:00
Fabrice Desré
f0008895c6
Bug 853350 - Follow up. Make windows build.
2013-05-10 21:16:15 +02:00
Ed Morley
98b68fe058
Merge mozilla-central and birch
2013-05-10 12:18:48 +01:00
Joe Walker
cf09fcba29
Bug 839862 - The developer toolbar / GCLI should be able to execute commands remotely; r=dcamp
...
--HG--
rename : browser/devtools/shared/Templater.jsm => toolkit/devtools/gcli/Templater.jsm
rename : browser/devtools/commandline/gcli.jsm => toolkit/devtools/gcli/gcli.jsm
2013-05-09 15:15:22 +01:00
Shane Caraveo
c237cd28b9
bug 862314 prevent double install of providers, r=markh
2013-05-09 12:59:57 -07:00
Shane Caraveo
39895b95cf
bug 870473 limit number of ambient notification icons, r=felipe
2013-05-09 17:10:14 -07:00
Raymond Lee
aca2220e30
Bug 852478 - Store the date and time of downloads. r=paolo
2013-05-10 20:26:10 +08:00
Ryan VanderMeulen
eb21097a79
Merge m-c to inbound.
2013-05-10 14:57:50 -04:00
Mihai Sucan
99a3fbf2df
Bug 869003 - Cannot inspect objects from cross-domain iframes; r=robcee
2013-05-09 18:20:51 +03:00
Joe Walker
67bb224aa6
Backed out changeset d6249744132e (bug 839862) because xpcshell bustage
2013-05-09 17:46:27 +01:00
Joe Walker
bb0acd34f2
Bug 839862 - The developer toolbar / GCLI should be able to execute commands remotely; r=dcamp
2013-05-09 15:15:22 +01:00
Joe Walker
8401d43c19
Bug 849171 - Console.jsm output of errors could be better; r=msucan
2013-05-09 15:15:22 +01:00
Mihai Sucan
70a95751c9
Bug 869981 - Bring back inspect() jsterm helper function; r=me a=robcee
2013-05-09 13:36:56 +03:00
Ryan VanderMeulen
a25e7a8ad1
Merge m-c to fx-team.
2013-05-09 00:19:26 -04:00
Phil Ringnalda
50de41e318
Merge m-c to fx-team
2013-05-07 19:55:28 -07:00
Ryan VanderMeulen
f6068dd244
Merge inbound to m-c.
2013-05-07 22:10:19 -04:00
Heather Arthur
04cf9f778a
Bug 868321 - Sites with no stylesheets just show loading indicator forever; r=dcamp
2013-05-07 15:49:52 -07:00
Phil Ringnalda
d0cfe627c9
Back out f2ac70bee1e0 (bug 798358) until it tells us what jsonobj it is talking about
...
CLOSED TREE
2013-05-07 14:39:59 -07:00
Blake Kaplan
1a67df0ff8
Bug 869086 - Make textbox.xml resilient against the changes in bug 653881. r=gavin
2013-05-06 11:15:51 -07:00
Ryan VanderMeulen
db7eb10d60
Backed out changesets bb126ac7b33d and 7bbc04988e85 (bug 861495) for webconsole mochitest timeouts.
2013-05-07 14:39:16 -04:00
Colby Russell
a6dff54387
Bug 861495 - Transplant getOuterWindowWithId from nsIDOMWindowUtils to a window-related service: WebConsoleUtils.jsm. r=msucan
2013-05-07 12:34:21 -04:00
Marco Chen
7a4bcd7e5b
Bug 859711 - [A/V] Add mp4 sniffer to recognizing isom/iso2 comptiable_brand. r=padenot
2013-05-07 10:17:34 +08:00
Tim Taubert
3a7cf943aa
merge m-c to fx-team
2013-05-07 09:19:32 +02:00
David Creswick
18cd42578c
Bug 740541 - Style sheets in iframes are not listed in the style editor; r=harth
2013-05-06 20:31:46 -07:00
Jan Horak
b792e979ef
Bug 860213 - Use async version of set metadata. r=Neil
2013-05-06 09:04:16 -04:00
Ryan VanderMeulen
1c1f94e0f0
Merge m-c to inbound.
2013-05-06 08:29:37 -04:00
Tim Taubert
e8fb862808
merge m-c to fx-team
...
--HG--
rename : browser/base/content/test/social/social_share_image.png => browser/base/content/test/social/social_mark_image.png
2013-05-06 13:30:45 +02:00
Phil Ringnalda
1e4ab6c25d
Merge m-c to fx-team
2013-05-05 12:28:41 -07:00
