Commit Graph

177481 Commits

Author SHA1 Message Date
B2G Bumper Bot
d82ade9006 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b2839ae38bd3
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #17804 from steveck-chung/message-2.25X-image

Bug 983074 - [MADAI][SMS] @2.25x assets update for SMS. r=borja.

========

https://hg.mozilla.org/integration/gaia-central/rev/db94a10c5ee7
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 983074 - [MADAI][SMS] @2.25x assets update for SMS
2014-04-10 04:21:15 -07:00
B2G Bumper Bot
52bd04c6f2 Bumping manifests a=b2g-bump 2014-04-10 03:08:32 -07:00
B2G Bumper Bot
e2ebe5ddd7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/85ce9d1d68fa
Author: Carmen Jiménez <cjc@tid.es>
Desc: Merge pull request #17592 from mcjimenez/bug978785_v2

Bug 978785 - SV: Enable customization during first time to insert a SIM card

========

https://hg.mozilla.org/integration/gaia-central/rev/4ec39e6a2e1d
Author: Carmen Jimenez Cabezas <cjc@tid.es>
Desc: Bug 978785 - SV: Enable customization during first time to insert a SIM card
2014-04-10 03:08:21 -07:00
James Zhang
314ee9d604 Bug 992854 - [tarako] No sound when play some specific m4a music r=kinetik 2014-04-09 18:10:00 +02:00
Ted Clancy (:tedders1)
e51c562ec9 Bug 970303 - Don't call DatabaseInfo::Remove() when app is killed, in case another app is still using the database. r=bent 2014-04-03 16:57:40 -07:00
Jessica Jong
bb6203462b Bug 961921 - Part 2: add data connection tests for DSDS. r=hsinyi 2014-04-09 18:54:00 +02:00
Jessica Jong
9ce98e6211 Bug 961921 - Part 1: separate roaming preference for each client. r=hsinyi 2014-04-08 20:55:00 +02:00
Szu-Yu Chen [:aknow]
56ab53a7ec Bug 993255 - Part 3: Fix related test case. r=hsinyi 2014-04-10 02:06:00 +02:00
Szu-Yu Chen [:aknow]
28141d73a9 Bug 993255 - Part 2: Hangup pending outgoing call. r=hsinyi 2014-04-10 02:06:00 +02:00
Szu-Yu Chen [:aknow]
a3e0395827 Bug 993255 - Part 1: Refactor: extract removeVoiceCall. r=hsinyi 2014-04-10 02:05:00 +02:00
B2G Bumper Bot
186b56d766 Bumping manifests a=b2g-bump 2014-04-10 02:22:50 -07:00
B2G Bumper Bot
60f54dd098 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ba48614feb05
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #18143 from lissyx/bug994262

Bug 994262 - Make sure ModalDialog has title set r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/25dd42e4b5e0
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 994262 - Make sure ModalDialog has title set

========

https://hg.mozilla.org/integration/gaia-central/rev/bfd10421bf85
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #18147 from alivedise/bugzilla/994527/return-self-in-permission-manager-start

Bug 994527 - fix undefined permissionManager, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/53f1f4c19615
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 994527 - Fix undefined permissionManager

========

https://hg.mozilla.org/integration/gaia-central/rev/5225d11e62bb
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps

Bug 987458 - [B2G][Calendar] Only one alarm will fire and only one notif...

========

https://hg.mozilla.org/integration/gaia-central/rev/2c5cb82162fa
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 987458 - [B2G][Calendar] Only one alarm will fire and only one notification displays if there are two events with alarms scheduled to fire at the same time
2014-04-10 02:21:00 -07:00
B2G Bumper Bot
24d58ba118 Bumping manifests a=b2g-bump 2014-04-10 02:11:14 -07:00
B2G Bumper Bot
bf7d9b08eb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/83717add8d30
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #18059 from davidflanagan/camera-preview

Bug 989361: better swipe handling for switching items in preview r=justindarc

========

https://hg.mozilla.org/integration/gaia-central/rev/4ecea1bf7f4e
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bugs 951014, 987569, 989361: better orientation and transitions for preview gallery and pick confirmation views

