Commit Graph

176284 Commits

Author SHA1 Message Date
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
Reuben Morais
13ea852996 Bug 982777 - Prompt for permission to use the Camera API in privileged apps. r=sicking r=jdm 2014-04-02 01:08:42 -03: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
Ben Tian
44b29d714f Bug 990428 - Do not reset mSlcConnected=false when indicator status update is disabled, f=jaliu, r=echou 2014-04-01 14:40:49 +08: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
Wes Kocher
afe23178db Merge m-c to b2g-inbound to fix the CLOSED TREE 2014-04-01 16:48:50 -07:00
Dave Hylands
0afb7715b3 Bug 984269 - Fix bustage on a CLOSED TREE 2014-04-01 16:32:21 -07:00
L. David Baron
d54085e0bd Fix merge bustage between changeset c8be375e0c41 (bug 988111) and changeset 8560fc7e2849 (bug 984269), merged (I think) in changeset 0ff6afce0133, on a CLOSED TREE. 2014-04-01 15:10:06 -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
Ryan VanderMeulen
5e4f201ce2 Merge fx-team to m-c. 2014-04-01 16:31:56 -04: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
Chenxia Liu
4b49d43b89 Bug 971093 - Intermittent testSettingsMenuItems | Exception caught - junit.framework.AssertionFailedError: Text string: '^Customize$' is not found! r=gbrown 2014-04-01 11:30:31 -07:00
B2G Bumper Bot
36430b79fe Bumping manifests a=b2g-bump 2014-04-01 11:21:16 -07:00
B2G Bumper Bot
d5de7ac72e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 990653 - [Camera] Update unit tests for Activities

========

https://hg.mozilla.org/integration/gaia-central/rev/8d2fc9839025
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 990653 - [Camera] Update unit tests for Activities
2014-04-01 11:16:09 -07:00
Ryan VanderMeulen
24be5e282c Backed out changeset 7c60268706f3 (bug 956332) for xperf regressions.
--HG--
rename : toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js => toolkit/components/passwordmgr/test/unit/test_storage_mozStorage_migrate.js
rename : toolkit/components/passwordmgr/test/unit/test_notifications.js => toolkit/components/passwordmgr/test/unit/test_storage_mozStorage_notify.js
2014-04-01 14:01:22 -04:00
B2G Bumper Bot
aa5734b30e Bumping manifests a=b2g-bump 2014-04-01 10:52:36 -07:00
B2G Bumper Bot
b5e8d1d31e Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/934fbbe46bdb
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 978553 - Don't try to insert the message body if the activity didn't populate it r=julienw
2014-04-01 10:50:57 -07:00
B2G Bumper Bot
a2e4da652c Bumping manifests a=b2g-bump 2014-04-01 10:31:16 -07:00
B2G Bumper Bot
de3acfa591 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 988610 - [Camera][Madai] Black screen when opening camera from locks...

========

https://hg.mozilla.org/integration/gaia-central/rev/01db4a9a2a06
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 988610 - [Camera][Madai] Black screen when opening camera from lockscreen and camera app isn't open
2014-04-01 10:26:12 -07:00
Ryan VanderMeulen
70f61db42d Backed out changeset 65338f03492b (bug 990065) and changeset 8c3b772518f2 (bug 990057) for B2G desktop mochitest failures.
CLOSED TREE
2014-04-01 13:18:52 -04:00
B2G Bumper Bot
3d1d0f520d Bumping manifests a=b2g-bump 2014-04-01 10:01:07 -07:00