Commit Graph

206412 Commits

Author SHA1 Message Date
L. David Baron
f3abc661fc Bug 1064636 followup: Add new function to config/external/nss/nss.def r=khuey a=bustage CLOSED TREE 2014-09-23 14:16:56 -07:00
Kai Engert
4a987a063b Bug 1064636, upgrade to NSS 3.17.1 release, r=rrelyea, a=lmandel 2014-09-23 21:28:23 +02:00
Tim Taubert
ff8ca2f593 merge m-c to fx-team; a=merge 2014-09-23 15:52:45 +02:00
Ed Morley
7145df0d5e Merge latest green b2g-inbound changeset and mozilla-central; a=merge 2014-09-23 14:36:11 +01:00
Yoshi Huang
6b66ccbb04 Bug 1066570 - b2g NFC uninitialized memory bug. r=dimi
From 1ffa3080ca8b3ac70564734cd02cae72fddf730c Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcMessageHandler.cpp | 3 +++
 1 file changed, 3 insertions(+)
2014-09-23 12:50:21 +08:00
B2G Bumper Bot
7998b5e4a2 Bumping manifests a=b2g-bump 2014-09-23 03:58:35 -07:00
dlee
9506b9ef6f Bug 1061512 - [NFC] nfcd should notify gecko about NDEF information. r=allstars.chh 2014-09-23 18:53:41 +08:00
B2G Bumper Bot
aee3c823b0 Bumping manifests a=b2g-bump 2014-09-23 03:47:01 -07:00
B2G Bumper Bot
2706ab74b3 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6890cdf5807b
Author: Yi-Fan Liao <yliao@mozilla.com>
Desc: Merge pull request #23993 from begeeben/1051100_multiple_lines_are_displayed

Bug 1051100 - [B2G] [Homescreen] Multiple lines are displayed when moving apps to the bottom of the Homescreen, r=Chris

========

https://hg.mozilla.org/integration/gaia-central/rev/12088d6099b0
Author: Yi-Fan Liao <begeeben@gmail.com>
Desc: Bug 1051100 - [B2G] [Homescreen] Multiple lines are displayed when moving apps to the bottom of the Homescreen

* Before adding a horizontal divider in edit mode on the vertical homescreen, check if one is needed.

========

https://hg.mozilla.org/integration/gaia-central/rev/4f1446fad1de
Author: Min-Zhong "John" Lu <jlu@mozilla.com>
Desc: Merge pull request #24205 from mnjul/bug_1067264_remove_blur_delay_kb_app

Bug 1067264 - Remove delay of layout/IME deactivation in built-in keyboard app as a follow-up of bug 1057898. r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/c4d96f9b65c6
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1067264 - Remove delay of layout/IME deactivation in built-in keyboard app as a follow-up of bug 1057898

- The need for delaying deactivation is no longer needed after bug 1057898 and bug 1067266.
- StateManager.DEACTIVATE_DELAY is removed.
- In deactivation, propogatation the triggering of setTimeout callback (of the delay), in forms of resolution of Promises, is removed. Async codes made into sync codes.
- Unit test cases regarding rapid activation after deactivation, and vice versa, are removed, since the behavior should now be guarded by Gecko.
2014-09-23 03:40:45 -07:00
B2G Bumper Bot
990dc7396c Bumping manifests a=b2g-bump 2014-09-23 03:01:55 -07:00
B2G Bumper Bot
961d307247 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/12d5e1052238
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #24275 from azasypkin/bug-1070890-compose-event-dispatcher

Bug 1070890 - [Messages][Refactoring] Make use of EventDispatcher in Compose. r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/7f0b094f53e0
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1070890 - [Messages][Refactoring] Make use of EventDispatcher in Compose. r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/98b8780b730e
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #24181 from bebef1987/camera1

Bug 1068722 - Update camera tests to check if the switch source action h...

========

