c6a841a3e36f15236b9756e8232856ec7ca92132: Merge mozilla-central and fx-team
Ed Morley <emorley@mozilla.com> - Thu, 20 Jun 2013 09:22:25 +0100 - rev 135901
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
Merge mozilla-central and fx-team
148f8183bf89577fbecab72da8ca29f5a9ce01dd: Bug 868306 - Ignoring extensions.%ID%.getAddons.cache.enabled preference for addon submission; r=gps
Stefan Mirea <steven.mirea@gmail.com> - Wed, 19 Jun 2013 18:25:01 -0700 - rev 135900
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
Bug 868306 - Ignoring extensions.%ID%.getAddons.cache.enabled preference for addon submission; r=gps Bug 868306 - Ignoring extensions.%ID%.getAddons.cache.enabled preference for addon submission; r=gps
3a32e60568f6a516a6b0fe306b9afe1b14aca03e: Merge birch and m-c.
Ryan VanderMeulen <ryanvm@gmail.com> - Thu, 20 Jun 2013 17:58:25 -0400 - rev 135899
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
Merge birch and m-c.
1506080a9570cfd8026f08bab16ce4bc33dd8eb3: Bumping gaia.json for 2 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 12:31:27 -0700 - rev 135898
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
98578262cdadb96b0c39f15d833d8d996dc5876c: Bumping gaia.json for 2 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 12:16:23 -0700 - rev 135897
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
919b2492a360a00f309b181949e94f3fa6030c56: bug 885407 - add hamachi m-c builds. r=catlee
Aki Sasaki <asasaki@mozilla.com> - Thu, 20 Jun 2013 11:33:33 -0700 - rev 135896
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
bug 885407 - add hamachi m-c builds. r=catlee
5517ec38e100c05b792863276834b696747dcc79: bug 885408 - add leo m-c builds. r=catlee
Aki Sasaki <asasaki@mozilla.com> - Thu, 20 Jun 2013 11:33:24 -0700 - rev 135895
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
bug 885408 - add leo m-c builds. r=catlee
ea9f1d49f61c21248263ecdae460992bcdab3570: Bumping gaia.json for 2 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 11:31:23 -0700 - rev 135894
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
9c7ccc30e813b3ae921e6f7bec1e5f965c6acca4: Bumping gaia.json for 2 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 10:46:22 -0700 - rev 135893
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
d1ea93f4dea61353e0ff0586c61d401cbc3fe4fd: Bumping gaia.json for 2 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 09:46:22 -0700 - rev 135892
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
b4c50b0a36e96ff90425df5dcd940bd185adeccd: Bumping gaia.json for 3 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 09:41:51 -0700 - rev 135891
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
cb50cdb9cb93c7d2bacb8d143579a2f793bc26b5: Bumping gaia.json for 2 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 04:01:22 -0700 - rev 135890
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
558c70ba4604c850816dac9d2b0ebff7ac86efde: Bumping gaia.json for 3 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 03:46:22 -0700 - rev 135889
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
da9244299b017e151ac42cd699756d50b21978e9: Bumping gaia.json for 2 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 03:01:23 -0700 - rev 135888
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
b35b985ebb7b34eb3b2da9950319fcc0ff80a92a: Merge mozilla-central and birch
Ed Morley <emorley@mozilla.com> - Thu, 20 Jun 2013 09:20:54 +0100 - rev 135887
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
Merge mozilla-central and birch
3bcd0a7f86ae2f1be388d277904d88748066307b: Bumping gaia.json for 2 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 01:01:22 -0700 - rev 135886
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
9c4b4179c91d3597e436bdd56c1227d74c60f220: Bumping gaia.json for 4 gaia-central revision(s)
Gaia Pushbot <release+gaiajson@mozilla.com> - Thu, 20 Jun 2013 00:16:23 -0700 - rev 135885
Push 29870 by ryanvm@gmail.com at Thu, 20 Jun 2013 23:26:41 +0000
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
0d4b46a6de4c542f41b1960f2afd1ef124a53c95: Bug 861090 - Add pref to disable playback of MPEG files in nsVideoDocument using WMF. r=?padenot
Chris Pearce <cpearce@mozilla.com> - Fri, 21 Jun 2013 11:16:55 +1200 - rev 135884
Push 29869 by cpearce@mozilla.com at Thu, 20 Jun 2013 23:17:07 +0000
Bug 861090 - Add pref to disable playback of MPEG files in nsVideoDocument using WMF. r=?padenot
8066ebe02e0bb809eeead2aef7dfec20b2c163d4: Backout ac48416672e7 for unexpected SM(r) failures.
Terrence Cole <terrence@mozilla.com> - Thu, 20 Jun 2013 16:17:37 -0700 - rev 135883
Push 29868 by tcole@mozilla.com at Thu, 20 Jun 2013 23:14:40 +0000
Backout ac48416672e7 for unexpected SM(r) failures. Even if the there is a CLOSED TREE by the time I push.
c63ed72540162c78d935096ff97df0832ba95c1e: Bug 885482 - Bump Marionette version, r=davehunt
Jonathan Griffin <jgriffin@mozilla.com> - Thu, 20 Jun 2013 16:07:08 -0700 - rev 135882
Push 29867 by jgriffin@mozilla.com at Thu, 20 Jun 2013 23:10:11 +0000
Bug 885482 - Bump Marionette version, r=davehunt
(0) -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip