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
B2G Bumper Bot
3d1d0f520d
Bumping manifests a=b2g-bump
2014-04-01 10:01:07 -07:00
B2G Bumper Bot
4c389b9862
Bumping gaia.json for 10 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/08cfe70a78b5
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #17762 from gabrielesvelto/bug-989357-recompress-application-icons
Bug 989357 - Recompressed the new application icons r=crdlc,ran
========
https://hg.mozilla.org/integration/gaia-central/rev/4b37ffc727d2
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 989357 - Recompressed the new application icons r=crdlc,ran
========
https://hg.mozilla.org/integration/gaia-central/rev/f1606921b58b
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17852 from gitmai/bug-990578-CC-recompress-images
Bug 990578 - [CostControl] Recompress images for madai
r=arnau
========
https://hg.mozilla.org/integration/gaia-central/rev/0a6c136906d6
Author: mai <mri@tid.es>
Desc: Bug 990578 - [CostControl] Recompress images for madai
========
https://hg.mozilla.org/integration/gaia-central/rev/26563fbfb771
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17810 from gitmai/bug-987142-CC-jshint-fix-2
Bug 987142 - [CostControl] Fix jshint errors (second part)
r=jmcf
========
https://hg.mozilla.org/integration/gaia-central/rev/31029fd8faf6
Author: mai <mri@tid.es>
Desc: Bug 987142 - [CostControl] Fix jshint errors (second part)
========
https://hg.mozilla.org/integration/gaia-central/rev/4e7e0fd0b38c
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17847 from arcturus/bug-990030
Bug 990030 - [Contacts] JSHint fixes for oauth/js
========
https://hg.mozilla.org/integration/gaia-central/rev/202780f439c8
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 990030 - [Contacts] JSHint fixes for oauth/js
========
https://hg.mozilla.org/integration/gaia-central/rev/e478a4ca39d3
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #17724 from KevinGrandon/bug_989019_calendar_test_sandbox
Bug 989019 - [Calendar] Fix alarm_test.js when run in its own sandbox
========
https://hg.mozilla.org/integration/gaia-central/rev/c745a10f6c69
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 989019 - [Calendar] Fix alarm_test.js when run in its own sandbox
2014-04-01 09:56:33 -07:00
B2G Bumper Bot
50fd37ad5b
Bumping manifests a=b2g-bump
2014-04-01 07:26:22 -07:00
B2G Bumper Bot
4cf4074661
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/de86c8e1b189
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 983080 - Add 2.25x icons to settings app
2014-04-01 07:21:11 -07:00
B2G Bumper Bot
b67ef702f8
Bumping manifests a=b2g-bump
2014-04-01 07:11:27 -07:00
B2G Bumper Bot
115a56fb47
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b0fd2ccbebbc
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Bug 983080 - Add 2.25x icons to settings app"
This reverts commit feacb6e2a6b1b36af11f246641612cccc77426e5.
2014-04-01 07:06:12 -07:00
B2G Bumper Bot
8ae46aa7cf
Bumping manifests a=b2g-bump
2014-04-01 06:06:01 -07:00
B2G Bumper Bot
50ec18be3f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/73eea1a82139
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17396 from svic/Bug_974725
Bug_974725: [B2G][NFC] Support different vcard mime types for Contacts
========
https://hg.mozilla.org/integration/gaia-central/rev/21900f321a75
Author: Garner Lee <garner.lee@telekom.com>
Desc: Bug 974725: [B2G][NFC] Support different vcard mime types for Contacts r=alive
2014-04-01 06:01:16 -07:00
B2G Bumper Bot
9951077be9
Bumping manifests a=b2g-bump
2014-04-01 05:51:13 -07:00
B2G Bumper Bot
2ea2785658
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3221e2a05eb5
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 938896 - Find My Device client." for breaking tests
This reverts commit 751d4a616f5c8742bc852243b6ed071c20c5a163.
2014-04-01 05:46:03 -07:00
B2G Bumper Bot
05a9aec4e1
Bumping manifests a=b2g-bump
2014-04-01 05:32:36 -07:00
B2G Bumper Bot
6e55bcaffd
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/59f2cc603997
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17741 from weideng/bug960946
Bug 960946 - [Keyboard] Change to the new sendKey API
========
https://hg.mozilla.org/integration/gaia-central/rev/e7688d46cebd
Author: wdeng <wdeng@mozilla.com>
Desc: Bug 960946 - [Keyboard] Change to the new sendKey API
2014-04-01 05:31:08 -07:00
B2G Bumper Bot
8d1a6c22f0
Bumping manifests a=b2g-bump
2014-04-01 05:17:41 -07:00
B2G Bumper Bot
e736febb24
Bumping manifests a=b2g-bump
2014-04-01 04:26:07 -07:00
B2G Bumper Bot
76a9a560c2
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/32b72f5b6b07
Author: Greg Weng <snowmantw@gmail.com>
Desc: Revert "Merge pull request #17835 from snowmantw/issue937442-lockscreen-window"
This reverts commit f9a44b5e3cbea1e48b12716aceb0e365fec9e18e, reversing
changes made to abdabccec260237674e6503e55e10623124a69cc.
2014-04-01 04:20:46 -07:00
B2G Bumper Bot
3c4376ca01
Bumping manifests a=b2g-bump
2014-04-01 03:56:12 -07:00
B2G Bumper Bot
a51d7bf6f2
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/790517c7c868
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17824 from arcturus/bug-988430
Bug 988430 - [B2G][Contacts] Cancelling on allow offline access page for importing Gmail contacts brings user to blank page
========
https://hg.mozilla.org/integration/gaia-central/rev/9c833a5ce917
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 988430 - [B2G][Contacts] Cancelling on allow offline access page for importing Gmail contacts brings user to blank page
========
https://hg.mozilla.org/integration/gaia-central/rev/5218c550ab1a
Author: GaryChen,PYChen <mmm198219@gmail.com>
Desc: Merge pull request #17844 from shamenchens/Bug988802-Video2.25x-Asset
Bug 988802 - [MADAI][Video] @2.25x assets update for Video. r=johnhu.
========
https://hg.mozilla.org/integration/gaia-central/rev/9d5cebbe4060
Author: Sherman Chen <shamen.chens@gmail.com>
Desc: Bug 988802 - [MADAI][Video] @2.25x assets update for Video
========
https://hg.mozilla.org/integration/gaia-central/rev/2481ad014501
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17817 from guilherme-pg/findmydevice
Findmydevice
========
https://hg.mozilla.org/integration/gaia-central/rev/9306504aa256
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 938896 - Find My Device client.
2014-04-01 03:51:07 -07:00
B2G Bumper Bot
bb11cfe3c2
Bumping manifests a=b2g-bump
2014-04-01 03:06:19 -07:00
B2G Bumper Bot
29376c930c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1e06f88096d4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17780 from evanxd/bug-984118
Bug 984118 - JSHint fixes for test/unit.
========
https://hg.mozilla.org/integration/gaia-central/rev/9dfb83bda5b8
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 984118 - JSHint fixes for test/unit.
2014-04-01 03:01:10 -07:00
B2G Bumper Bot
7c49269e9d
Bumping manifests a=b2g-bump
2014-04-01 02:36:08 -07:00
B2G Bumper Bot
99250f0aa3
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f017d9562476
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #17840 from hyunacho/bug990404
Bug 990404 - [Camera] Can click the hidden gallery/thumbnail button duri...
========
https://hg.mozilla.org/integration/gaia-central/rev/df90b87f5506
Author: hyuna.cho <hyuna.cho@lge.com>
Desc: Bug 990404 - [Camera] Can click the hidden gallery/thumbnail button during the recording
2014-04-01 02:30:54 -07:00
B2G Bumper Bot
57fb8ea6fd
Bumping manifests a=b2g-bump
2014-04-01 02:01:18 -07:00
B2G Bumper Bot
44948a89c2
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f1e1799ca64b
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17581 from gitmai/bug-984801-2.25x-assets
Bug 984801 - [MADAI][CostControl] @2.25x assets update for CostControl
r=arnau
========
https://hg.mozilla.org/integration/gaia-central/rev/9e1ee4d7025f
Author: mai <mri@tid.es>
Desc: Bug 984801 - [MADAI][CostControl] @2.25x assets update for CostControl
2014-04-01 01:51:12 -07:00
B2G Bumper Bot
5ca286c8e4
Bumping manifests a=b2g-bump
2014-04-01 01:18:02 -07:00
B2G Bumper Bot
78c41ee703
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4e7f52475d30
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #17807 from huchengtw-moz/system2/Bug_971554-reland-2
Bug 971554 - [System2] Instantiable SoundManager, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/513eb0069324
Author: John Hu <johu@mozilla.com>
Desc: Bug 971554 - [System2] Instantiable SoundManager, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/78f618282d9b
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #17823 from julienw/987445-remove-vertical-align-middle-for-icon-buttons
Bug 987445 - [B2G][SMS]Delete button behavior intermittently unexpected ...
========
https://hg.mozilla.org/integration/gaia-central/rev/b1ca52557440
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 987445 - [B2G][SMS]Delete button behavior intermittently unexpected when no conversations are selected r=arnau
This removes the 'vertical-align: middle' property for icon buttons.
========
https://hg.mozilla.org/integration/gaia-central/rev/4a10a9d9b822
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17779 from evanxd/bug-984572
Bug 984572 - JSHint fixes for js/*, js/utils and js/worker.
========
https://hg.mozilla.org/integration/gaia-central/rev/494e9d90d085
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 984572 - JSHint fixes for js/*, js/utils and js/worker.
2014-04-01 01:16:07 -07:00
B2G Bumper Bot
4649227732
Bumping manifests a=b2g-bump
2014-03-31 23:46:10 -07:00
B2G Bumper Bot
b16f6792c3
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/71b972d0b5f6
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #17624 from hfiguiere/bug988114
Bug 988114 - Hardcode the sha1 we want for the gaia-node-modules. r=yuren,kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/addd45c53d7d
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 988114 - Update revision for gaia-node-modules. a=kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/1ccd90950d7c
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 988114 - Hardcode the sha1 we want for the gaia-node-modules. r=yuren
2014-03-31 23:40:57 -07:00
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