don't register multiple resize handlers

restore the start and stop methods to lib/orientation.js

fix background color of preview gallery container

make swipe transition in preview gallery velocity sensitive

update tests

handle review comments

add code to remove resize listener in the confirm module
2014-04-10 02:05:43 -07:00
B2G Bumper Bot
1c48115067 Bumping manifests a=b2g-bump 2014-04-10 01:56:18 -07:00
B2G Bumper Bot
1384d3b36a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7ba3a41f4688
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #18144 from rnowm/994498

Bug 994498 - [VR][BB] add white themed spinner to be used in [SMS] r=joan

========

https://hg.mozilla.org/integration/gaia-central/rev/10e02af68d4f
Author: rnowm <arnau@arnaumarch.com>
Desc: Last Comment Bug 994498 - [VR][BB] add white themed spinner to be used in [SMS]
2014-04-10 01:50:48 -07:00
Vincent Chang
cce5b587f4 Bug 993327 - [tarako] unable to enable Data Connect after turning off WIFI. r=chulee 2014-04-10 11:48:50 +08:00
Vincent Chang
c63f2b9b92 Bug 993821 - [Wifi] Event thread is blocked in WaitForEvent caused wifi stay in searching state. r=chulee 2014-04-10 13:52:38 +08:00
B2G Bumper Bot
a490ac909b Bumping manifests a=b2g-bump 2014-04-10 00:51:29 -07:00
B2G Bumper Bot
e5c85f3d04 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/902019d35ed2
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #18108 from julienw/993958-fix-system-test-in-b2g-desktop

Bug 993958 - [System] Fix running the unit tests in B2G Desktop r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/66b1c84e4d51
Author: Julien Wajsberg <julien@mozilla.com>
Desc: Bug 993958 - [System] Fix running the unit tests in B2G Desktop r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/91575c9ee2ef
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #18131 from julienw/987437-fmradio-tests

Bug 987437 - FM Radio Unit Tests fails on B2G Desktop r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/14ce2856fc28
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 987437 - FM Radio Unit Tests fails on B2G Desktop r=timdream

Add a fake mozSettings at global level to prevent init from running at an
awkward moment.
2014-04-10 00:46:10 -07:00
B2G Bumper Bot
ada16ee9ca Bumping manifests a=b2g-bump 2014-04-09 21:01:29 -07:00
B2G Bumper Bot
59c2d0b13c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 949741 - Show/hide supplementary services based on connected network type r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/eba887dbc22e
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 949741 - Show/hide supplementary services based on connected network type
2014-04-09 20:59:49 -07:00
Yoshi Huang
7fb797dee0 Bug 993893 - B2G NFC: NfcManager APIs will also check nfc-write permission. r=dimi 2014-04-09 17:58:28 +08:00
B2G Bumper Bot
1a903206a5 Bumping manifests a=b2g-bump 2014-04-09 19:21:15 -07:00
B2G Bumper Bot
a9620ed953 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/622362e38615
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #17611 from 6a68/bug-987417-fxa-settings-copy-update

Bug 987417 - Update copy in firefox accounts settings app

========

https://hg.mozilla.org/integration/gaia-central/rev/6887ed12d1b2
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 987417 - Update copy in firefox accounts settings app r=arthurcc
2014-04-09 19:16:18 -07:00
B2G Bumper Bot
2f56fa46a1 Bumping manifests a=b2g-bump 2014-04-09 19:02:51 -07:00
B2G Bumper Bot
719c04da7c Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/dc0483a91071
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.js"

This reverts commit 783dffa3dae6840df783198a795352093732569d.
2014-04-09 19:01:05 -07:00
Ben Tian
cec5d102b0 Bug 989845 - [bluedroid] Implement KeyPressedCallback to handle HSP commands, r=echou 2014-04-09 17:44:03 +08:00
B2G Bumper Bot
bdd108cb91 Bumping manifests a=b2g-bump 2014-04-09 17:57:50 -07:00
B2G Bumper Bot
7f0cecd66f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6ebb049d6375
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #16382 from cctuan/968661

Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.j...

