Commit Graph

136187 Commits

Author SHA1 Message Date
Jared Wein
698d87c899 Automated merge with https://hg.mozilla.org/mozilla-central 2013-06-23 02:58:41 -04:00
Phil Ringnalda
e100bec297 Merge s-c to m-c 2013-06-22 15:50:51 -07:00
Phil Ringnalda
11fb19e624 Merge birch to m-c 2013-06-22 15:50:24 -07:00
Richard Newman
b5d075a023 Merge m-c to s-c. 2013-06-22 11:58:51 -07:00
ffxbld
11728d2ddc No bug, Automated HSTS preload list update from host bld-linux64-ec2-383 - a=hsts-update 2013-06-22 03:33:48 -07:00
ffxbld
79e196fe54 No bug, Automated blocklist update from host bld-linux64-ec2-394 - a=blocklist-update 2013-06-22 03:30:59 -07:00
Gaia Pushbot
47675a799f Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/9aa3da2da145
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 883616 - Bug 882607 resolution introduced a XSS vulnerability r=gnarf

Carefully escape the body before injecting it into the document
Added some tests to ensure this for both SMS and MMS.

========

https://hg.mozilla.org/integration/gaia-central/rev/7963fee0efae
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10525 from alivedise/bugzilla/885473_master_v2/software-button-pressed

Bug 885471 - 1. Fix software button manager on real device and nightly and simulator; 2. Add holdhome event. r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/3611bb710864
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 885471 - Fix software button manager default behavior on real
device/nightly/simulator, and add holdhome event.
2013-06-22 01:55:22 -07:00
Tim Taubert
16fda6b83a merge m-c to fx-team 2013-06-22 06:10:39 +02:00
Phil Ringnalda
d6a43e42ba Merge m-c to birch 2013-06-21 19:45:59 -07:00
Nick Alexander
6f5c81e3de Bug 885582 - Append version number query parameter to Android about:healthreport URL. r=rnewman 2013-06-21 17:42:46 -07:00
Gaia Pushbot
fe8bace69f Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/7615f637d227
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #10407 from asutherland/email-progress-spinner

Bug 882994 - [email] UI: Replace sync progress bar (including candy bar) / messages spinner with single spinning refresh button. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/675a907c30fe
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 882994 - [email] UI: Replace sync progress bar (including candy bar) / messages spinner with single spinning refresh button. r=jrburke

This is both a performance win (animations chew CPU, especially the candybar)
and a UX win since it gets rid of the confusing determinate progress bar
status.
2013-06-21 17:25:22 -07:00
Jared Wein
20e28337a5 Automated merge with https://hg.mozilla.org/mozilla-central 2013-06-21 19:22:56 -04:00
Jeffrey Hammel
a68cf31920 Bug 885784 - Disable mozdevice tests on a CLOSED TREE for occasional orange, r=jgriffin 2013-06-21 15:32:50 -07:00
Michael Wu
5da36e7c95 Bug 880502 - Make OggCodecState.cpp build on gonk-JB, r=cpearce 2013-06-21 18:03:05 -04:00
Gaia Pushbot
513f526f60 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/b1cfff59ca24
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #10229 from lightsofapollo/hide-loading-area

Bug 876796 - Hide event details until they are loaded.

========

https://hg.mozilla.org/integration/gaia-central/rev/ebdf2b0e30b2
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 876796 - Hide show event / edit event details until model is loaded
2013-06-21 14:50:21 -07:00
Ehsan Akhgari
2bdb77ece0 Bug 885878 - Try to fix the timeout issue in testharness.js based tests on a CLOSED TREE 2013-06-21 17:03:57 -04:00
Nick Alexander
61c23220ad Bug 882745 - Add LaunchUpdater message to Android about:healthreport wrapper. r=rnewman 2013-06-21 14:00:40 -07:00
Nick Alexander
1db978d364 Bug 879555 - Add ShowSettings message to Android about:healthreport wrapper. r=rnewman 2013-06-21 14:00:40 -07:00
Nick Alexander
4ec6405ec9 Bug 738890 - Fix testJarReader. r=wesj 2013-06-21 14:00:39 -07:00
Nick Alexander
796b0b6983 Bug 884626 - Make UpdateServiceHelper read update.locale from correct omni.ja location. r=mfinkle 2013-06-21 14:00:38 -07:00
Justin Lebar
27b6f81735 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.

--HG--
extra : rebase_source : 9766774838257d9e1a6adc15d3b4cf9e38fefcbe
2013-06-21 13:58:47 -07:00
Gaia Pushbot
1df5ee1c13 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/f05be691f909
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #10403 from asutherland/bug-883035

Bug 883035 - [Email] Folder list card "last sync" label can overlap the settings icon; visible on pt-BR locale. r=psingapati

========

