Ed Morley
a96b4fa90f
Merge mozilla-central and inbound
2014-04-02 18:24:05 +01:00
Carsten "Tomcat" Book
277da604da
merge b2g-inbound to mozilla-central
2014-04-02 15:57:57 +02:00
B2G Bumper Bot
f0f7d11860
Bumping manifests a=b2g-bump
2014-04-02 02:46:22 -07:00
B2G Bumper Bot
0176ae38a0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c23b496987e1
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17354 from gasolin/issue-973448-2
Bug 973448 - [settings] refactor Support panel with AMD pattern, r=arthur
========
https://hg.mozilla.org/integration/gaia-central/rev/f5624be4f1a2
Author: gasolin <gasolin@gmail.com>
Desc: Bug 973448 - [settings] refactor Support panel with AMD pattern
2014-04-02 02:41:12 -07:00
B2G Bumper Bot
97fe5d91f1
Bumping manifests a=b2g-bump
2014-04-02 02:02:31 -07:00
B2G Bumper Bot
a2552d2e0a
Bumping manifests a=b2g-bump
2014-04-02 01:04:57 -07:00
B2G Bumper Bot
84d549f0e3
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/cd4744c3a390
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 986206 - Report filenames on test failures"
This reverts commit f54d933c592c229c74c7ea5a9582c17a931d75ae.
2014-04-02 00:25:40 -07:00
B2G Bumper Bot
df16253e32
Bumping manifests a=b2g-bump
2014-04-02 00:00:58 -07:00
B2G Bumper Bot
3fc2b0bd66
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e92213819581
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #17812 from EverythingMe/989731-icon-size
Bug 989731 - [E.me] Web app icon sizes and shadow are inconsistent
========
https://hg.mozilla.org/integration/gaia-central/rev/881138c4505d
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 989731 - [E.me] Web app icon sizes and shadow are inconsistent [r=ranbena]
2014-04-01 23:56:12 -07:00
B2G Bumper Bot
78f946c911
Bumping manifests a=b2g-bump
2014-04-01 23:36:08 -07:00
B2G Bumper Bot
6b59ceefbe
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7da66e2c4a0b
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17821 from rnowm/990006
Bug 990006 - Change active state in dark themed [BB] buttons
========
https://hg.mozilla.org/integration/gaia-central/rev/5bb9b3a60ff7
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 990006 - Change active state in dark themed [BB] buttons
2014-04-01 23:31:01 -07:00
B2G Bumper Bot
3216886f2d
Bumping manifests a=b2g-bump
2014-04-01 23:21:06 -07:00
B2G Bumper Bot
20790b26e5
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/2e205c07e44b
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17870 from RudyLu/keyboard/Bug959200_master
Bug 959200 - Letters on keyboard sometimes not placed correctly.
r=janjongboom
========
https://hg.mozilla.org/integration/gaia-central/rev/f64fa82f917d
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 959200 - Letters on keyboard sometimes not placed correctly.
2014-04-01 23:15:56 -07:00
B2G Bumper Bot
d3a2a657e8
Bumping manifests a=b2g-bump
2014-04-01 22:41:23 -07:00
B2G Bumper Bot
8696f50f47
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/aa809deda51f
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17848 from gasolin/issue-984802
Bug 984802 - [MADAI][System] @2.25x assets update for System, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/d1fd94c03cd9
Author: gasolin <gasolin@gmail.com>
Desc: Bug 984802 - [MADAI][System] @2.25x assets update for System
2014-04-01 22:36:12 -07:00
B2G Bumper Bot
2903a82c21
Bumping manifests a=b2g-bump
2014-04-01 21:36:08 -07:00
B2G Bumper Bot
bf417dbd97
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/43966bdab1ac
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #17511 from cctuan/973446
Bug 973446 - [settings] refactor B2G improve and feedback panel with AMD...
========
https://hg.mozilla.org/integration/gaia-central/rev/3e58ae5e1147
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 973446 - [settings] refactor B2G improve and feedback panel with AMD pattern
2014-04-01 21:31:11 -07:00
B2G Bumper Bot
a29cee7beb
Bumping manifests a=b2g-bump
2014-04-01 21:21:06 -07:00
B2G Bumper Bot
f65afe1f61
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d49bbb7939a6
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #16108 from gurumukhi/master
Bug 910648 - Enable USB Storage should have one r=crh0716
========
https://hg.mozilla.org/integration/gaia-central/rev/f893d0263b9c
Author: Ram Dayal Vaishnav <vaishnav.rd@gmail.com>
Desc: Bug 910648 - Enable USB Storage should have one
2014-04-01 21:16:22 -07:00
B2G Bumper Bot
57301c2335
Bumping manifests a=b2g-bump
2014-04-01 20:41:23 -07:00
B2G Bumper Bot
9c8e0fd919
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9497c73bc475
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Revert "Merge pull request #17860 from mcav/alarm-volume-2"
This reverts commit 6e6cf2c0e135542da4aacce710cd534794b9627e, reversing
changes made to c648699d636414c50cf29ea3173058a0c78a855f.
Conflicts:
apps/clock/js/panels/timer/main.js
2014-04-01 20:36:14 -07:00
B2G Bumper Bot
ecdde13284
Bumping manifests a=b2g-bump
2014-04-01 20:16:21 -07:00
B2G Bumper Bot
1fc04048e5
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a35b39306d94
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17850 from gasolin/issue-990561
Bug 990561 - [MADAI][System] @2.25x assets update for Emergency Call, r=greg
========
https://hg.mozilla.org/integration/gaia-central/rev/707a0beaeba1
Author: gasolin <gasolin@gmail.com>
Desc: Bug 990561 - [MADAI][System] @2.25x assets update for Emergency Call
2014-04-01 20:11:11 -07:00
B2G Bumper Bot
2449c54da1
Bumping manifests a=b2g-bump
2014-04-01 20:01:09 -07:00
B2G Bumper Bot
5e17cd69d8
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d9276059a6c4
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #17838 from SasikalaParuchuri/Bug_984841_Keyboard_NotShown_inNewmessageScreen
Bug 984841 - [Messages] The cursor and the keyboard are not shown when New message screen is opened r=schung
========
https://hg.mozilla.org/integration/gaia-central/rev/36bd64bb3ce8
Author: sasikala.paruchuri <sasikala.paruchuri@lge.com>
Desc: Bug 984841 - [Messages] The cursor and the keyboard are not shown when New message screen is opened r=schung
========
https://hg.mozilla.org/integration/gaia-central/rev/c533c6ed5362
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #17603 from mikehenrty/bug-975973-lite
Bug 975973 - [DSDS] The "data circle" icon is not made smaller for DSDS ...
========
https://hg.mozilla.org/integration/gaia-central/rev/008e23607d80
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 975973 - [DSDS] The "data circle" icon is not made smaller for DSDS configurations
2014-04-01 19:55:35 -07:00
B2G Bumper Bot
1de991f734
Bumping manifests a=b2g-bump
2014-04-01 18:12:42 -07:00
B2G Bumper Bot
7007dd65c1
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f87dd82e6c84
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 986206 - Report filenames on test failures
========
https://hg.mozilla.org/integration/gaia-central/rev/ddf7f6d01f8a
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17304 from mcav/timerrest
Bug 982789 - [B2G][Clock]Set Timer intermittently starts countdown at incorrect starting point. r=millermedeiros
========
https://hg.mozilla.org/integration/gaia-central/rev/ba7e8f7bec31
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 982789 - [B2G][Clock]Set Timer intermittently starts countdown at incorrect starting point
2014-04-01 18:11:03 -07:00
B2G Bumper Bot
1de9f58533
Bumping manifests a=b2g-bump
2014-04-01 17:46:28 -07:00
B2G Bumper Bot
9eb716666f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/08ea0cebed11
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17860 from mcav/alarm-volume-2
Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
========
https://hg.mozilla.org/integration/gaia-central/rev/73ef8130450f
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
2014-04-01 17:41:17 -07:00
B2G Bumper Bot
719467580a
Bumping manifests a=b2g-bump
2014-04-01 17:31:19 -07:00
B2G Bumper Bot
47bfd4d62f
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a210b60770a2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 983171 - Disable intermittent test, manipulate screenLock settings passcode is enabled, then get changed successfully
2014-04-01 17:26:04 -07:00
B2G Bumper Bot
6a3bbfd1f9
Bumping manifests a=b2g-bump
2014-04-01 17:17:52 -07:00
B2G Bumper Bot
60159ffe64
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1ce79fa472be
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 990798 - [Clock] Disable intermittent failing test, Alarm Update alarm name and time
2014-04-01 17:16:17 -07:00
B2G Bumper Bot
157d1e31ed
Bumping manifests a=b2g-bump
2014-04-01 17:06:15 -07:00
B2G Bumper Bot
a49a595fb0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1c9f7f3876d1
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17849 from guilherme-pg/findmydevice
Bug 938896 - Find My Device client.
========
https://hg.mozilla.org/integration/gaia-central/rev/b9d78d517a99
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 938896 - Find My Device client.
2014-04-01 17:01:07 -07:00
B2G Bumper Bot
864195547b
Bumping manifests a=b2g-bump
2014-04-01 16:57:47 -07:00
B2G Bumper Bot
76d4fa630c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/347e465a2a9b
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #17303 from nullaus/bug982006
bug 982006
========
https://hg.mozilla.org/integration/gaia-central/rev/b2ea4034c90f
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 982006
* Use new error nsresult values in download notifications.
* Update mock_download_ui.js based on addition of 'ERRORS' to DownloadUI.
* added tests for new Downloads API errors in download notifications test
* added new tests for modal dialog changes in app modal dialog test
* AppModalDialog will ignore titles that contain the application URL or origin and instead
use the app name if it is available. If not, it will simply use an empty string.
r=alive, crdlc
2014-04-01 16:56:41 -07:00
B2G Bumper Bot
7448250573
Bumping manifests a=b2g-bump
2014-04-01 14:22:40 -07:00
B2G Bumper Bot
1a29916629
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/93cb2a62688e
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #16262 from benfrancis/959694-master
Bug 959694 - Combine Rocketbar and statusbar r=kgrandon r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/1bb84bb99be9
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 959694 - Combine Rocketbar and statusbar
2014-04-01 14:20:54 -07:00
Ryan VanderMeulen
218c60a780
Merge m-c to b2g-inbound.
2014-04-01 16:48:07 -04:00
B2G Bumper Bot
a64b4f9433
Bumping manifests a=b2g-bump
2014-04-01 13:46:23 -07:00
Ryan VanderMeulen
6a3fa988ca
Merge inbound to m-c.
2014-04-01 16:45:00 -04:00
B2G Bumper Bot
3b1819406f
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3e02a62830e2
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17846 from evanxd/bug-990334
Bug 990334 - [Calendar] Newly perma-red marionette test, marionette/today_test.js
========
https://hg.mozilla.org/integration/gaia-central/rev/4de830af5256
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 990334 - Set the correct css selector for the current day item.
========
https://hg.mozilla.org/integration/gaia-central/rev/8ecb619a76fa
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Merge pull request #16183 from mcav/alarm-volume"
This reverts commit bb7e44e428640f15e1c07b0ab89c712e797fb9ea, reversing
changes made to 6274b3645b3d41df4aa5a55398b5d106edf1c528.
2014-04-01 13:41:12 -07:00
B2G Bumper Bot
158b24431d
Bumping manifests a=b2g-bump
2014-04-01 13:36:13 -07:00
B2G Bumper Bot
805fca678b
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fca93ff8ee10
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #17831 from millermedeiros/989785-backout-duplicated-dom
Bug 989785 - apps/calendar/test/marionette/week_view_test.js failing because of week view regression r=gaye
========
https://hg.mozilla.org/integration/gaia-central/rev/1d65adac71b0
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 989785 - apps/calendar/test/marionette/week_view_test.js failing because of week view regression
========
https://hg.mozilla.org/integration/gaia-central/rev/369a20a696bf
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Revert "Bug 988079 - [Calendar] day view sometimes adds duplicated days to the DOM"
This reverts commit 277ef605c8f8305fe91a65559bfe35ca3458852b.
Conflicts:
apps/calendar/test/marionette/day_view_test.js
apps/calendar/test/unit/views/day_test.js
2014-04-01 13:31:10 -07:00
B2G Bumper Bot
115bd54764
Bumping manifests a=b2g-bump
2014-04-01 12:16:07 -07:00
B2G Bumper Bot
fa85d35ab6
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/cd17998374ac
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #16183 from mcav/alarm-volume
Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
========
https://hg.mozilla.org/integration/gaia-central/rev/6b7614d99840
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
2014-04-01 12:11:16 -07:00
B2G Bumper Bot
167a29763a
Bumping manifests a=b2g-bump
2014-04-01 11:32:39 -07:00
B2G Bumper Bot
ef5960a027
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/672459abdd64
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #17810 from gitmai/bug-987142-CC-jshint-fix-2"
This reverts commit 53cdd2b2d8d820d242d3fbccb32c73fb2c9515b0, reversing
changes made to 047855a5e077e9931a864cc2fe802eb42991826b.
2014-04-01 11:30:58 -07:00
B2G Bumper Bot
36430b79fe
Bumping manifests a=b2g-bump
2014-04-01 11:21:16 -07:00
