Commit Graph

8009 Commits

Author SHA1 Message Date
B2G Bumper Bot
4798e9b832 Bumping manifests a=b2g-bump 2014-03-31 20:07:40 -07:00
B2G Bumper Bot
e4e13053c8 Bumping gaia.json for 7 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ac1688a759ef
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #17835 from snowmantw/issue937442-lockscreen-window

Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.

========

https://hg.mozilla.org/integration/gaia-central/rev/8904d6ddabb5
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.

Conflicts:
	apps/system/js/lockscreen.js
	apps/system/test/unit/bootstrap_test.js
	tests/python/gaia-ui-tests/gaiatest/tests/functional/lockscreen/test_lockscreen_unlock_to_emergency_call_screen.py

========

https://hg.mozilla.org/integration/gaia-central/rev/b26c35814abb
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #16398 from dominickuo/bug-973831

Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status, r=jimporter

========

https://hg.mozilla.org/integration/gaia-central/rev/ecf33f47a878
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status

========

https://hg.mozilla.org/integration/gaia-central/rev/2150f52fb943
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 990334 - [Calendar] Disable marionette test, marionette/today_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/39c0034a675e
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #17833 from wilsonpage/bug/990285

Bug 990285 - [Camera] Resolutions should not be shown in settings menu

========

https://hg.mozilla.org/integration/gaia-central/rev/b81c06accee9
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 990285 - [Camera] Resolutions should not be shown in settings menu
2014-03-31 20:05:44 -07:00
B2G Bumper Bot
37ef922412 Bumping manifests a=b2g-bump 2014-03-31 15:26:24 -07:00
B2G Bumper Bot
08668efa47 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c14d7553c85d
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17819 from wilsonpage/bug/987058

Bug 987058 - [Camera] Expose higher resolution recorder profiles

========

https://hg.mozilla.org/integration/gaia-central/rev/7887fc349843
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 987058 - [Camera] Expose higher resolution recorder profiles

========

https://hg.mozilla.org/integration/gaia-central/rev/85f6606a9e4c
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17825 from wilsonpage/bug/989467

Bug 989467 - [Camera][Mozilla] 1.4 Video record button square is too rou...

========

https://hg.mozilla.org/integration/gaia-central/rev/d4a660bf02ad
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 989467 - [Camera][Mozilla] 1.4 Video record button square is too rounded
2014-03-31 15:21:12 -07:00
B2G Bumper Bot
39e287c7b6 Bumping manifests a=b2g-bump 2014-03-31 15:11:14 -07:00
B2G Bumper Bot
1c3c25e3f4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 990235 - [Clock] Localize alarm panel. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/fe17bf6809aa
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 990235 - [Clock] Localize alarm panel.
2014-03-31 15:06:13 -07:00
B2G Bumper Bot
fe08b2636d Bumping manifests a=b2g-bump 2014-03-31 14:33:14 -07:00
B2G Bumper Bot
9b7ce5ebcf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/cadab6aa942c
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17828 from mcav/reland-integration-tests

Bug 971135 - [Clock] Port all Clock integration tests from Python to Jav...

========

https://hg.mozilla.org/integration/gaia-central/rev/d4ed08f6b8f2
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 971135 - [Clock] Port all Clock integration tests from Python to JavaScript. r=millermedeiros
2014-03-31 14:33:03 -07:00
Ryan VanderMeulen
909c56a413 Merge m-c to b2g-inbound. 2014-03-31 17:31:58 -04:00
Ryan VanderMeulen
28f6465e9a Merge b2g-inbound to m-c. 2014-03-31 17:27:57 -04:00
B2G Bumper Bot
edb3b24625 Bumping manifests a=b2g-bump 2014-03-31 13:51:19 -07:00
B2G Bumper Bot
7fa0079f36 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1ce2678b36c4
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17772 from gaye/bug-987354

Bug 987354 - Migrate today_test.js to use new view code r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/69cd2d69e540
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 987354 - Migrate today_test.js to use new view code

========

https://hg.mozilla.org/integration/gaia-central/rev/f9595153a75d
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #17826 from millermedeiros/990148-day-view-event-specificity

Bug 990148 - [Calendar] increase specificity of Day View events selector on marionette tests r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/fc0af637a3b5
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 990148 - [Calendar] increase specificity of Day View events selector on marionette tests
2014-03-31 13:46:12 -07:00
Simone Bruno
70cc8b8b14 Bug 956451 - added mozconfig file to be used for macosx64_gecko-debug build, r=catlee 2014-03-31 19:59:04 +02:00
B2G Bumper Bot
812f94a527 Bumping manifests a=b2g-bump 2014-03-31 08:28:05 -07:00
B2G Bumper Bot
3880ec0be0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6c593455e3d1
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17786 from KevinGrandon/bug_989663_contacts_jshint

Bug 989663 - [Contacts] Jshint fixes for js/ r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/410ade2be66a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 989663 - [Contacts] Jshint fixes for js/ r=arcturus
2014-03-31 08:27:54 -07:00
B2G Bumper Bot
b9917002b2 Bumping manifests a=b2g-bump 2014-03-31 07:46:48 -07:00
B2G Bumper Bot
1258918901 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/10eb20cc1233
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #16087 from rnowm/VR-contact-details

