Jared Wein
9790b4ac3f
Automated merge with https://hg.mozilla.org/mozilla-central
2013-08-10 18:18:29 -04:00
Phil Ringnalda
5818c84a93
Back out fd59f2cfbbff (No bug) for being the worst automated HSTS preload list update possible
2013-08-10 07:43:42 -07:00
ffxbld
b0172c83a5
No bug, Automated HSTS preload list update from host bld-centos6-hp-006 - a=hsts-update
2013-08-10 03:22:55 -07:00
ffxbld
6a58755031
No bug, Automated blocklist update from host bld-centos6-hp-016 - a=blocklist-update
2013-08-10 03:19:31 -07:00
Olli Pettay
191ea12215
Backout Bug 902481 to fix crashes, r=me
2013-08-10 12:24:09 +03:00
Ryan VanderMeulen
7a54b5e31f
Merge fx-team to m-c.
2013-08-09 19:28:34 -04:00
Mike Conley
104ab62e44
Automated merge with https://hg.mozilla.org/mozilla-central
2013-08-09 19:24:40 -04:00
Hannes Verschore
2c5226efe1
Bug 898832: Fix topcrash regression, r=bhackett
2013-08-10 01:15:11 +02:00
Ryan VanderMeulen
8afe7e8fed
Merge inbound to m-c.
2013-08-09 19:08:45 -04:00
Ryan VanderMeulen
4f61ff1332
Merge m-c to fx-team.
2013-08-09 17:29:37 -04:00
Ryan VanderMeulen
1c27efb8bd
Merge b2g-inbound to m-c.
2013-08-09 17:26:14 -04:00
Dave Townsend
6a3effc4b7
Bug 901239 - Uplift Add-on SDK to Firefox r=me
2013-08-09 13:17:14 -07:00
Matt Brubeck
5cc2620ed8
Bug 903541 - Fix duplicate contextmenu handling on about:start [r=jimm]
2013-08-09 12:53:08 -07:00
Gaia Pushbot
374c2749bb
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0e3e30e489ff
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 903137 - [SMS][MMS] Contextmenu prompt for email in message should display email address r=gnarf
- Make all prompts consistent
- Ensures that dataset.isContact strings are only used to derive a true isContact boolean
- Renames ThreadUI.activateContact to ThreadUI.prompt
- The function no longer serves as only a "contact" prompt
- May prompt any type of recipient (contact, unknown, email)
- May prompt from header, group list or message content
- Renames ThreadUI.genPrompt to ThreadUI.prompContact
- genPrompt is meaningless
- The function is explicitly for creating a prompt with a known contact
- Includes the contact info lookup
- Converts promptContact arguments to an object, instead of named parameters
- Update LinkActionHandler to delegate to promptContact, instead of doing it's own duplicated lookup
- Adds tests to ensure that a something is displayed when something is provided
- Could be any of the following:
- DOM UL
- Email address
- Phone Number
- Name
- Updates LinkActionHandler tests to use the correct new function names
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-08-09 12:05:25 -07:00
Gregory Szorc
2be348ac4c
Bug 902389 - Normalize topobjdir; r=mshal
2013-08-09 12:04:15 -07:00
Po-Chun Chang
0a4275cc10
Bug 897258 - Avoid wasted work in GestureEventListener::HandleInputEvent(). r=kentuckyfriedtakahe
2013-08-09 15:01:56 -04:00
Ryan VanderMeulen
2e314a0b7b
Bug 903452 - Update pdf.js to version 0.8.423. r=bdahl
2013-08-09 15:01:28 -04:00
Nicolas B. Pierron
ef631fba4f
Bug 900890 - IonMonkey: Use a dedicated register to unbox the index of SetElementIC. r=jandem
2013-08-09 11:50:55 -07:00
Gaia Pushbot
879dd4f181
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/30a28b592ed8
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #11353 from KevinGrandon/bug_901578_remove_mouse_shim_settings
Bug 901578 - Remove mouse_event_shim from settings r=kaze
========
https://hg.mozilla.org/integration/gaia-central/rev/86532663e60e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 901578 - Remove mouse_event_shim from settings
2013-08-09 11:45:23 -07:00
Jim Mathies
1f09d86070
Bug 903364 - Fix: Mouse scrollbar remains visible on start tab after touch. r=rsilveira
2013-08-09 13:40:36 -05:00
David Rajchenbach-Teller
a3b85e2bb6
Bug 902434 - Move Telemetry I/O to TelemetryFile.jsm. r=froydnj
2013-08-09 14:11:09 -04:00
Sunny
540e91ea64
Bug 827805 - [OS.File] Use Deprecated.jsm to mark deprecation of OS.File.Info.prototype.creationDate. r=yoric
2013-08-09 14:10:44 -04:00
Marco Castelluccio
4c8d683ff0
Bug 776446 - Cannot use contextmenu <menu> elements within the desktop webapp runtime. r=myk
2013-08-09 14:02:20 -04:00
Marco Castelluccio
f3b2662a82
Bug 773783 - Launching an app with an incompatible version of Firefox installed on Mac produces a very not so useful error message. r=myk
2013-08-09 14:02:04 -04:00
Matthew Noorenberghe
3456fdb703
Merge mozilla-central to UX
2013-08-08 22:56:52 -07:00
Matt Brubeck
19ae0473d9
Merge m-c to fx-team
2013-08-08 21:54:44 -07:00
Michael Comella
f73f9f2a2d
Bug 900289: Enable foreign key pragma on FHR database. r=rnewman
2013-08-08 20:54:36 -07:00
Tim Taubert
25eb66178d
Backed out changeset 1230bd543454 (bug 792806)
2013-08-09 05:50:22 +02:00
Tim Taubert
53abe8c266
Backed out changeset 24e725b72a0d (bug 792806)
2013-08-09 05:50:21 +02:00
Tim Taubert
2132bdd1b3
Bug 880101 - part 2 - Wait until the initial tab's content document has been created before adding the progress listener; r=gavin
2013-08-09 04:56:48 +02:00
Tim Taubert
4267e34285
Bug 880101 - part 1 - Add test that forces the gBrowser constructor a little too early; r=gavin
2013-08-09 04:51:27 +02:00
Max Li
e6d09bd7b9
Bug 900097 - statusbarpanel shouldn't be a button accessible. r=enn
2013-08-08 18:39:56 -04:00
Corey Ford
b2510f37c3
Bug 898794 - Store normal frame position before applying relative positioning. r=dbaron
2013-08-08 17:20:17 -07:00
Po-Chun Chang
3c2697f467
Bug 897262 - Avoid waste in nsBaseScreen::CheckMinimumBrightness(). r=bgirard
2013-08-09 14:36:32 -04:00
Matt Brubeck
ce29854576
Back out d10581fd8202 (bug 897532) on suspicion of causing intermittent pgo-only Metro crashes
2013-08-08 14:58:00 -07:00
Sriram Ramasubramanian
5059b67978
Bug 880525: Search suggestions are mis-aligned. [r=mfinkle]
...
--HG--
extra : rebase_source : fc009c582cee1e818a91520c91a3ddd087793a6a
2013-08-08 14:43:08 -07:00
Jared Wein
5b23d3d683
Bug 902924 - Remove the dependency on FullZoom_onLocationChange from the zoom controls. r=mikedeboer
2013-08-08 14:10:36 -04:00
Gijs Kruitbosch
02a72021ec
Merge from m-c to UX
2013-08-08 09:21:50 +02:00
Chuck Lee
0fcbd9e841
Bug 900331 - Provide sender in system message of WAP Push receiving. r=vicamo
2013-08-08 12:07:51 +08:00
Jan Jongboom
17bc835244
Bug 902830 - Emit mozChromeEvent if input focus changes. r=yxl
2013-08-09 14:01:28 -04:00
kli@mozilla.com
ecad3e6659
Bug 902277 - Reset retry counter of WifiWorker after connect to supplicant. r=vchang
2013-08-09 13:07:56 +08:00
Gaia Pushbot
87b78aac22
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a202d951a704
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #11464 from lightsofapollo/revert-11425
Revert "Merge pull request #11425 from comoyo/mozContacts2vcard"
========
https://hg.mozilla.org/integration/gaia-central/rev/94b6457ad206
Author: James Lal <james@lightsofapollo.com>
Desc: Revert "Merge pull request #11425 from comoyo/mozContacts2vcard"
This reverts commit 1b3b923534f606c69fce61136aa21849ee8bba6a, reversing
changes made to c354940fbe112bcf2d90e2a5654ad1824f3a2348.
2013-08-09 10:35:35 -07:00
Gaia Pushbot
9742dac607
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ffe47e2d96de
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 903400 - Trim whitespaces for search in the e.me search bar. r=vingtetun,a=leo+
========
https://hg.mozilla.org/integration/gaia-central/rev/44c09c38ef4b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #11448 from KevinGrandon/bug_902959_add_getApps_param
Bug 902959 - Add option to suppress apps which have hidden roles r=vingtetun
========
https://hg.mozilla.org/integration/gaia-central/rev/7bac1ccb3ef5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 902959 - Add option to suppress apps which have hidden roles
2013-08-09 10:25:30 -07:00
Gaia Pushbot
cea0ce884c
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b89cd693bf17
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #11444 from lightsofapollo/vbump-marionette
vbump marionette
========
https://hg.mozilla.org/integration/gaia-central/rev/dc3f9ab26dc7
Author: James Lal <james@lightsofapollo.com>
Desc: vbump marionette
2013-08-09 10:05:25 -07:00
Gregor Wagner
ff45489941
Bug 902899 - Fix ContentPermission Prompt. r=etienne
2013-08-09 19:02:33 +02:00
Fabrice Desré
e0ee8135f5
Bug 902362 - DOMRequestHelper specifies _requests as array, but should be object. r=fabrice
2013-08-09 09:32:02 -07:00
Gaia Pushbot
42e5220348
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f970557b626a
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 902973 - REAPPLY Disable sms notification_test.js for frequent TBPL orange, a=test-only
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
========
https://hg.mozilla.org/integration/gaia-central/rev/2d0fff56e4df
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #11352 from epang/bug901500_email_missing_images
Bug 901500 - Adding Missing Email Images r=samjoch
========
https://hg.mozilla.org/integration/gaia-central/rev/77172567ba5a
Author: Eric Pang <epang@mozilla.com>
Desc: Bug 901500 - Adding Missing Email Images
2013-08-09 07:50:26 -07:00
Gaia Pushbot
14da4edc5c
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3386bba33a11
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #11350 from epang/bug901499_cameragraphicsswap
Bug 901499 - Swap Camera Graphics r=samjoch
========
https://hg.mozilla.org/integration/gaia-central/rev/c691ba73a9ae
Author: Eric Pang <epang@mozilla.com>
Desc: Bug 901499 - Swap Camera Graphics
2013-08-09 07:25:25 -07:00
Gaia Pushbot
c3eede9450
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/55a28af01d44
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #11425 from comoyo/mozContacts2vcard
Bug 896982: Design and implement a component to transform mozContacts to VCARD format [r=arcturus]
========
https://hg.mozilla.org/integration/gaia-central/rev/d409de36cf9f
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Design and implement a component to transform mozContacts to VCARD format
2013-08-09 05:00:24 -07:00
Carsten "Tomcat" Book
597c138d2f
merge mozilla-central to b2g-inbound
2013-08-09 13:15:45 +02:00