Commit Graph

135049 Commits

Author SHA1 Message Date
Chris Peterson
0f2079de09 Back out changeset bc4c43776396 (Bug 883501) for landing on wrong branch 2013-06-17 22:40:38 -07:00
Chris Peterson
77b9f84132 Back out changeset 1b201503737b (Bug 883729) for landing on wrong branch 2013-06-17 22:43:59 -07:00
Chris Peterson
8c66b3c1e9 Bug 883729 - Fix -Wnull-conversion warnings in xpcom. r=bsmedberg 2013-06-13 20:57:47 -07:00
Chris Peterson
f099a90a5a Bug 883501 - Fix -Wreorder warning in xpcom/base/nsConsoleMessage.cpp. r=msucan 2013-06-13 20:46:23 -07:00
Ryan VanderMeulen
f14d23befd Merge inbound and m-c. 2013-06-17 19:23:03 -04:00
Ryan VanderMeulen
030072b2ab Merge birch and m-c. 2013-06-17 19:21:08 -04:00
Gaia Pushbot
1c85631a8f Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/36f36185e7c0
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #10005 from pivanov/bug-844575

Bug 844575 - [BB][headers] - skin-organic and skin-dark have visual discrepancies

========

https://hg.mozilla.org/integration/gaia-central/rev/2a76a16639af
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 844575 - [BB][headers] - skin-organic and skin-dark have visual discrepancies
2013-06-17 12:31:21 -07:00
Boris Zbarsky
1b44ea95e0 Back out revision 43927377e41c (bug 870787) and revision 25126626dd43 (bug 879319) for failing tests and contributing to a CLOSED TREE. 2013-06-17 14:54:24 -04:00
Gaia Pushbot
8b48c382a3 Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/3f46a8ef8ce5
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Restores 880628 test

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/79cb4ffcbf1e
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 881248 - [MMS] Multirecipient. A contact with >1 number must only render the relevant number (vs. rendering all) r=julienw

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/61155597842f
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 883732 - Fix SMS tests r=gnarf

* Wrap the code inside the `done` callback
* use an height of 100px instead of 50px to trigger multiline mode
* use this.sinon instead of sinon to ensure correct restore
2013-06-17 11:31:22 -07:00
Gaia Pushbot
0bc63ba787 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/a35c48a2747d
Author: Mike Pennisi <mike@mikepennisi.com>
Desc: Bug 883309 - [MMS] Participants' names are double-escaped r=gnarf37
2013-06-17 11:01:21 -07:00
Gaia Pushbot
b20feae20c Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/cd25e6363bb5
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Fix merge conflict from Bug 880628

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-06-17 10:22:12 -07:00
Ehsan Akhgari
db908507fc Backed out changeset 07708c9fc5ef (bug 883010) because of test failures
Landed on a CLOSED TREE
2013-06-17 13:13:08 -04:00
Gaia Pushbot
be0e3eeb6c Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/c050031e72dc
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 880628 - [MMS/SMS] Multi-recipient. Allow manual entry of duplicate recipients r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=880628
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-06-17 10:12:07 -07:00
Gaia Pushbot
481403fab7 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d85718bf99a7
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #10273 from masap/20130608

Bug 880919 - [WiFi] Use shared code for settings and FTU (r=fcampo,arthurcc)

========

https://hg.mozilla.org/integration/gaia-central/rev/6d06dc90a5b7
Author: Masashi Honma <masashi.honma@gmail.com>
Desc: Bug 880919 - [WiFi] Use shared code for settings and FTU
2013-06-17 10:11:45 -07:00
Andrea Marchesini
11278def17 Bug 879319 - implement past names map in HTMLFormElement, r=bz 2013-06-17 13:07:04 -04:00
Andrea Marchesini
1b3514dbdf Bug 870787 - Improve named getter for form, r=bz 2013-06-17 13:07:04 -04:00
Gaia Pushbot
05f69aae49 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/4ff2ffcc800a
Author: Julien Wajsberg <felash@gmail.com>
Desc: Revert "Bug 883732 - Fix SMS tests r=gnarf"

This reverts commit 54790a2d383389eb569674d8808c3feb362a76ab.
2013-06-17 10:01:41 -07:00
Gaia Pushbot
6de4b73f47 Bumping gaia.json for 1 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/8ad80191d0fa
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 883732 - Fix SMS tests r=gnarf

* Wrap the code inside the `done` callback
* use an height of 60px instead of 50px to trigger multiline mode
* use this.sinon instead of sinon to ensure correct restore
* fix long-standing linter problem
2013-06-17 10:01:21 -07:00
Gregory Szorc
61409d6ee7 Bug 872231 - Bootstrapper ensures Python 2.7.3 and Mercurial 2.5 are installed; r=ted
DONTBUILD (NPOTB)
2013-06-17 09:51:40 -07:00
Gaia Pushbot
1ecf57bcf1 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/098dd6f93040
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #10432 from RudyLu/value_selector/Bug883751-correct_time_format

Bug 883751 - Correctly format time as HH:MM for time picker. r=ian-liu.

========

