7649261537
Merge inbound to m-c.
2014-04-03 15:24:54 -04:00
c6bc1895dd
Merge b2g-inbound to m-c.
2014-04-03 15:10:56 -04:00
050374bb25
Bumping manifests a=b2g-bump
2014-04-03 11:21:25 -07:00
539f10016b
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ac34484ce7f6
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #17807 from huchengtw-moz/system2/Bug_971554-reland-2"
This reverts commit 3c23b5013e62d6f059d9a0b9f9e8c8db0c3aa2fe, reversing
changes made to 716250e989d516c6e0c1bf5bf0d69417428f17c2.
Conflicts:
apps/system/js/bootstrap.js
2014-04-03 11:16:17 -07:00
a5adba5b39
Bumping manifests a=b2g-bump
2014-04-03 09:21:16 -07:00
e8faacda0b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/30c80e4efa68
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17922 from gitmai/bug-987142-CC-jshint-fix-2
Bug 987142 -[Cost Control] Fix jshint erros (second part)
r=jmcf
========
https://hg.mozilla.org/integration/gaia-central/rev/34c2151a3299
Author: mai <mri@tid.es>
Desc: Bug 987142 - [CostControl] Fix jshint errors (second part)
2014-04-03 09:16:09 -07:00
6579100a87
Bumping manifests a=b2g-bump
2014-04-03 09:06:20 -07:00
457f77c283
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/88628e86b7b1
Author: Michał Budzyński <michal@virtualdesign.pl>
Desc: Merge pull request #16326 from michalbe/nfc-contacts
Bug 903245 - NFC support in contacts
========
https://hg.mozilla.org/integration/gaia-central/rev/d3dbcc917d45
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: Bug 903245 - NFC support in contacts
2014-04-03 09:01:14 -07:00
c8f4479558
Bumping manifests a=b2g-bump
2014-04-03 08:56:13 -07:00
3277f42908
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/463fd6e56dc9
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #15323 from pivanov/bug-949758
Bug 949758 - [B2G][Settings] The highlighter for the language selection box is offset.
========
https://hg.mozilla.org/integration/gaia-central/rev/16ebe7853d97
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 949758 - [B2G][Settings] The highlighter for the language selection box is offset.
2014-04-03 08:51:05 -07:00
fe53257d7a
Bumping manifests a=b2g-bump
2014-04-03 08:16:58 -07:00
d70242cf30
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/371c13208a54
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16329 from Joshua-S/bug-971704
[Bug 971704] - Clean up Wallpaper File Structure in Gaia
========
https://hg.mozilla.org/integration/gaia-central/rev/9bde3c63ffbc
Author: Joshua Smith <joshua-smith@verizon.net>
Desc: Bug 971704 - Clean up Wallpaper File Structure in Gaia
2014-04-03 08:10:41 -07:00
01627b900e
Bug 991203 - mozconfig file to be used for B2G linux64 desktop debug builds. r=aki, a=NPOTB
2014-04-03 15:20:28 +02:00
87f3c4aa86
merge b2g-inbound to mozilla-central
2014-04-03 12:48:14 +02:00
5ac934e7c5
Bumping manifests a=b2g-bump
2014-04-02 23:06:18 -07:00
497a17eded
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ee69e9abde3e
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #17930 from davidflanagan/bug990630
Bug 990630: extract the EXIF preview metadata that media frame needs r=jdarcangelo
========
https://hg.mozilla.org/integration/gaia-central/rev/d24179d3a963
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 990630: extract the EXIF preview metadata that media frame needs
don't parse EXIF again when creating thumbnail
Diego's README changes
update tests
2014-04-02 23:01:11 -07:00
04d20e1421
Bumping manifests a=b2g-bump
2014-04-02 21:06:10 -07:00
9b18db5fbb
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e6c4a9eb4ba5
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17683 from gasolin/issue--971538
Bug 971538 - [System2] Instantiable PermissionManager, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/2d960ba50df5
Author: gasolin <gasolin@gmail.com>
Desc: Bug 971538 - [System2] Instantiable PermissionManager
- rename currentPermission to permissionType
2014-04-02 21:01:08 -07:00
5e8b45c8d8
Bumping manifests a=b2g-bump
2014-04-02 20:08:22 -07:00
b1216d05e8
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/2f5576bf01a6
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #17092 from hfiguiere/bug980972
Bug 980972 - assert if we actually timeout. r=julienw
========
https://hg.mozilla.org/integration/gaia-central/rev/413d2958dbe0
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 980972 - Report a ScriptTimeout the error and have the test deal with it. r=julienw
2014-04-02 20:08:11 -07:00
f41e0c4cbc
Merge m-c to b2g-inbound
2014-04-02 19:55:38 -07:00
ad403cb0a6
Bumping manifests a=b2g-bump
2014-04-02 19:46:03 -07:00
1b6527818d
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e2352010e271
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #17926 from justindarc/bug987609
Bug 987609 - [Camera][Madai][UX] Gallery/preview Image number should be ...
========
https://hg.mozilla.org/integration/gaia-central/rev/a26aeba93555
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 987609 - [Camera][Madai][UX] Gallery/preview Image number should be visible when swiping
2014-04-02 19:41:12 -07:00
e4bb8736a9
Merge m-c to inbound on a CLOSED TREE
2014-04-02 19:54:15 -07:00
b42cc30cf7
Merge b2g-inbound to m-c
2014-04-02 19:06:17 -07:00
1edbc56850
Bumping manifests a=b2g-bump
2014-04-02 18:27:40 -07:00
cd39badcb7
Bumping gaia.json for 10 gaia revision(s) a=gaia-bump
...
Truncated some number of revisions since the previous bump.
========
https://hg.mozilla.org/integration/gaia-central/rev/7dbabbc473f4
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #17841 from snowmantw/issue972791-nfc-background-missing
Bug 972791 - [NFC] landscape NFC shrinking UI background has some issue
========
https://hg.mozilla.org/integration/gaia-central/rev/1e1efe180584
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 972791 - [NFC] landscape NFC shrinking UI background has some issue
========
https://hg.mozilla.org/integration/gaia-central/rev/15d4ace57db6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17662 from KevinGrandon/bug_984113_shared_integration_jshint
Bug 984113 - JSHint fixes for shared/test/integration/
========
https://hg.mozilla.org/integration/gaia-central/rev/9625b7e76102
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 984113 - JSHint fixes for shared/test/integration/ r=julienw,djf
========
https://hg.mozilla.org/integration/gaia-central/rev/d4372fa08c3e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17866 from KevinGrandon/bug_970688_settings_deviceid
Bug 970688 - Use mozSettings for Web Results deviceId parameter
========
https://hg.mozilla.org/integration/gaia-central/rev/1403385f78c4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 970688 - Use mozSettings for Web Results deviceId parameter r=amirn
========
https://hg.mozilla.org/integration/gaia-central/rev/79364ddd5f2a
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #17929 from asutherland/email-html-search-fix
Bug 882917 - [email] "Body" search of HTML messages regressed by worker thread migration. r=mcav
========
https://hg.mozilla.org/integration/gaia-central/rev/7a94849e6860
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 882917 - [email] "Body" search of HTML messages regressed by worker thread migration. r=mcav
land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/297
========
https://hg.mozilla.org/integration/gaia-central/rev/94e957b116d0
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #17927 from asutherland/email-search-updates
Bug 838843 - [email] email search does not update as headers are modified or deleted, allows user to still see and fail to display deleted messages. r=mcav
========
https://hg.mozilla.org/integration/gaia-central/rev/031ef2424954
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 838843 - [email] email search does not update as headers are modified or deleted, allows user to still see and fail to display deleted messages. r=mcav
land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/296
2014-04-02 18:26:13 -07:00
6266b29ea3
Bumping manifests a=b2g-bump
2014-04-02 15:11:12 -07:00
d12d0e73b4
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/98fd9bf9c257
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #17918 from dmarcos/bug988632
Bug 988632 - [Camera][Madai] More frequent instances of "Picture not sav...
========
https://hg.mozilla.org/integration/gaia-central/rev/964de2213053
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 988632 - [Camera][Madai] More frequent instances of "Picture not saved" when tapping shutter button
2014-04-02 15:06:09 -07:00
0c891431ae
Bumping manifests a=b2g-bump
2014-04-02 14:56:17 -07:00
e4b55b069f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f638a583d026
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17894 from wilsonpage/bug/987071
Bug 987071 - [Camera] The screen doesn't going to sleep in the preview gallery
========
https://hg.mozilla.org/integration/gaia-central/rev/46b68f91d013
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 987071 - [Camera] The screen doesn't going to sleep in the preview gallery
2014-04-02 14:51:05 -07:00
ab999f8dc1
Bumping manifests a=b2g-bump
2014-04-02 14:46:19 -07:00
8f819b6b61
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c0bfdc67ba2e
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17899 from rnowm/990960
Bug 990960 - [Browser] [regression] selected tab has blue border r=bfrancis
========
https://hg.mozilla.org/integration/gaia-central/rev/c0c0677cb95b
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 990960 - [Browser] [regression] selected tab has blue border
2014-04-02 14:41:09 -07:00
66a91c7f58
Bumping manifests a=b2g-bump
2014-04-02 11:47:54 -07:00
1186589567
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f2784b078a4b
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17902 from wilsonpage/bug/988108
Bug 988108 - [camera][madai] capitalization corrections
========
https://hg.mozilla.org/integration/gaia-central/rev/14b0dd615333
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988108 - [camera][madai] capitalization corrections
2014-04-02 11:46:16 -07:00
827492cfc8
Bumping manifests a=b2g-bump
2014-04-02 11:11:18 -07:00
814af7f425
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/67a734858540
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17904 from wilsonpage/bug/990255
Bug 990255 - [Camera][Mozilla] 1.4 Zoom bar and indicators are too close...
========
https://hg.mozilla.org/integration/gaia-central/rev/374f95d4a049
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 990255 - [Camera][Mozilla] 1.4 Zoom bar and indicators are too close to each other when rotated 180
2014-04-02 11:06:11 -07:00
627251c079
Bumping manifests a=b2g-bump
2014-04-02 11:03:51 -07:00
7fe61c1882
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d3d4d797d0c5
Author: ochameau <poirot.alex@gmail.com>
Desc: Merge pull request #17533 from jryans/devtools-server-tests
Bug 986223 - Test Dev Tools server toggling r=@ochameau
========
https://hg.mozilla.org/integration/gaia-central/rev/3a056e561b21
Author: J. Ryan Stinnett <jryans@gmail.com>
Desc: Bug 986223 - Test Dev Tools server toggling
2014-04-02 11:03:40 -07:00
1d70b8c714
Merge mozilla-central and b2g-inbound
2014-04-02 18:56:09 +01:00
4d5509f4c6
Bumping manifests a=b2g-bump
2014-04-02 10:22:37 -07:00
7c29d59775
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f57ba3848b8d
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17897 from arcturus/bug-990496
Bug 990496 - [Contacts] Error when user tries to cancel importing contacts
========
https://hg.mozilla.org/integration/gaia-central/rev/49f264631fcf
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 990496 - [Contacts] Error when user tries to cancel importing contacts
========
https://hg.mozilla.org/integration/gaia-central/rev/e9efe93a8c36
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17877 from verchaswa/Bug989023_Camera_MADAI_Mozilla_image_Preview_button_needs_highlight_state
[Bug 989023][Camera][Madai][Mozilla]Image Preview button needs highlight...
========
https://hg.mozilla.org/integration/gaia-central/rev/fc14d2e8deb5
Author: verchaswa.sharma <verchaswa.sharma@lge.com>
Desc: [Bug 989023][Camera][Madai][Mozilla]Image Preview button needs highlight state
2014-04-02 10:20:57 -07:00
1c8d30f58a
Bumping manifests a=b2g-bump
2014-04-02 09:26:22 -07:00
eb30bb6d1e
Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b8eae9817bd2
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17861 from gaye/bug-987350
Bug 987350 - Migrate alarm_test.js to use new view code r=millermedeiros
========
https://hg.mozilla.org/integration/gaia-central/rev/e00e22596b46
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 987350 - Migrate alarm_test.js to use new view code
========
https://hg.mozilla.org/integration/gaia-central/rev/d75dc1c0083b
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17893 from RudyLu/value_selector/remove-mozKeyboard
Bug 986992 - Remvoe navigator.mozKeyboard and use navigator.mozInputMethod
r=rudylu
========
https://hg.mozilla.org/integration/gaia-central/rev/63bd5af5a680
Author: Rudy Lu <me@rudy.lu>
Desc: Remove system app from mock keyboard app list.
========
https://hg.mozilla.org/integration/gaia-central/rev/d1a51a625bd9
Author: Yuan Xulei <xyuan@mozilla.com>
Desc: Bug 986992 - Remvoe navigator.mozKeyboard and use navigator.mozInputMethod instead.
2014-04-02 09:21:11 -07:00
49c30e5711
Bumping manifests a=b2g-bump
2014-04-02 08:36:09 -07:00
cd08a4ea34
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/14aa592477c1
Author: Gareth Aye <gaye@mozilla.com>
Desc: Remove incorrect comment about calendar marionette tests
2014-04-02 08:31:01 -07:00
f3479cf027
Bumping manifests a=b2g-bump
2014-04-02 08:21:16 -07:00
f9994496d3
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4b83b2738465
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17665 from DouglasSherk/987211-clock-lock-call
Bug 987211 - [Dialer][Lockscreen] Fix clock being invisible when receiving a call while screen locked. r=rik
========
https://hg.mozilla.org/integration/gaia-central/rev/36047b2510e1
Author: DouglasSherk <github@sherk.me>
Desc: Bug 987211 - Make sure l10n_date is loaded before calling back in LazyL10n.get(). r=rik
2014-04-02 08:16:04 -07:00
590fd6de29
Bumping manifests a=b2g-bump
2014-04-02 07:58:00 -07:00
dfb52284ba
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3d43c0bce3a9
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17908 from AndreiH/bug991076
Bug 991076 - Xfail test_cost_control_data_alert_mobile failing because B...
========
https://hg.mozilla.org/integration/gaia-central/rev/fd0df9a1107e
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 991076 - Xfail test_cost_control_data_alert_mobile failing because Bug 991067
2014-04-02 07:57:49 -07:00
Ryan VanderMeulen
B2G Bumper Bot
Simone Bruno
Carsten "Tomcat" Book
Wes Kocher
Ed Morley