https://hg.mozilla.org/integration/gaia-central/rev/46a00019791b
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 1068722 - Update camera tests to check if the switch source action had happen
2014-09-23 02:55:45 -07:00
B2G Bumper Bot
aa17c55380 Bumping manifests a=b2g-bump 2014-09-23 01:52:30 -07:00
B2G Bumper Bot
de9af52661 Bumping manifests a=b2g-bump 2014-09-23 01:17:03 -07:00
B2G Bumper Bot
474f4b9ea8 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/56f30855d90b
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1063685 - Fix lookup for browser windows. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/63462de4a73d
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #24187 from albertopq/1068659-circle-icon

Bug 1068659 - Resizing no-data icon r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/6ddc318ed89c
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1068659 - Resizing no-data icon
2014-09-23 01:10:48 -07:00
B2G Bumper Bot
fbb4eb20a3 Bumping manifests a=b2g-bump 2014-09-23 00:47:03 -07:00
B2G Bumper Bot
803450b66f Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d8ffaf73741f
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #24176 from ADLR-es/bug-ice-test

Bug 1069242 - [Contacts] Missing test in bug 1062168

========

https://hg.mozilla.org/integration/gaia-central/rev/7726bed7db56
Author: Adrián de la Rosa <hola@adlr.es>
Desc: Bug 1069242 - [Contacts] Missing test in bug 1062168

========

https://hg.mozilla.org/integration/gaia-central/rev/5d95ab1d6412
Author: Albert <alberto.crespellperez@telefonica.com>
Desc: Merge pull request #24215 from acperez/bug-1067294

Bug 1067294 - Remove wrong PIN popup and show error in the form. r=gsvelto

========

https://hg.mozilla.org/integration/gaia-central/rev/67c54aa26dc9
Author: Albert <alberto.crespellperez@telefonica.com>
Desc: Bug 1067294 - Remove wrong PIN popup and show error in the form. r=gsvelto
2014-09-23 00:40:49 -07:00
B2G Bumper Bot
32b5c77afc Bumping manifests a=b2g-bump 2014-09-23 00:31:56 -07:00
B2G Bumper Bot
db24b3bb28 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1061444 - Keep the iccids and restore the apn settings when necessary r=eragonj

========

https://hg.mozilla.org/integration/gaia-central/rev/2c504a167cfc
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1061444 - Keep the iccids and restore the apn settings when necessary
2014-09-23 00:25:46 -07:00
B2G Bumper Bot
70c867b981 Bumping manifests a=b2g-bump 2014-09-23 00:17:02 -07:00
B2G Bumper Bot
ccacfd4303 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4836ca6b14f0
Author: chirarobert <robert.chira@softvision.ro>
Desc: Merge pull request #24300 from bebef1987/skip_ftu

Bug 1071089 - Skip test_ftu_with_tour because of Bug 1065933

========

https://hg.mozilla.org/integration/gaia-central/rev/d210619008be
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 1071089 - Skip test_ftu_with_tour because of Bug 1065933
2014-09-23 00:10:47 -07:00
B2G Bumper Bot
c7aedfddfd Bumping manifests a=b2g-bump 2014-09-22 23:31:58 -07:00
B2G Bumper Bot
a15eab39fb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/608b18f6b4eb
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #24199 from snowmantw/issue1065262

Bug 1065262 - [Lockscreen] No action is triggered on notification in loc...

========

https://hg.mozilla.org/integration/gaia-central/rev/bafb1447a8ab
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1065262 - [Lockscreen] No action is triggered on notification in lock screen with passcode enabled
2014-09-22 23:25:49 -07:00
B2G Bumper Bot
a343948144 Bumping manifests a=b2g-bump 2014-09-22 23:17:03 -07:00
B2G Bumper Bot
70e340c752 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/729f7f9da5e7
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #24043 from luke-chang/1043682_sms_caret_glitch

Bug 1043682 - Caret positioning glitch after deleting a saved draft, r=azasypkin

- keep one <BR> at the end of a content-editable element whenever moving the cursor.

========