========

https://hg.mozilla.org/integration/gaia-central/rev/98162042ae73
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.js
2014-04-09 17:56:03 -07:00
B2G Bumper Bot
db9d1b9ec5 Bumping manifests a=b2g-bump 2014-04-09 16:18:10 -07:00
B2G Bumper Bot
17d6abd60e Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4c6376fe6fab
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #18073 from julienw/992891-file-too-large-string

Bug 992891 - [B2G][Messages] Warning message is missing while trying to ...

========

https://hg.mozilla.org/integration/gaia-central/rev/4f379be7fc47
Author: Julien Wajsberg <julien@mozilla.com>
Desc: Bug 992891 - [B2G][Messages] Warning message is missing while trying to attach a video file too large to send via MMS r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/6f98eb7a9469
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #18135 from gaye/bug-974554

Bug 974554 - CalDAV parser should accept ical inside xml comments nested in <calendar-data> elements r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/4f00039f84c4
Author: gaye <gaye@mozilla.com>
Desc: Bug 974554 - CalDAV parser should accept ical inside xml comments nested  in <calendar-data> elements r=millermedeiros
2014-04-09 16:16:51 -07:00
Ryan VanderMeulen
9d7fe65b51 Merge m-c to b2g-inbound on a CLOSED TREE. 2014-04-09 19:11:57 -04:00
Myk Melez
4f7dbceb4f Bug 994216 - ensure desktop INI file parent directory exists to fix bustage on CLOSED TREE; r=marco"
--HG--
extra : amend_source : d72cf290cc27d2cc6baa3d68611192167c45fd8f
2014-04-09 14:20:59 -07:00
B2G Bumper Bot
f1cdc90cc3 Bumping manifests a=b2g-bump 2014-04-09 12:48:03 -07:00
B2G Bumper Bot
b8016d142c Bumping gaia.json for 7 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/64c56e6c5e48
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 967516 - Enable DEVICE_DEBUG by default for non production builds r=ochameau" for assertions and timeouts

This reverts commit abda39c78b25d6dbcf8cc7eba2c59086871b5da1.

========

https://hg.mozilla.org/integration/gaia-central/rev/fcd7915aded3
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #18090 from justindarc/bug991953

Bug 991953 - [Camera][Buri] Timer turns sideways or upside down when fil...

========

https://hg.mozilla.org/integration/gaia-central/rev/0948043854ef
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 991953 - [Camera][Buri] Timer turns sideways or upside down when filming video

========

https://hg.mozilla.org/integration/gaia-central/rev/0c9603ca37f6
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #18132 from gaye/disable-caldav-test

Revert "Merge pull request #17813 from evanxd/bug-987351"

========

https://hg.mozilla.org/integration/gaia-central/rev/8a9c07fa98c8
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Merge pull request #17813 from evanxd/bug-987351"

This reverts commit 7efa9ab3234207fd2fd818a5c1411f390619dbfc, reversing
changes made to 89691d2d1a98aef25f3937fbe995413a5d943abe.

========

https://hg.mozilla.org/integration/gaia-central/rev/c1bce3d6e753
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #18121 from AndreiH/993358

Bug 993358 - Extra step in test_everythingme_app_install.TestEverythingM...

========

https://hg.mozilla.org/integration/gaia-central/rev/22422c9eae0e
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 993358 - Extra step in test_everythingme_app_install.TestEverythingMeInstallApp
2014-04-09 12:46:16 -07:00
B2G Bumper Bot
be7224ec44 Bumping manifests a=b2g-bump 2014-04-09 07:18:06 -07:00
B2G Bumper Bot
282308cf7e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/cb9984d42127
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #18078 from rnowm/993388

