Commit Graph

186816 Commits

Author SHA1 Message Date
Wes Kocher
002fd7dc61 Merge inbound to m-c a=merge 2014-06-05 18:31:10 -07:00
Wes Kocher
9ae67107e8 Backed out changeset 8b809afd1cea (bug 1021258) for Android m8 bustage on a CLOSED TREE 2014-06-05 18:23:22 -07:00
Ryan VanderMeulen
d6dfae1a05 Bug 1021287 - Update NSPR to 4.10.6 RTM. r=kaie, a=me 2014-06-05 18:00:11 -04:00
Dave Hylands
c074414a61 Bug 986331 - Enable .3g2 file extension to be recognized as 3gpp video. r=cajbir 2014-06-05 14:22:15 -07:00
B2G Bumper Bot
9b3b27f8c3 Bumping manifests a=b2g-bump 2014-06-05 13:58:10 -07:00
B2G Bumper Bot
f6cb06ac68 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e32dee285e41
Author: gitmai <mri@tid.es>
Desc: Merge pull request #19483 from gitmai/bug-1007591-sms-iac-costcontrol

Bug 1007591 - [SMS] Make SMS react upon the IAC broadcast from Cost Cont...
r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/3a178796d8f7
Author: mai <mri@tid.es>
Desc: Bug 1007591 - [SMS] Make SMS react upon the IAC broadcast from Cost Control application to friendly mute Cost Control specific SMS
2014-06-05 13:56:10 -07:00
Lucas Rocha
e8bb31c1f5 Bug 997765 - Change bg color and image for blank spots in top sites (r=mfinkle) 2014-06-05 21:54:23 +01:00
Lucas Rocha
4d0ab0b1d2 Bug 997765 - Define initial list of suggested sites (r=mfinkle) 2014-06-05 21:54:23 +01:00
B2G Bumper Bot
f208401b3f Bumping manifests a=b2g-bump 2014-06-05 13:43:10 -07:00
B2G Bumper Bot
e8c960d945 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c699b0d240bc
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Re-land pull request #19770 from tauzen/Bug1017572 since it wasn't at fault for Gaia unit test failures.

This reverts commit 4152286b9cbadaa8fe2fecfa82226e99ae41a679.

========

https://hg.mozilla.org/integration/gaia-central/rev/ddf4f13d37c9
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #19912 from kamituel/Bug_1019169_byte_str_conv"

This reverts commit 0f5dc07363da7a3f27e3ad5f1f7f957265e79bd8, reversing
changes made to 763b7f62805570b1606b8738075318020af3fa7d.
2014-06-05 13:40:47 -07:00
B2G Bumper Bot
f86e11ecd9 Bumping manifests a=b2g-bump 2014-06-05 13:36:32 -07:00
B2G Bumper Bot
848bc951d2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6a632010d018
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #18790 from stasm/1003191-fl-ready

Bug 1003191 - Use mozL10n.once in the fl app. r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/8ee527ca50c3
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1003191 - Use mozL10n.once in the fl app. r=djf
2014-06-05 13:31:08 -07:00
Ryan VanderMeulen
f79d7ed326 Bug 989276 - Touch CLOBBER to reopen the CLOSED TREE. 2014-06-05 16:30:02 -04:00
B2G Bumper Bot
3e5e8d5d5d Bumping manifests a=b2g-bump 2014-06-05 12:56:23 -07:00
B2G Bumper Bot
a0c4175405 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b7e1a02be1b6
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #19770 from tauzen/Bug1017572"

This reverts commit e794eeb8dcb308cd7b1580717ef38e2880987634, reversing
changes made to f6b5f77d47d103c672be388082f04709ccdf7f08.
2014-06-05 12:50:55 -07:00
B2G Bumper Bot
ca57905cc6 Bumping manifests a=b2g-bump 2014-06-05 12:41:36 -07:00
B2G Bumper Bot
29cdbd0b23 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1fd3f3b1bf97
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #19943 from millermedeiros/1019617-week-view-am-pm

Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/4a2ab6bd3c7e
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales
2014-06-05 12:36:11 -07:00
B2G Bumper Bot
e7ca5e8be2 Bumping manifests a=b2g-bump 2014-06-05 12:11:36 -07:00
B2G Bumper Bot
3838800612 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c89138fb9550
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #20033 from eeejay/bug-1020605"

This reverts commit 763b7f62805570b1606b8738075318020af3fa7d, reversing
changes made to e794eeb8dcb308cd7b1580717ef38e2880987634.
2014-06-05 12:05:46 -07:00
B2G Bumper Bot
0c85d5b773 Bumping manifests a=b2g-bump 2014-06-05 11:58:36 -07:00
B2G Bumper Bot
c7231b857e Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9aae77d344a6
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #20029 from davidflanagan/bug1020002