https://hg.mozilla.org/integration/gaia-central/rev/15130ee05746
Author: Rudy Lu <left.lu@gmail.com>
Desc: Bug 883751 - Correctly format time as HH:MM for time picker
2013-06-17 03:59:51 -07:00
Gaia Pushbot
c2a555b7b8 Bumping gaia.json for 6 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/bf2ec25887d0
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #9561 from pivanov/bug-863320

Bug 863320 - Accept Bluetooth File Transfer Screen Updates r=@samjoch

========

https://hg.mozilla.org/integration/gaia-central/rev/6c96bd83c3d7
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 863320 - Accept Bluetooth File Transfer Screen Updates

========

https://hg.mozilla.org/integration/gaia-central/rev/c5f1f31d0fd8
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10431 from fortdam/master

Bug 881124 - [Buri]Wi-Fi did not disable immediately, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/94b31e2b7dac
Author: dltang <zhiming.tang@tcl.com>
Desc: Bug 881124 - [Buri]Wi-Fi did not disable immediately

========

https://hg.mozilla.org/integration/gaia-central/rev/d26ae66d088b
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #10280 from pivanov/bug-835887

Bug 835887 - [Calendar UX VD] "Remove account" overlay button should be red r=@samjoch

========

https://hg.mozilla.org/integration/gaia-central/rev/f221dd47c940
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 835887 - [Calendar UX VD] "Remove account" overlay button should be red
2013-06-17 03:59:30 -07:00
Gaia Pushbot
bd4b36adca Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/5c5b0519cd55
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10426 from crh0716/873917_v1

Bug 873917 - Use new request pairing message

========

https://hg.mozilla.org/integration/gaia-central/rev/560bf09b4a05
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 873917 - Use new request pairing message

========

https://hg.mozilla.org/integration/gaia-central/rev/3207ba05591c
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #10164 from crdlc/bug-878732

Bug 878732 - Homescreen gets stuck between everything.me screen and time...

========

https://hg.mozilla.org/integration/gaia-central/rev/741be7a8511c
Author: crdlc <crdlc@tid.es>
Desc: Bug 878732 - Homescreen gets stuck between everything.me screen and time display
2013-06-17 03:59:09 -07:00
Gaia Pushbot
0c4dd54696 Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/80d3aeb22459
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #10328 from pivanov/bug-880240

Bug 880240 - Update Firefox Logo on device r=@samjoch

========

https://hg.mozilla.org/integration/gaia-central/rev/8d32670692e9
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 880240 - Update Firefox Logo on device

========

https://hg.mozilla.org/integration/gaia-central/rev/1914e0629cf9
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Revert "Bug 863167 - replace "if (this.result)" by "if (!this.done)" in the MessageManager's cursor code (r=julienw)"

This reverts commit cd662bb810244f14171a754def91f1f49a2ec44f.
2013-06-17 03:46:42 -07:00
Gaia Pushbot
101314281b Bumping gaia.json for 1 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/5ead22f78b5d
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Bug 863167 - replace "if (this.result)" by "if (!this.done)" in the MessageManager's cursor code (r=julienw)
2013-06-17 03:46:22 -07:00
Ed Morley
89fccf80ac Merge mozilla-central and birch 2013-06-17 09:36:25 +01:00
Ed Morley
6663450684 Merge latest green birch changeset and mozilla-central 2013-06-17 09:35:37 +01:00
Ed Morley
d28ead3633 Merge latest green inbound changeset and mozilla-central 2013-06-17 09:33:03 +01:00
Gaia Pushbot
5930176cd3 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/b0b312ec5126
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10424 from alivedise/bugzilla/883734/lint

Bug 883734 - fix lint error in sound manager, r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/4b11a437322c
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 883734 - fix lint error cause travis red
2013-06-17 01:08:51 -07:00
Gaia Pushbot
4d2bcc2cf7 Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/3f096cb9a6eb
Author: crh0716 <crh0716@gmail.com>
Desc: Revert "Bug 873917 - Use new request confirming message"

This reverts commit 1396db64e4cb54fce9c64d632898663ea4e425e2.

========

https://hg.mozilla.org/integration/gaia-central/rev/0c4f8028fdef
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #10374 from rwldrn/882899

Bug 882899 - [SMS][MMS] Utils.getContactCarrier throws TypeError if tel not found (found is undefined)

========

https://hg.mozilla.org/integration/gaia-central/rev/b9c885ffce98
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 882899 - [SMS][MMS] Utils.getContactCarrier throws TypeError if tel not found (found is undefined)

https://bugzilla.mozilla.org/show_bug.cgi?id=882899
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-06-17 01:08:30 -07:00
Gaia Pushbot
0854c24c1a Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/59a7fe9d041d
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10239 from crh0716/880157

Bug 880157 - Update the name if available

========

https://hg.mozilla.org/integration/gaia-central/rev/451d9b605d6b
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 880157 - Update the name if available
2013-06-17 00:58:37 -07:00
Gaia Pushbot
83fe6ab104 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/c0cf42433864
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10421 from alivedise/bugzilla/796369_master/software-button-manager