Bug 993388 - [Followup][Messages][Refresh] Messages Inbox edit mode r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/bf1f0f6d8f73
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 993388 - [Followup][Messages][Refresh] Messages Inbox edit mode
2014-04-09 07:16:20 -07:00
B2G Bumper Bot
fba29be48a Bumping manifests a=b2g-bump 2014-04-09 06:52:58 -07:00
B2G Bumper Bot
099c22f142 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6ff180a83c70
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 951687 - [Messages] Thread. Update file icon placeholders r=julien
2014-04-09 06:51:37 -07:00
Alexandre Lissy
5791343b37 Bug 989876 - Keep updateTime field uptodate for gaia apps. r=fabrice 2014-04-09 15:45:15 +02:00
B2G Bumper Bot
707f0b3353 Bumping manifests a=b2g-bump 2014-04-09 06:43:32 -07:00
B2G Bumper Bot
09711da276 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/457d29d40f88
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17975 from AndreiH/bug_992162

Bug 992162 - [master] Fix test_lockscreen_unlock_to_camera_with_passcode...

========

https://hg.mozilla.org/integration/gaia-central/rev/a1c26ad93f62
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 992162 - [master] Fix test_lockscreen_unlock_to_camera_with_passcode.TestCameraUnlockWithPasscode
2014-04-09 06:43:20 -07:00
Henry Chang
bfc9b027c9 Bug 993732 - Should use renamed properties done by bug 988129. pending r=gene
Landed directly on mozilla-central in order to fix the Firefox OS bustage in today's build.
2014-04-09 15:42:47 +08:00
Carsten "Tomcat" Book
7cd09aa69d merge b2g-inbound to mozilla-central 2014-04-09 14:27:34 +02:00
Carsten "Tomcat" Book
f7dfaad647 merge fx-team to mozilla-central 2014-04-09 14:23:03 +02:00
Carsten "Tomcat" Book
19f9da7c3c merge mozilla-inbound to mozilla-central 2014-04-09 14:18:36 +02:00
B2G Bumper Bot
6a93fec1eb Bumping manifests a=b2g-bump 2014-04-09 01:02:49 -07:00
B2G Bumper Bot
1090b02879 Bumping gaia.json for 30 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/82029fc5d70c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17885 from crh0716/975343

Bug 975343 - Show multiple phone numbers and iccids on dual sim devices r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/10878b39063e
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 975343 - Show multiple phone numbers and iccids on dual sim devices

========

https://hg.mozilla.org/integration/gaia-central/rev/2b9e9f9b377e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 993652 - Disable intermittent failing test, Places tests Search for previously visited URL

========

https://hg.mozilla.org/integration/gaia-central/rev/8ab0f2562ff7
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17554 from DouglasSherk/984449-unify-sim-picker

Bug 984449 - [DSDS] Unify SIM picker HTML fragment and add build support for shared/elements/ r=francisco, julienw, rik, yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/781cfd42d84b
Author: DouglasSherk <github@sherk.me>
Desc: Bug 984449 - [DSDS] Unify SIM picker HTML fragment and add build support for shared/elements/ r=francisco, julienw, rik, yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/50d19c14c529
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #16625 from eeejay/bug-976630

Bug 976630 - [Settings] style non-current regions as hidden. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/243667502c82
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 976630 - [Settings] Make non-current panels hidden.

========

https://hg.mozilla.org/integration/gaia-central/rev/6a3d135a6e1a
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #18057 from justindarc/bug991384

Bug 991384 - [camera][madai] HDR/Flash conflict messages missing

========

https://hg.mozilla.org/integration/gaia-central/rev/4ac8e06ace8d
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 991384 - [camera][madai] HDR/Flash conflict messages missing

========

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

Bug 991444 - [camera][madai] geo-location dialogue not full screen in ca...

========

https://hg.mozilla.org/integration/gaia-central/rev/d2508c2f2e21
Author: hyuna.cho <hyuna.cho@lge.com>
Desc: Bug 991444 - [camera][madai] geo-location dialogue not full screen in camera

========

https://hg.mozilla.org/integration/gaia-central/rev/ace28cff7183
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #18055 from sfoster/patron-bambino-jet

Bug 987237 - Add option to display appIcon in cards; make screenshot pre...

========

https://hg.mozilla.org/integration/gaia-central/rev/beaf3cc6d4fa
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 987237 - Add option to display appIcon in cards; make screenshot preview in cards a settings option. r=alive

* New default/fallback icon for card view