Bug 1020002: don't allow an activity choice that could subvert forward-lock

========

https://hg.mozilla.org/integration/gaia-central/rev/06b8d0d4a71d
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1020002: don't allow an activity choice that could subvert forward-lock

address review comments

========

https://hg.mozilla.org/integration/gaia-central/rev/af54dd4f7858
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #18584 from stasm/1000130-gallery-ready

Bug 1000130 - Clean up bootstrap mozL10n API use in Gallery. r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/1109f8599ca9
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1000130 - Clean up bootstrap mozL10n API use in Gallery. r=djf
2014-06-05 11:56:10 -07:00
B2G Bumper Bot
f3b8d70c0c Bumping manifests a=b2g-bump 2014-06-05 11:43:11 -07:00
B2G Bumper Bot
0de0915453 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e84536460d28
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #20074 from benfrancis/1020403

Bug 1020403 - Change button type to button to prevent click event on submit r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/4d7aa0a2b08f
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 1020403 - Change button type to button to prevent click event on submit

========

https://hg.mozilla.org/integration/gaia-central/rev/e292f82e1e24
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20066 from lanker-sony/splash-icon-uri

Bug 1020903 - Missing splash icon when an application is hosted via https

========

https://hg.mozilla.org/integration/gaia-central/rev/d7339e13fdc0
Author: Fredrik Lanker <fredrik.lanker@sonymobile.com>
Desc: Bug 1020903 - Missing splash icon when an application is hosted via https

With the way the URI was constructed before, if https was used with
default port, a.port would be empty and port 80 would wrongly be used.
Instead, we now use the origin as it is.
2014-06-05 11:41:12 -07:00
B2G Bumper Bot
6e5ab5b736 Bumping manifests a=b2g-bump 2014-06-05 11:18:26 -07:00
B2G Bumper Bot
3b0842e360 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/760d7ac20f72
Author: Fernando Campo <fernando.campo@telefonica.com>
Desc: Merge pull request #20027 from fcampo/fb-notif-api-948447

Bug 948447 - Convert Facebook to new Notification API (r=jmcf)

========

https://hg.mozilla.org/integration/gaia-central/rev/5d55f116490a
Author: Fernando Campo <fernando.campo@telefonica.com>
Desc: Bug 948447 - Convert Facebook to new Notification API
2014-06-05 11:16:19 -07:00
B2G Bumper Bot
c171f36ef4 Bumping manifests a=b2g-bump 2014-06-05 11:06:18 -07:00
B2G Bumper Bot
1a29f9868a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a167b4e898b1
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #19757 from sharaf-tir/Bug_1013764_Include_the_screen_dimming_time_also_in_Screen_time_out

Bug 1013764 - [System] Include the screen dimming time also in Screen ti...

========

https://hg.mozilla.org/integration/gaia-central/rev/04cdef35a5b7
Author: sharfudheen.parambil <sharfudheen.parambil@lge.com>
Desc: Bug 1013764 - [System] Include the screen dimming time also in Screen time out.
2014-06-05 11:01:16 -07:00
Markus Stange
17696ca2b3 Bug 1021044 - Fix Metro build. r=masayuki, a=npotb DONTBUILD 2014-06-05 18:39:38 +02:00
Gijs Kruitbosch
2868130b21 Bug 1015617 - listen for hiding the panel immediately, r=mikedeboer 2014-06-05 16:02:58 +01:00
Michael Comella
9e7d5d7473 Bug 1019595 - Use light cancel edit button with dark lightweight themes. r=bnicholson
--HG--
rename : mobile/android/base/resources/drawable-hdpi/close_edit_mode.png => mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.png
rename : mobile/android/base/resources/drawable-mdpi/close_edit_mode.png => mobile/android/base/resources/drawable-mdpi/close_edit_mode_light.png
rename : mobile/android/base/resources/drawable-xhdpi/close_edit_mode.png => mobile/android/base/resources/drawable-xhdpi/close_edit_mode_light.png
2014-06-05 11:58:17 -07:00
Richard Newman
6c61a98a27 Bug 1014242 - Delay loading of distribution quickshare lists. r=wesj 2014-06-05 11:33:52 -07:00
Carsten "Tomcat" Book
b4355f84da merge fx-team to mozilla-central a=merge 2014-06-05 15:08:55 +02:00
Carsten "Tomcat" Book
4cdea9d7c7 merge b2g-inbound to mozilla-central a=merge
--HG--
extra : amend_source : ad8bcefd86ba5855cbe5b98b7211a09d2a14e5b2
2014-06-05 14:37:37 +02:00
Carsten "Tomcat" Book
326e3bfa88 Backed out changeset ccc885c8f4ac (bug 1003159) for causing test failures in mochitest-other on a CLOSED TREE 2014-06-05 09:32:19 +02:00
Carsten "Tomcat" Book
e4f119abd6 Merge mozilla-central to mozilla-inbound on a CLOSED TREE
--HG--
extra : amend_source : df59c11ce430786cf326f237451a2c769f709cd5
2014-06-05 09:03:12 +02:00
Carsten "Tomcat" Book
369ae9d73c Backed out changeset 52068b669c2a (bug 911209) for causing type errors in tests 2014-06-05 08:55:26 +02:00
B2G Bumper Bot
b1a2d5a5f8 Bumping manifests a=b2g-bump 2014-06-04 23:28:29 -07:00
B2G Bumper Bot
9c39cf40cc Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c3d40600c009
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #20009 from pivanov/bug-1020228