Bug 966224 - [VDR][Contacts] Apply Buttons and Input areas [BB] r=pivanov

========

https://hg.mozilla.org/integration/gaia-central/rev/1cd2a85aff6e
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 966224 - [VDR][Contacts]
2014-03-31 07:40:34 -07:00
B2G Bumper Bot
9116856e0f Bumping manifests a=b2g-bump 2014-03-31 07:06:08 -07:00
B2G Bumper Bot
de6968e7df Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b111cfaf65c6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17800 from KevinGrandon/bug_989916_captive_portal_test_sandboxing

Bug 989916 - [System] Fix captive_portal_test.js when run in its own sandbox

========

https://hg.mozilla.org/integration/gaia-central/rev/befac97a124e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 989916 - [System] Fix captive_portal_test.js when run in its own sandbox r=me
2014-03-31 07:00:58 -07:00
B2G Bumper Bot
360d9fdc9c Bumping manifests a=b2g-bump 2014-03-31 06:11:37 -07:00
B2G Bumper Bot
3406ecbfee Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/186dc9242740
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #17766 from julienw/revert-bad-revert

Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" ...

========

https://hg.mozilla.org/integration/gaia-central/rev/fc3ccbc1f7e1
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 989418 - Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL"

This reverts commit a9aa1882f4b0e472f3686b157eb119d17ae60a91.
The original revert broke a lot of things and was not done correctly.

Conflicts:
	apps/clock/js/panels/timer/panel.html
	shared/style_unstable/input_areas.css

========

https://hg.mozilla.org/integration/gaia-central/rev/b82006c4b2c8
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17809 from davehunt/bug989951

Bug 989951 - Bump gaiatest version to 0.21.10

========

https://hg.mozilla.org/integration/gaia-central/rev/1c5240dd926d
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 989951 - Bump gaiatest version to 0.21.10. r=fstrugariu
2014-03-31 06:06:15 -07:00
B2G Bumper Bot
0b6148f0fc Bumping manifests a=b2g-bump 2014-03-31 06:01:02 -07:00
B2G Bumper Bot
21657e26b8 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/37bae3d7a601
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 989974 - Disable intermittent failing unit test, system/HardwareButtons press and hold home (screen enabled) r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/d1ee868ca99b
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #17814 from dmarcos/bug986882

Bug 986882 - [Camera][Madai] Color inconsistency in buttons on active st...

========

https://hg.mozilla.org/integration/gaia-central/rev/1d387fd12796
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986882 - [Camera][Madai] Color inconsistency in buttons on active state
2014-03-31 05:55:51 -07:00
B2G Bumper Bot
e04e1d4678 Bumping manifests a=b2g-bump 2014-03-31 05:42:36 -07:00
B2G Bumper Bot
a2ae7dd078 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f0be2c8b9ada
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17796 from askeing/989898

Bug 989898 - Fix email manual setup steps of gaiatest

========

https://hg.mozilla.org/integration/gaia-central/rev/df11cfee8774
Author: askeing <askeing@gmail.com>
Desc: Bug 989898 - Fix email manual setup steps of gaiatest
2014-03-31 05:41:11 -07:00
B2G Bumper Bot
8e87c88b18 Bumping manifests a=b2g-bump 2014-03-31 00:56:09 -07:00
B2G Bumper Bot
15e92afa01 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5f0660e48c26
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #17797 from huchengtw-moz/revert-bug-971554

Revert "Merge pull request #17790 from huchengtw-moz/system2/Bug_971554_...

========

https://hg.mozilla.org/integration/gaia-central/rev/babc98c76dcf
Author: John Hu <johu@mozilla.com>
Desc: Revert "Merge pull request #17790 from huchengtw-moz/system2/Bug_971554_reland-master"

This reverts commit eee964fc7e8dc519218dee6b72595ad0f7dd8231, reversing
changes made to bb7285e8f6c70bf10b0affbeb370fc041bdecff8.

========

https://hg.mozilla.org/integration/gaia-central/rev/40b59387604d
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #17515 from evanxd/bug-978933

Bug 978933 - gaia-marionette should not care about the order of its environment variables

========

https://hg.mozilla.org/integration/gaia-central/rev/b63565562a42
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 978933 - Remove the Radicale CalDAV server installation from gaia-marionette.

========

https://hg.mozilla.org/integration/gaia-central/rev/359e9f477abd
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #17357 from EragonJ/bug-973447

Bug 973447 - [settings] refactor Language panel with AMD pattern

========

https://hg.mozilla.org/integration/gaia-central/rev/fc588a390f20
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 973447 - [settings] refactor Language panel with AMD pattern
2014-03-31 00:50:55 -07:00
B2G Bumper Bot
5d5b134577 Bumping manifests a=b2g-bump 2014-03-31 00:12:36 -07:00
B2G Bumper Bot
c15ae4b55e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/df0b991e7e71
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #17700 from rexboy7/bug-971512-1.4