* Use span for fallback cards view icon

* Move early return to ensure non-screenshot cards still get rotation class

* Implement cards view icon as overlay and fallback when screenshot setting is false, or retrieval fails

* Fix up getIconURI per bug 988128

* Add screenshot cards view setting to developer menu, with initial/default setting value as true

* Add tests for enabled and disabled screenshot handling in cards view

* Add some getIconURI tests

* Use SettingsListener to awatch screenshots.enabled setting; update test

========

https://hg.mozilla.org/integration/gaia-central/rev/9e6d58d2fb76
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #17813 from evanxd/bug-987351

Bug 987351 -  Migrate caldav_test.js to use new "view" code.

========

https://hg.mozilla.org/integration/gaia-central/rev/4bda52082601
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 987351 - Migrate caldav_test.js to use new "view" code.

========

https://hg.mozilla.org/integration/gaia-central/rev/5432828d0d4d
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #15985 from stasm/914414-l10njs-refactor

Bug 914414 - Refactor l10n.js. r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/d88aec90bb80
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 914414 - Refactor l10n.js. r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/d25cd9548857
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17965 from dbaron/bug991927

Bug 991927 - Create new CustomEvent objects rather than caching them, to...

========

https://hg.mozilla.org/integration/gaia-central/rev/0093cefa6a88
Author: L. David Baron <dbaron@dbaron.org>
Desc: Bug 991927 - Create new CustomEvent objects rather than caching them, to avoid entraining their most recent target and preventing it from being GCed.

========

https://hg.mozilla.org/integration/gaia-central/rev/76b8a68e504c
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17395 from svic/Bug_975268

Bug 975268: [System][NFC] Reset the screen idle timeout when a NFC tag/device is detected.

========

https://hg.mozilla.org/integration/gaia-central/rev/d52cf3a5465b
Author: Garner Lee <garner.lee@telekom.com>
Desc: Bug 975268: [System][NFC] Reset the screen idle timeout when a NFC tag/device is detected. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/c7a5a4ca2dbd
Author: Greg Weng <snowmantw@gmail.com>
Desc: Revert "Revert (manually revert) "Bug 933035 - [B2G][System][Lockscreen] The"

This reverts commit 86ff94b32e369a925b79ae16ced141c1ac36fc0e.

After confirmed this backout didn't help the bug,
I now reland the code back, and to see if it can solve the other bug
may cause by it (Bug 993281)

========

https://hg.mozilla.org/integration/gaia-central/rev/4376dd950071
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #17982 from lissyx/bug980701

Bug 980701 - Make sure we do not try to place more than two calls r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/4c772d1c28a6
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 980701 - Make sure we do not try to place more than two calls

We cannot open more than two lines, and mozTelephony is not able yet to
tell us that we are doing this. So we do a check ourself for now, and
bug 990472 should fix it at mozTelephony level.

========

https://hg.mozilla.org/integration/gaia-central/rev/affd87452ab8
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #18021 from steveck-chung/Browser-2.25X

Bug 983079 - [MADAI][Browser] @2.25x assets update for Browser r=benfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/5788053c7de6
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 983079 - [MADAI][Browser] @2.25x assets update for Browser

========

https://hg.mozilla.org/integration/gaia-central/rev/f9f5b64889dd
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #17677 from timdream/keyboard2-autocorrect-test

Bug 977451 - [keyboard refactor] Unit test for autocorrect.js and suggestions.js, r=janjongboom

========

https://hg.mozilla.org/integration/gaia-central/rev/997d4d58f1eb
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 977451 - [keyboard refactor] Unit test for autocorrect.js and suggestions.js

========

https://hg.mozilla.org/integration/gaia-central/rev/7ee9dc4e2556
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #18051 from benfrancis/959694-master2

Bug 959694 - Combine Rocketbar and statusbar r=alive r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/983471d44394
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 959694 - Combine Rocketbar and statusbar r=alive r=kgrandon
2014-04-09 01:01:12 -07:00
B2G Bumper Bot
df2fac2c5e Bumping manifests a=b2g-bump 2014-04-09 00:42:52 -07:00