https://hg.mozilla.org/integration/gaia-central/rev/1f45764b10f0
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 1043682 - Caret positioning glitch after deleting a saved draft
2014-09-22 23:10:48 -07:00
B2G Bumper Bot
4158cf6dd2 Bumping manifests a=b2g-bump 2014-09-22 22:17:03 -07:00
B2G Bumper Bot
d9492d355c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d703d3675227
Author: Min-Zhong "John" Lu <jlu@mozilla.com>
Desc: Merge pull request #24285 from mnjul/bug_1060541_lckscr_noti_scrolling_hvga_for_1038723

Bug 1060541 - Add 1 additional notification to lockscreen with new music player by bug 1038723. r=gweng

========

https://hg.mozilla.org/integration/gaia-central/rev/0947529c65eb
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1060541 - Add 1 additional notification to lockscreen with new music player by bug 1038723

- Also, remove the top-mask (implemented in bug 1023500) when the visually top notification in the notifications container viewport is being actioned upon.
2014-09-22 22:10:47 -07:00
B2G Bumper Bot
a2f99e41f5 Bumping manifests a=b2g-bump 2014-09-22 21:31:57 -07:00
B2G Bumper Bot
d70261baf4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/75778dc289e2
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #24277 from evanxd/bug-1045330

Bug 1045330 - Go to virtual environment with correct path r=lightsofapollo

========

https://hg.mozilla.org/integration/gaia-central/rev/56c0c07b33c9
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 1045330 - Go to virtual environment with correct path
2014-09-22 21:25:47 -07:00
B2G Bumper Bot
69f55c5b02 Bumping manifests a=b2g-bump 2014-09-22 20:31:57 -07:00
B2G Bumper Bot
9f0467bdfb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ed6e4ef9cace
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #24253 from gasolin/issue-1068030

Bug 1068030 - Time format is not set to a proper default locale value, r=sfoster

========

https://hg.mozilla.org/integration/gaia-central/rev/552eb6d82422
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1068030 - Time format is not set to a proper default locale value
2014-09-22 20:25:46 -07:00
B2G Bumper Bot
7f5b5f9a9c Bumping manifests a=b2g-bump 2014-09-22 20:01:57 -07:00
B2G Bumper Bot
506a423632 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7beabef71045
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #24268 from sudheesh001/Patch_1061516

Fixes Bug 1061516 , jshint error in tests/atoms/accessiblity.js r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/52dd0dc84242
Author: sudheesh001 <sudheesh1995@outlook.com>
Desc: Fixes Bug 1061516 , jshint error in tests/atoms/accessiblity.js

========

https://hg.mozilla.org/integration/gaia-central/rev/579cee46a2e4
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #24267 from sudheesh001/Patch_1057770

Fixes Bug 1057770 - fixes jshint in tests/integration/devtools/server_test r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/e7e8c96cf3d3
Author: sudheesh001 <sudheesh1995@outlook.com>
Desc: Fixes Bug 1057770 - fixes jshint in tests/integration/devtools/server_test.js
2014-09-22 19:55:47 -07:00
B2G Bumper Bot
f94df440c0 Bumping manifests a=b2g-bump 2014-09-22 19:37:36 -07:00
B2G Bumper Bot
f767beb3e6 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b6d37e5c694a
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #23789 from TheoChevalier/bug1064065-remove-strings

Bug 1064065 - Trailing strings when removing account or deleting message... r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/4798bc4ea088
Author: TheoChevalier <theo.chevalier11@gmail.com>
Desc: Bug 1064065 - Trailing strings when removing account or deleting messages

========

https://hg.mozilla.org/integration/gaia-central/rev/1856448ec83e
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #23788 from TheoChevalier/bug1064065-trailing-strings

Bug 1064065 - Trailing strings when removing account or deleting message... r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/eb1b90674a7a
Author: TheoChevalier <theo.chevalier11@gmail.com>
Desc: Bug 1064065 - Trailing strings when removing account or deleting messages
2014-09-22 19:35:47 -07:00
Wes Kocher
938a04e36d Merge m-c to b-i a=merge 2014-09-22 19:06:28 -07:00
B2G Bumper Bot
8ee68ed20a Bumping manifests a=b2g-bump 2014-09-22 19:01:59 -07:00
B2G Bumper Bot
7152be65d5 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/31aaeec3cc38
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #24019 from rsajdok/bug#1060694-b

