Ed Morley
987e5dbfde
Merge mozilla-central and inbound
2013-06-21 15:45:08 +01:00
Ed Morley
21c1b092f8
Merge latest green inbound changeset and mozilla-central
2013-06-21 15:39:27 +01:00
Ed Morley
8d2eb5c7fe
Backed out changeset 1168d6e45277 (bug 885158) for causing conflicts with changes that landed on inbound earlier
2013-06-21 15:37:20 +01:00
Ed Morley
73389cf78a
Backed out changeset 03a709825eff (bug 885541) for metro-chrome failures on a CLOSED TREE
2013-06-21 11:41:07 +01:00
Jan de Mooij
f957967378
Bug 881902 - Remove ContextStack and StackSpace. r=luke,njn
2013-06-21 08:28:06 +02:00
Simon Montagu
2b03440316
Remove superseded workaround, bug 870794, r=roc
2013-06-21 09:26:59 +03:00
Michael Wu
a060bfa8cd
Bug 885602 - Fix build of AudioManager.cpp on gonk-JB, r=mchen
2013-06-21 01:37:21 -04:00
Gaia Pushbot
c6b753cd80
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/dfeb3d9b3ca4
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #10157 from evanxd/bug-870756
Bug 870756 - [SMS] No Notification sound when SMS class 0(popup) is recived
========
https://hg.mozilla.org/integration/gaia-central/rev/f9bff0502b45
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 870756 - Play ring tone when receive class-0 type message.
========
https://hg.mozilla.org/integration/gaia-central/rev/bf673376d353
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #10100 from evanxd/bug-864555
Bug 864555 - - [Dialer] [Regional] Display the voice mail label when calling to the VM service and the VM is not stored on the SIM
========
https://hg.mozilla.org/integration/gaia-central/rev/c2ae5f66912d
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 864555 - Show the voicemail label.
2013-06-20 21:40:22 -07:00
Michael Wu
5acfa550a3
Follow up to bug 885620 - Add comment
2013-06-21 00:16:37 -04:00
Michael Wu
ba72635a91
Bug 885620 - Support FB fallback when HWC is not available, r=vlad
2013-06-21 00:04:53 -04:00
Gaia Pushbot
1f9265f86e
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f2c6443ee65f
Author: mozshiao9 <mshiao@mozilla.com>
Desc: Merge pull request #10482 from mozshiao9/master_camera_881218
Bug 881218 - [Camera] Record of deleted videos are not updated in camera filmstrip, r=@dominickuo
========
https://hg.mozilla.org/integration/gaia-central/rev/47a337048b91
Author: Mark Shiao <mshiao@mozilla.com>
Desc: gallery and camera already listening to poster deletion, removing listeners
========
https://hg.mozilla.org/integration/gaia-central/rev/ce35bb96f862
Author: Mark Shiao <mshiao@mozilla.com>
Desc: Bug 881218 - [Camera] Record of deleted videos are not updated in camera filmstrip
2013-06-20 21:06:23 -07:00
Ryan VanderMeulen
bec3d1dfa7
Merge m-c to birch.
2013-06-20 20:13:06 -04:00
Jonathan Griffin
2e9aa3c313
Bug 885591 - Add a silent argument to check_for_crashes. r=jhammel
2013-06-20 17:04:21 -07:00
Justin Lebar
f0ad232eb4
Bug 885158 - If a message is sent on a closed IPC channel, delete it immediately. r=bent
...
Our old behavior was to enqueue it until the channel gets destructed.
2013-06-20 16:55:33 -07:00
Ryan VanderMeulen
55d8634607
Backed out changesets 448ba56d9ba4 and 8cea4b4646ef (bug 700693) for intermittent failures.
2013-06-20 19:50:13 -04:00
Ryan VanderMeulen
357007975a
Merge m-c and birch.
2013-06-20 19:23:15 -04:00
Ryan VanderMeulen
3b1055e7d1
Merge inbound and m-c.
2013-06-20 19:22:19 -04:00
Ryan VanderMeulen
efc60799c0
Backed out changeset 8c77605c9c5a (bug 885158) for bustage.
2013-06-20 18:44:10 -04:00
Ryan VanderMeulen
73b47d7635
Merge fx-team and m-c.
2013-06-20 17:58:44 -04:00
Justin Lebar
0351882740
Bug 885158 - If a message is sent on a closed IPC channel, delete it immediately. r=bent
...
Our old behavior was to enqueue it until the channel gets destructed.
2013-06-20 14:58:43 -07:00
Ryan VanderMeulen
401aa4e628
Merge birch and m-c.
2013-06-20 17:58:25 -04:00
Gaia Pushbot
62ad245de3
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/624e8a418591
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10510 from daleharvey/813363
Bug 813363 - Ensure loading state is correctly displayed on newly displa... r=benfrancis
========
https://hg.mozilla.org/integration/gaia-central/rev/2bf2cfea6b74
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 813363 - Ensure loading state is correctly displayed on newly displayed tabs
2013-06-20 12:31:27 -07:00
Gaia Pushbot
324c8a5800
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ca4ff544cabf
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10508 from daleharvey/817829
Bug 817829 - Remove misplaced background highlight on awesomescreen r=benfrancis
========
https://hg.mozilla.org/integration/gaia-central/rev/fc62288e6d0f
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 817829 - Remove misplaced background highlight on awesomescreen
2013-06-20 12:16:23 -07:00
Chenxia Liu
2b500df8aa
Bug 877725 - Provide user visible opt in UI for cell tower and wifi data collection and reporting. r=wesj
2013-06-20 12:11:26 -07:00
Ryan VanderMeulen
2c400dd07a
Backed out changeset 72affddbc575 (bug 860782) for mochitest-bc orange.
2013-06-20 15:07:31 -04:00
Daniel Holbert
c464542fde
(no bug) Improve/correct some comments in nsFlexContainerFrame::Reflow. comment-only, DONTBUILD
2013-06-20 12:05:35 -07:00
Brian Hackett
0fe915216b
Bug 884254 - Don't update observed type sets when analyzeTypes is called during compilation, r=jandem.
2013-06-20 13:01:49 -06:00
Dan Gohman
6e443a5bab
Bug 885175 - DoubleHasher<double> fixes -- use a bitwise comparison to avoid considering zero and negative zero equal. r=luke
2013-06-20 11:55:41 -07:00
Jeff Hammel
2f218e3a6b
Bug 790765 - get mozbase tests running on m-c;r=ahal
...
--HG--
extra : rebase_source : 07e1410dc9377f2dbfd2af2c04ec70e348decd61
2013-06-20 11:52:37 -07:00
Nick Alexander
40c8cd76eb
Bug 874132 - Second reland Part 3: Replace uses of apkbuilder with zip and custom debug signing tool. r=jmaher,mfinkle
...
This incorporates follow-ups including: rename the debug key; check if
key alias exists rather than just testing for keystore existence; set
$(AIDL).
Renaming the debug key works around an un-confirmed JDK bug in
jarsigner, where '-debug' and 'debug' compare the same.
2013-06-20 11:50:28 -07:00
David Keeler
1ec40f0b4e
bug 700693 - OCSP stapling testing r=bsmith
2013-06-20 11:41:41 -07:00
Aki Sasaki
5252bbb876
bug 885407 - add hamachi m-c builds. r=catlee
2013-06-20 11:33:33 -07:00
Aki Sasaki
fc0ae2e634
bug 885408 - add leo m-c builds. r=catlee
2013-06-20 11:33:24 -07:00
Gaia Pushbot
be5965ab93
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f77cc11f08f7
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10507 from daleharvey/806173
Bug 806173 - Dont show url button when there is no input r=benfrancis
========
https://hg.mozilla.org/integration/gaia-central/rev/c9d8cc55a086
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 806173 - Dont show url button when there is no input
2013-06-20 11:31:23 -07:00
Sid
31329541e5
Bug 884585 - Exclude about:newtab from Recently Closed Tabs list; r=ttaubert
2013-06-20 20:06:14 +02:00
Anton Kovalyov
916ce4824c
Bug 863653 - Add hints to profiler [start|stop|show] commands; r=jwalker
2013-06-20 10:48:25 -07:00
Gaia Pushbot
8305bf2b92
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3ca4f566c83b
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #10506 from fabi1cazenave/simpleLocalize-bug882591
Bug 882591 - l10n.js should expose an asynchronous `localize()' method, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/0e74446a9eec
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Bug 882591 - l10n.js should expose an asynchronous `localize()' method
2013-06-20 10:46:22 -07:00
Nick Fitzgerald
da2bce2e44
Bug 757408 - Opening debugger hangs completely on large scripts; r=past
2013-06-20 10:43:30 -07:00
Gaia Pushbot
04dec646db
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/69f220a0382b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #10489 from jmcanterafonseca/custom_urls_services
Bug 883510 - Partner customization should be able to set Facebook OAuth ...
========
https://hg.mozilla.org/integration/gaia-central/rev/660b952ff131
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 883510 - Partner customization should be able to set Facebook OAuth 2 callback url completely
2013-06-20 09:46:22 -07:00
Gaia Pushbot
bfadad922f
Bumping gaia.json for 3 gaia-central revision(s)
...
Truncated some number of revisions since the previous bump.
========
https://hg.mozilla.org/integration/gaia-central/rev/8d9ae370cf54
Author: Chris AtLee <catlee@mozilla.com>
Desc: Bug 852321: Update xulrunner SDK to reduce download time. r=ochameau
========
https://hg.mozilla.org/integration/gaia-central/rev/d4c0b3a4c08a
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #10446 from JonHylands/jhylands-876736-mms-reference-workloads-master
Bug 876736 - Added MMS reference workloads
r=julien
========
https://hg.mozilla.org/integration/gaia-central/rev/9dc7e2327fcb
Author: Jon Hylands <jhylands@mozilla.com>
Desc: Bug 876736 - Added MMS reference workloads
2013-06-20 09:41:51 -07:00
Brian R. Bondy
ea37775f5c
Bug 878449 - Fixed mismatched CoInitialize call causing crash in JumpList. r=padenot.
2013-06-20 08:57:46 -04:00
Gaia Pushbot
1438876f5c
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/584f9cc51085
Author: Dale Harvey <dale@arandomurl.com>
Desc: Merge pull request #10473 from mschwart/bug884486
Bug 884486 Stored MCC matches nsIDOMMozMobileNetworkInfo r=daleharvey
========
https://hg.mozilla.org/integration/gaia-central/rev/9b626d749003
Author: Michael Schwartz <mschwart@codeaurora.org>
Desc: Bug 884486 Stored MCC matches nsIDOMMozMobileNetworkInfo r=daleharvey
Bug 828307 changed the type of the MCC in nsIDOMMozMobileNetworkInfo to
string. Stored MCC values must also be of type string.
Change-Id: Idf861d2a372ffa4e428d9af3aa6439337a516e40
2013-06-20 04:01:22 -07:00
Gaia Pushbot
75bf1603da
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/01bc4b1acdc6
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10455 from alivedise/bugzilla/796369_master/software-button-manager
Bug 796369 - Software button manager, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/2e03df383784
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia into bugzilla/796369_master/software-button-manager
Conflicts:
apps/settings/index.html
========
https://hg.mozilla.org/integration/gaia-central/rev/f6b96ed42120
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 796369 - Software button manager
2013-06-20 03:46:22 -07:00
Gaia Pushbot
6a19df4544
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/13abe6c60a2b
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #10398 from pivanov/bug-865155
Bug 865155 - Email divider lines are incorrect. They should have a 15 pixel gap at both ends to match system. | Follow up patch r=@samjoch
========
https://hg.mozilla.org/integration/gaia-central/rev/8d0be4b49fab
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 865155 - Email divider lines are incorrect. They should have a 15 pixel gap at both ends to match system. | Follow up patch
2013-06-20 03:01:23 -07:00
Ed Morley
7bce32e96f
Merge mozilla-central and fx-team
2013-06-20 09:22:25 +01:00
Ed Morley
8e48210ce5
Merge mozilla-central and birch
2013-06-20 09:20:54 +01:00
Gaia Pushbot
2195f505bb
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/510a2b53de76
Author: mozshiao9 <mshiao@mozilla.com>
Desc: Merge pull request #10483 from mozshiao9/master_fm_876265
Bug 876265 - One FM test fails on TBPL, r=pinzhang
========
https://hg.mozilla.org/integration/gaia-central/rev/7a1adb90e971
Author: Mark Shiao <mshiao@mozilla.com>
Desc: Bug 876265 - One FM test fails on TBPL
2013-06-20 01:01:22 -07:00
Ed Morley
4e0a681101
Merge latest green birch changeset and mozilla-central
2013-06-20 09:01:19 +01:00
Gaia Pushbot
1e989cdb92
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/344bc62a70a6
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #10479 from yurenju/hidpi
Bug 881127 - Used GAIA_DEV_PIXELS_PRE_PX instead of HIDPI r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/d06788f435b3
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 881127 - Used GAIA_DEV_PIXELS_PRE_PX instead of HIDPI r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/ee6cb3a038a6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10497 from KevinGrandon/bug_869383_remove_homescreen_port
Bug 869383 - Remove extra colon
========
https://hg.mozilla.org/integration/gaia-central/rev/29be2fbdb4f2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 869383 - Remove extra colon
2013-06-20 00:16:23 -07:00
Gina Yeh
4d4adc961c
Bug 873919 - Remove old system messages for Bluetooth pairing requests, r=echou
2013-06-20 12:14:09 +08:00