Bug 1020228 - [Lockscreen] - @2.25x icon scale

========

https://hg.mozilla.org/integration/gaia-central/rev/5b6359112458
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1020228 - [Lockscreen] - @2.25x icon scale
2014-06-04 23:28:19 -07:00
Vicamo Yang
8a0f8be05f Bug 1019358 - 2/2: test cases. r=sku 2014-06-05 14:27:31 +08:00
ming.li
6a2ae147c0 Bug 1019358 - 1/2: [dolphin] unable to activate PDP for some specific SIM. r=vicamo
follow spec TS 31.102 4.2.18 EFAD and check mncLength
2014-06-05 14:27:27 +08:00
Wes Kocher
a0fb5a53d9 Backed out 13 changesets (bug 987111) for disagreeing with some patch from b-i or fx-team in tonight's merge to hopefully fix a CLOSED TREE
Backed out changeset d4e390ceac27 (bug 987111)
Backed out changeset 5f88b5ef9496 (bug 987111)
Backed out changeset cdfd24ddf448 (bug 987111)
Backed out changeset 7883150e5471 (bug 987111)
Backed out changeset 407c7ca82ada (bug 987111)
Backed out changeset e7140ccf7e09 (bug 987111)
Backed out changeset 0a4d18d6306f (bug 987111)
Backed out changeset e7b7548867d9 (bug 987111)
Backed out changeset 944d128f135a (bug 987111)
Backed out changeset 33860f30fc4f (bug 987111)
Backed out changeset 518a915fb81b (bug 987111)
Backed out changeset 7576a51cf72e (bug 987111)
Backed out changeset 1a8dc1af9de6 (bug 987111)
2014-06-04 22:12:50 -07:00
Wan-Teh Chang
ec2bea3335 Revert 8406a2b981c5 to fix build bustage.
> Bug 1020695: Update Mozilla to use NSS 3.16.2 Beta 3. Includes fixes for
> bug 1013088, bug 996237, bug 970539, bug 1016567, bug 485732, bug 334013,
> bug 959864, bug 1016836, bug 1016811, bug 1018536, bug 996250, bug 1009227,
> bug 963150.
2014-06-04 21:26:33 -07:00
Daniel Holbert
db941b5d80 Bug 864005: Remove mentions of & checks for 'layout.css.supports-rule.enabled' pref. r=heycam r=khuey 2014-06-04 21:07:07 -07:00
Wan-Teh Chang
9939efaa7f Bug 1020695: Update Mozilla to use NSS 3.16.2 Beta 3. Includes fixes for
bug 1013088, bug 996237, bug 970539, bug 1016567, bug 485732, bug 334013,
bug 959864, bug 1016836, bug 1016811, bug 1018536, bug 996250, bug 1009227,
bug 963150.
2014-06-04 21:03:47 -07:00
David Zbarsky
6465ff0bc5 Bug 1015433: Backout bug 828169 for regressing text editing 2014-06-04 23:51:34 -04:00
Mike Connor
2b36c68202 Bug 1003159 - Default the updater to downloading the entire update at once for Nightly/Aurora, r=rstrong
--HG--
extra : rebase_source : b02d9fc4717817e57c50e2149cbbeaba05097a30
2014-06-04 23:00:32 -04:00
Masayuki Nakano
ef3e68e608 Bug 1008772 part.3 Fix new orages caused by tabbrowser consuming some key events at keydown r=smaug 2014-06-05 11:57:54 +09:00
Masayuki Nakano
0411f430c3 Bug 1008772 part.2 Add tests for tabbrowser key navigation which isn't blocked by content r=enndeakin 2014-06-05 11:57:53 +09:00
Masayuki Nakano
40183ff283 Bug 1008772 part.1 tabs should handle non-printable keys with keydown event handlers in the system group rather than keypress event handlers in the normal group r=smaug+enndeakin 2014-06-05 11:57:53 +09:00
Boris Zbarsky
6773e49e35 Bug 1019163. Hold a weak ref to the principal in AutoEntryScript, to reduce call overhead. r=bholley 2014-06-04 22:48:06 -04:00