Bug 971512 - [System] Instantiable layout manager

========

https://hg.mozilla.org/integration/gaia-central/rev/4fdd280424cc
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 971512 - [System] Instantiable layout manager
2014-03-31 00:11:13 -07:00
B2G Bumper Bot
8e1534795e Bumping manifests a=b2g-bump 2014-03-30 23:21:18 -07:00
B2G Bumper Bot
189dfd3cad Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/441f0eb16eeb
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #17788 from ian-liu/system2/bug964653_system_dialog_refactor_

Bug 964653 - (system-dialog) [Window Management] Implement System Dialog Window, r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/ea0eb5d6f5c1
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 964653 - (system-dialog) [Window Management] Implement System Dialog Window
2014-03-30 23:16:05 -07:00
B2G Bumper Bot
b7aa3baa96 Bumping manifests a=b2g-bump 2014-03-30 21:36:10 -07:00
B2G Bumper Bot
716e3de119 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1d5e7f86f4fe
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #17790 from huchengtw-moz/system2/Bug_971554_reland-master

Bug 971554 - [System2] Instantiable SoundManager, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/f3b10202ecfa
Author: John Hu <johu@mozilla.com>
Desc: Bug 971554 - [System2] Instantiable SoundManager
2014-03-30 21:31:06 -07:00
B2G Bumper Bot
c86a81059b Bumping manifests a=b2g-bump 2014-03-30 21:22:33 -07:00
B2G Bumper Bot
e8cc899c2e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/cf6a15f55a94
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17732 from KevinGrandon/bug_988034_system_multiple_action_menus

Bug 988034 - Double clicking on wallpaper activity causes activity menu to reappear r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/ed82eadd15b3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 988034 - Double clicking on wallpaper activity causes activity menu to reappear r=alive
2014-03-30 21:20:55 -07:00
B2G Bumper Bot
9a5667cb26 Bumping manifests a=b2g-bump 2014-03-30 20:52:35 -07:00
B2G Bumper Bot
b2f621464a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/cff886cd8e29
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17729 from KevinGrandon/bug_989065_wifi_test_sandbox

Bug 989065 - [System] Fix wifi_test.js when run in its own sandbox r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/128d032e3429
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 989065 - [System] Fix wifi_test.js when run in its own sandbox
2014-03-30 20:51:03 -07:00
B2G Bumper Bot
8450ebfdc0 Bumping manifests a=b2g-bump 2014-03-30 12:36:10 -07:00
B2G Bumper Bot
a33dda98a3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4934835d11f6
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Merge pull request #17784 from gregorwagner/bug989785

Bug 989785 - Disable failing test. r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/c2287557f2e1
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Bug 989785 - Disable failing test. r=me
2014-03-30 12:31:06 -07:00
B2G Bumper Bot
97630bef1a Bumping manifests a=b2g-bump 2014-03-30 12:21:18 -07:00
B2G Bumper Bot
d1e1178450 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5b01e644891f
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #17703 from jmcanterafonseca/multiple_contact_fb_delete_done

Bug 988243 - Multiple contact delete does not work with Facebook Contact...

========

https://hg.mozilla.org/integration/gaia-central/rev/2973645c809e
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 988243 - Multiple contact delete does not work with Facebook Contacts
2014-03-30 12:16:11 -07:00
B2G Bumper Bot
1ef9b9bfd8 Bumping manifests a=b2g-bump 2014-03-29 14:46:17 -07:00
B2G Bumper Bot
2be0d37708 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e6d3aefbd253
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17545 from KevinGrandon/bug_982081_contacts_jshint_views

Bug 982081 - [Contacts] JSHint fixes for js/views

========

https://hg.mozilla.org/integration/gaia-central/rev/f0782c9fe411
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 982081 - [Contacts] JSHint fixes for js/views r=arcturus
2014-03-29 14:41:00 -07:00
B2G Bumper Bot
58c51c66ee Bumping manifests a=b2g-bump 2014-03-29 11:31:22 -07:00
B2G Bumper Bot
48f0886017 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/bcfc13353f31
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 989644 - Disable intermittent failing test on travis, Music player tests Audio channels tests Interrupted by a higher priority channel
2014-03-29 11:21:12 -07:00
Phil Ringnalda
3067767289 Merge f-t to m-c 2014-03-29 10:08:41 -07:00
B2G Bumper Bot
be96871404 Bumping manifests a=b2g-bump 2014-03-28 18:46:12 -07:00
B2G Bumper Bot
e9ca451431 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/90c30688c09d
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #17735 from jrburke/bug989104-email-no-build-timeout

Bug 989104 - [email] allow for longer module load timeouts for background loads r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/69ab41300b6c
Author: jrburke <jrburke@gmail.com>
Desc: Bug 989104 - [email] allow for longer module load timeouts for background loads
2014-03-28 18:41:00 -07:00
Wes Kocher
a981d8de49 Merge m-c to b2g-inbound 2014-03-28 17:05:42 -07:00
Wes Kocher
3e4da18062 Merge b2g-inbound to m-c 2014-03-28 16:38:35 -07:00