Bug 796369 - Software button manager, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/f063ebe77b14
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 796369 - Software button manager
2013-06-17 00:58:15 -07:00
Gaia Pushbot
620e164303 Bumping gaia.json for 2 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/4876e5639f89
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10392 from alivedise/bugzilla/883016/gallery-landscape-quality

Bug 883016 - Set default orientation of wallpaper same as homescreen, r=timdream, a=leo+

========

https://hg.mozilla.org/integration/gaia-central/rev/4a664294c7ff
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 883016 - Set default orientation of wallpaper same as homescreen
2013-06-17 00:46:22 -07:00
Gaia Pushbot
1e78d1c49a Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/3320c4f90ffb
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #9905 from NeerajSeth/bug-817909

[Settings-Phone Lock] "confirm passcode" field accepts invalid entries, ...r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/34b2010670a1
Author: Neeraj Kumar <neeraj_kumar@hcl.com>
Desc: [Settings-Phone Lock] "confirm passcode" field accepts invalid entries, if you previously typed correct value and then backspaced some of it

========

https://hg.mozilla.org/integration/gaia-central/rev/05d8d85f4a15
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10386 from leob2g/Bug_834148_volume_up_key_skips_vibrate_when_moving_up_20130614

Bug 834148 - move from silent to vibrate instead of volume 1 when moving up, r=alive, a=leo+

========

https://hg.mozilla.org/integration/gaia-central/rev/7df2ca443036
Author: hanj.kim <hanj.kim@lge.com>
Desc: Bug 834148 - move from silent to vibrate instead of volume 1 when power up button is pressed on silent
2013-06-16 21:31:42 -07:00
Gaia Pushbot
eb2ac23f5b Bumping gaia.json for 2 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/b406627a0838
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10412 from alivedise/bugzilla/882053/content-channel-should-trigger-vibration-mode

Bug 882053 - Content channel triggers silent mode incorrectly.r=timdream,a=leo+

========

https://hg.mozilla.org/integration/gaia-central/rev/cc24e1635053
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 882053 - Content channel triggers silent mode incorrectly.
2013-06-16 21:31:22 -07:00
Fabrice Desré
932a55f121 Bug 874339 - System Message API: redundant queues are created for the pending "activity" system messages r=gene 2013-06-16 21:16:21 -07:00
Nicholas Nethercote
006d7fcd2f Bug 881579 - Use the canonical #ifndef wrapper form in SpiderMonkey headers so that GCC and clang can avoid including them more than once per compilation unit. r=benjamin.
--HG--
extra : rebase_source : f9d2b33defe07837da4828a57c66fe0ea6772bae
2013-06-16 16:11:24 -07:00
Nicholas Nethercote
d3e40e9f87 Bug 883691 - Fix some simple clang warnings in SpiderMonkey. r=bhackett.
--HG--
extra : rebase_source : 168fe0710a42ebf3f90c14ecb12de32305987586
2013-06-16 18:12:35 -07:00
Gaia Pushbot
04beb77da8 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/98f8d19dee9d
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10261 from crh0716/873917

Bug 873917 - Use new request confirming message

========

https://hg.mozilla.org/integration/gaia-central/rev/14735567926c
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 873917 - Use new request confirming message
2013-06-16 06:16:22 -07:00
Ryan VanderMeulen
aa82b86276 Merge fx-team and m-c. 2013-06-15 21:35:04 -04:00
Ryan VanderMeulen
90792a0ded Merge inbound and m-c. 2013-06-15 21:34:21 -04:00
Ryan VanderMeulen
9829e804a7 Merge birch and m-c. 2013-06-15 21:33:41 -04:00
Dave Camp
584463cee7 Bug 866306 - Add a library to make devtools protocol interaction a bit easier - fix xpcshell tests, r=orange 2013-06-15 12:10:23 -07:00
Phil Ringnalda
f8614f1a0b Back out f691f7abfe33 (No bug) Automated HSTS preload list update that broke HSTS preload 2013-06-15 07:40:53 -07:00
ffxbld
5a8ea7cdb4 No bug, Automated HSTS preload list update from host bld-linux64-ix-037 - a=hsts-update 2013-06-15 03:25:15 -07:00
ffxbld
4e324efbfd No bug, Automated blocklist update from host bld-linux64-ix-004 - a=blocklist-update 2013-06-15 03:23:04 -07:00
Ryan VanderMeulen
2fc043a1b3 Bug 809306 - Fix Win64 bustage. 2013-06-14 22:23:21 -04:00
Ryan VanderMeulen
4a7638e572 Merge m-c and birch. 2013-06-14 21:42:59 -04:00
Kyle Machulis
b49e392f3c Bug 882443: Check for connection before asserting in BluetoothA2dpManager::Disconnect; r=gyeh r=shuang 2013-06-14 18:29:20 -07:00
Ryan VanderMeulen
e7ad8cbf7c Merge birch and m-c. 2013-06-14 21:16:34 -04:00
Gregory Szorc
7295431f2f Bug 883205 - Add mozsystemmonitor to mozbase; r=ahal 2013-06-14 15:15:58 -07:00