https://hg.mozilla.org/integration/gaia-central/rev/d5e5b9b207dc
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 883035 - [Email] Folder list card "last sync" label can overlap the settings icon; visible on pt-BR locale.
2013-06-21 14:20:22 -07:00
Kartikaya Gupta
6bb3472339 Bug 883646 - Initialize transform variables for non-Fennec codepaths. r=kentuckyfriedtakahe 2013-06-21 17:03:57 -04:00
Kartikaya Gupta
4ec67ad5ed Bug 883646 - Scale the critical displayport by the widget scale as well. r=Cwiiis 2013-06-21 17:03:57 -04:00
Kartikaya Gupta
facd193c59 Bug 883646 - Update the ViewTransform class to have a LayoutToScreen scale factor. r=kentuckyfriedtakahe, BenWa 2013-06-21 17:03:57 -04:00
Kartikaya Gupta
dcd5272bcc Bug 883646 - Propagate the ScaleFactor classes far and wide. r=kentuckyfriedtakahe 2013-06-21 17:03:56 -04:00
Kartikaya Gupta
dbbc232775 Bug 883646 - Add the LayoutDevicePixel type. r=kentuckyfriedtakahe 2013-06-21 17:03:56 -04:00
Kartikaya Gupta
cd13a7b464 Bug 883646 - Fix zoom-to-rect code in APZC to use a proper definition of zoom. r=kentuckyfriedtakahe 2013-06-21 17:03:56 -04:00
Kartikaya Gupta
af58e2fde8 Bug 883646 - Fix the zoom clamping in APZC and the resolution calculation. r=kentuckyfriedtakahe 2013-06-21 17:03:55 -04:00
Kartikaya Gupta
59ed1b636b Bug 883646 - Apply the mDevPixelsPerCSSPixel scaling factor in a few places. r=kentuckyfriedtakahe 2013-06-21 17:03:55 -04:00
Gaia Pushbot
69e75bc7ce Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d7d6497ab80b
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #10526 from cctuan/884692

Bug 884692 - [Email] Not able to unset the flag icon from the message vi... r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/58d09e7aeec1
Author: gduan <gduan@mozilla.com>
Desc: Bug 884692 - [Email] Not able to unset the flag icon from the message viewer
2013-06-21 13:45:22 -07:00
Nathan Froyd
9595f00362 Backout 65804eae62b1, a0b216d3be12, 68e5d9fe91fc (bug 837326) for impending bustage that would make this CLOSED TREE worse than it already is 2013-06-21 15:39:45 -04:00
Kyle Machulis
52937bd495 Bug 885266: Fix wrong ifdef in ShadowLayersUtilsGralloc; r=kanru 2013-06-21 12:33:12 -07:00
David Rajchenbach-Teller
d1fe1ef5a7 Bug 837326 - Unit tests for third party addon telemetry;r=froydnj,ehsan 2013-06-21 21:19:00 +02:00
David Rajchenbach-Teller
8d016135f8 Bug 837326 - Statistics of accept/reject of third-party cookies;r=froydnj 2013-06-21 21:19:00 +02:00
David Rajchenbach-Teller
f93f69a17e Bug 837326 - Informing observers upon accept/reject of a third-party cookie;r=ehsan 2013-06-21 21:18:59 +02:00
Aki Sasaki
faeb9028d2 bug 885556 - new leo backup tarball. r=catlee 2013-06-21 11:42:14 -07:00
Ed Morley
7994f49973 Backed out changeset 2b0640fa5b18 (bug 837326) for Windows build failures on a CLOSED TREE 2013-06-21 18:21:33 +01:00
Ed Morley
6199ade9d8 Backed out changeset 7cbc024b3c77 (bug 837326) 2013-06-21 18:21:11 +01:00
Ed Morley
a93c250056 Backed out changeset 75fa13b20c1d (bug 837326) 2013-06-21 18:21:08 +01:00
Jason Orendorff
ba22cb11e1 Fix another busted test for bug 885067 on a CLOSED TREE. no_r=orange, egg=face. 2013-06-21 12:20:32 -05:00
Ed Morley
15ade14458 Backed out changeset 4290ee7475c1 (bug 864441) for compilation failures on a CLOSED TREE 2013-06-21 18:07:45 +01:00
Gaia Pushbot
2182df8671 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/09bcdf5f483f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10474 from KevinGrandon/camera_l10n_lazy_loader

Bug 884595 - Add shared lazy l10n loader.

========

https://hg.mozilla.org/integration/gaia-central/rev/f110a6b2a136
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 884595 - Add shared lazy l10n loader.
2013-06-21 09:50:29 -07:00
Jason Orendorff
859b69b0c7 Fix very stupid test for bug 885067 that I pushed in rev 60d580712ec0. Clerical error on my part. no_r=orange. 2013-06-21 11:43:09 -05:00
Ed Morley
b8d6c9db10 Merge mozilla-central and birch 2013-06-21 15:45:37 +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
Gaia Pushbot
72b4a9f7cb Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/bbfe7c9bd728
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10450 from crh0716/866376

Bug 866376 - Change icon of enable storage

========

https://hg.mozilla.org/integration/gaia-central/rev/222f33fe3c60
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 866376 - Change icon of enable storage

========

https://hg.mozilla.org/integration/gaia-central/rev/d486ce641d93
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10095 from crh0716/865995_a

Bug 865995 - Reset all items to the original state after selecting an operator

========

https://hg.mozilla.org/integration/gaia-central/rev/556d4072b6b9
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 865995 - Reset all items to the original state after selecting an operator
2013-06-21 07:35:22 -07:00
Gaia Pushbot
fdd782f145 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/8dbe6215ffc8
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #10509 from Rik/latest-closure-linter-870729

Bug 870729 - Disable specific code errors instead of --nojsdoc r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/7370a7fe21a8
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 870729 - Disable specific code errors instead of --nojsdoc

This will let us use the latest closure-linter

========

https://hg.mozilla.org/integration/gaia-central/rev/4c5c1fb7d3db
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10522 from daleharvey/806556

Bug 806556 - Change wording of url placeholder text r=benfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/a90a109458af
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 806556 - Change wording of url placeholder text
2013-06-21 07:10:21 -07:00
Gaia Pushbot
38cdc8f390 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/03908528aa50
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #10478 from davidflanagan/bug882954

Bug 882954: compute correct keyboard layout data for autocorrect r=janjongboom

========

https://hg.mozilla.org/integration/gaia-central/rev/af7e68e595bc
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 882954: compute correct keyboard layout data for autocorrect
2013-06-21 07:07:04 -07:00