Commit Graph

15197 Commits

Author SHA1 Message Date
Mike Conley
f2768f6df2 Automated merge with https://hg.mozilla.org/mozilla-central
--HG--
rename : toolkit/content/LightweightThemeConsumer.jsm => toolkit/modules/LightweightThemeConsumer.jsm
2013-05-17 11:48:25 -04:00
Ryan VanderMeulen
2864f1ae0a Merge m-c to birch. 2013-05-16 20:31:26 -04:00
Ryan VanderMeulen
3b2fb8dd48 Merge inbound to m-c. 2013-05-16 20:29:40 -04:00
Sotaro Ikeda
5e9a341b9b Bug 871753 Part2 - add libstagefright_foundation r=mwu 2013-05-16 17:24:20 -07:00
Ryan VanderMeulen
0789066b2f Merge m-c to fx-team. 2013-05-16 16:19:25 -04:00
Panos Astithas
6b052b1e91 Bug 871510 - Some event handlers appear as undefined, hiding the appropriate null values in the prototype; r=msucan 2013-05-16 18:42:15 +03:00
Victor Porof
36e4594c52 Merge m-c to fx-team 2013-05-16 10:32:06 +03:00
Ryan VanderMeulen
d9824dd1e6 Merge inbound to m-c. 2013-05-15 21:14:58 -04:00
Brian R. Bondy
bc92d73e1a Bug 572162 - Changes to tests for update root hash changes. r=rstrong 2013-05-15 10:58:09 -07:00
Brian R. Bondy
9227520b87 Bug 572162 - Use TaskbarIDs hash as update dir root. r=rstrong 2013-05-15 10:58:09 -07:00
Brian R. Bondy
a46e80d61f Bug 572162 - Cleanup new update directory and obsolete old after updates and installs. r=rstrong 2013-05-15 10:58:09 -07:00
Brian R. Bondy
f153980081 Bug 572162 - Update root dir migration xpcshell tests. r=rstrong 2013-05-15 10:58:09 -07:00
Brian R. Bondy
7b78adf4e8 Bug 572162 - Migrate update files to new update directory after updates. r=rstrong 2013-05-15 10:58:09 -07:00
Panos Astithas
39041b6f58 Fix another typo in Loader.jsm (bug 867485); r=dcamp 2013-05-15 17:22:01 +03:00
Panos Astithas
a318e18c6a Fix a few typos in Loader.jsm (bug 867485); r=jwalker 2013-05-14 12:48:18 +03:00
Ryan VanderMeulen
a4f7bfe426 Merge m-c to fx-team. 2013-05-13 16:33:59 -04:00
Ryan VanderMeulen
5187701658 Merge m-c to inbound. 2013-05-13 12:02:04 -04:00
Ryan VanderMeulen
520843a801 Merge m-c to birch. 2013-05-13 09:53:32 -04:00
Gijs Kruitbosch
5fc3a07279 Bug 865316 - Fix styling of dropmarkers and borders for toolbarbutton-menu and toolbarbutton-menu-dropmarker, r=dao 2013-05-13 14:59:18 +02: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
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
Mike Conley
7f9d2174a6 Automated merge with https://hg.mozilla.org/mozilla-central 2013-05-15 17:14:08 -04: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
Gijs Kruitbosch
15b3ae9b89 Bug 752434 - Stop hiding toolbars for about:addons & co, r=dao 2013-05-14 20:20:45 +02:00
Mike Conley
277b86a80a Mostly automated merge with https://hg.mozilla.org/mozilla-central 2013-05-13 13:04:32 -04:00
Marco Chen
e91334a87e Bug 847006 - Add .amr into and remove aac from music as well as add m4v into video filter on device storage. r=dougt, r=doublec, a=leo+ 2013-05-07 11:02:21 +08:00
Dave Camp
c6104f852b Bug 867485: Move the devtools loader into toolkit/ r=jwalker 2013-05-01 09:27:24 -07:00