Bug 1060694 - Next button stays active even after clearing the text field r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/b6221691814d
Author: Robert Sajdok <robert.sajdok@gmail.com>
Desc: Bug 1060694 - Next button stays active even after clearing the text fields during New Account setup

========

https://hg.mozilla.org/integration/gaia-central/rev/408b3209ba26
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #24238 from asutherland/email-trunk-zoom-mitigate

Bug 1058900 - [email] Workaround graphics corruption / memory spikes by cleaning up HTML display logic. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/e44d00a5e9c6
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1058900 - [email] Workaround graphics corruption / memory spikes by cleaning up HTML display logic. r=jrburke
2014-09-22 18:55:47 -07:00
Wes Kocher
db90cdf36a Merge inbound to m-c a=merge 2014-09-22 18:54:14 -07:00
Thomas Zimmermann
dd472ebd15 Bug 1065897: Updating CLOBBER, r=btian 2014-09-23 09:44:42 +08:00
Thomas Zimmermann
8074617ee6 Bug 1065897: Distribute Bluetooth HAL implementation among multiple files (unter bluetooth2/), r=btian
The files BluetoothHALInterface.{cpp,h} are getting too large. This patch
moves helper functions and profile implementations into separate files.
2014-09-23 09:41:57 +08:00
Thomas Zimmermann
c5c045a29c Bug 1065897: Move Bluedroid code out of BluetoothInterface.{cpp,h} (under bluetooth2/), r=btian
This patch moves BluetoothInterface.{cpp,h} to the generic section
of Gecko's Bluetooth code, and the Bluedroid implementation into
the new files BluetoothHalImplementation.{cpp,h}.

BluetoothHalImplementation.{cpp,h} contains all Bluedroid-specific
code. The classes in BluetoothInterface.{cpp,h} are now interfaces
for Gecko.

--HG--
rename : dom/bluetooth2/bluedroid/BluetoothInterface.cpp => dom/bluetooth2/bluedroid/BluetoothHALInterface.cpp
2014-09-23 09:40:36 +08:00
Wes Kocher
bced0f936a Merge b-i to m-c a=merge 2014-09-22 18:39:07 -07:00
B2G Bumper Bot
da82d7210b Bumping manifests a=b2g-bump 2014-09-22 17:57:37 -07:00
Kyle Machulis
17f697e9d6 Bug 1069115 - Make mobileconnection webapi marionette tests wait for transaction success when changing settings; r=vyang
--HG--
extra : rebase_source : d8423024d586f6cf976f05bbfd17664d45ba7bd9
2014-09-22 16:15:09 -07:00
Kyle Machulis
13d0f1a981 Bug 1069115 - Make bluetooth webapi marionette tests wait for transaction success when changing settings; r=echou
--HG--
extra : rebase_source : c4fdc80f904987c848bca4b839d8b3f36fefd667
2014-09-22 16:15:07 -07:00
Nick Thomas
6000a68780 Bug 1055305, update to v180 base image for flame-kk, r=bhearsum 2014-09-23 11:30:31 +12:00
Kyle Machulis
0695d6b3d5 Backing out 6d28e030fd7b (bug 1058180) due to causing crashes on desktop on a CLOSED TREE 2014-09-22 16:01:50 -07:00
B2G Bumper Bot
ac2a359dae Bumping manifests a=b2g-bump 2014-09-22 15:22:02 -07:00
B2G Bumper Bot
806f5322a3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/536a583e498f
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #24272 from hyunacho/bug1067205

Bug 1067205 - [Camera] Not receiving 'visibilitychange' event when devic...

========

https://hg.mozilla.org/integration/gaia-central/rev/afd6e528caa8
Author: hyuna.cho <hyuna.cho@lge.com>
Desc: Bug 1067205 - [Camera] Not receiving 'visibilitychange' event when device is locked
2014-09-22 15:15:52 -07:00
Kyle Machulis
13cbe85c1e Bug 1058180 - Only create app migrator when absolutely needed; r=fabrice 2014-09-22 14:45:39 -07:00