Ed Morley
c2b5cd0deb
Backed out changeset ea2341b06e6f (bug 994541) for reftest timeouts
2014-07-21 17:26:40 +01:00
Wes Kocher
1364dd2bfb
Merge b2g-inbound to m-c a=merge
2014-07-21 12:58:05 -07:00
Wes Kocher
ca3c4ad9da
Merge inbound to m-c a=merge
2014-07-21 12:54:52 -07:00
B2G Bumper Bot
050ad618e2
Bumping manifests a=b2g-bump
2014-07-21 10:46:42 -07:00
B2G Bumper Bot
a200cbfa81
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/591c866cb04a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21995 from KevinGrandon/bug_1041607_async_xhr_in_tests
Bug 1041607 - Remove synchronous XHR from tests
========
https://hg.mozilla.org/integration/gaia-central/rev/f0666d464d19
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1041607 - Remove synchronous XHR from tests r=amirn
2014-07-21 10:40:25 -07:00
B2G Bumper Bot
049837b774
Bumping manifests a=b2g-bump
2014-07-21 10:06:44 -07:00
B2G Bumper Bot
483fd4b593
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4abeb620f7a1
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #20096 from johngruen/bug-1013522-firefox-account-ui-should-match
bug 1013522 firefox account ui should match
========
https://hg.mozilla.org/integration/gaia-central/rev/60217bd9de0e
Author: johngruen <john.gruen@gmail.com>
Desc: Bug 1013522 - Firefox Accounts system app visual polish. r=ferjm
2014-07-21 10:00:27 -07:00
B2G Bumper Bot
cafb2b55ea
Bumping manifests a=b2g-bump
2014-07-21 08:56:24 -07:00
B2G Bumper Bot
3c7b5a2204
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a24d67d3941a
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #21939 from Rik/incoming-screen-961154
Bug 961154 - When a second incoming call occurs, it does not turn the sc... r=drs
========
https://hg.mozilla.org/integration/gaia-central/rev/c5aca7a532f9
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 961154 - When a second incoming call occurs, it does not turn the screen on
========
https://hg.mozilla.org/integration/gaia-central/rev/21f2f7f960d9
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #21964 from EverythingMe/1040618-migrate
Bug 1040618 - [B2G][OTA] Several issues opening smart collections migrat...
========
https://hg.mozilla.org/integration/gaia-central/rev/f7011df19e68
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 1040618 - [B2G][OTA] Several issues opening smart collections migrated from 1.x
2014-07-21 08:45:36 -07:00
B2G Bumper Bot
f069d34937
Bumping manifests a=b2g-bump
2014-07-21 08:21:22 -07:00
B2G Bumper Bot
b2f9dd7d70
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7f81d74e2073
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1041539 - Rocketbar.js, TypeError: this.handleStackChanged is not a function r=daleharvey
========
https://hg.mozilla.org/integration/gaia-central/rev/250d9feaa16b
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #21993 from viorelaioia/bug-1021732
Bug 1021732 - [Flame] Re-enable test_privileged_app_contacts_prompt
========
https://hg.mozilla.org/integration/gaia-central/rev/63fe9f499649
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1021732 - [Flame] Re-enable test_privileged_app_contacts_prompt
2014-07-21 08:15:35 -07:00
B2G Bumper Bot
3f631b87d3
Bumping manifests a=b2g-bump
2014-07-21 07:47:06 -07:00
B2G Bumper Bot
9c6dbf36fa
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/19aae827ae94
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #21992 from viorelaioia/bug_1041543
Bug 1041543 - Disable tests that update a contact, due to Bug 1041510
========
https://hg.mozilla.org/integration/gaia-central/rev/e954c6b2be3c
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1041543 - DIsable tests that update a contact, due to Bug 1041510
2014-07-21 07:45:35 -07:00
B2G Bumper Bot
cca747bc13
Bumping manifests a=b2g-bump
2014-07-21 06:26:19 -07:00
B2G Bumper Bot
e44aef0326
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/037b908a57db
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #21345 from stasm/1015041-pseudol10n-runtime
Bug 1015041 - Move pseudo l10n to runtime. r=gandalf f=yurenju
========
https://hg.mozilla.org/integration/gaia-central/rev/ae259cddfff2
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1015041 - Move pseudo l10n to runtime. r=gandalf f=yurenju
2014-07-21 06:20:34 -07:00
Carsten "Tomcat" Book
8fac0a5f7b
Backed out changeset 98fa8afd9169 (bug 1038357) for causing merge conflicts due startup crash backout
2014-07-21 15:15:20 +02:00
Neil Deakin
dcd3ced492
Bug 1013064, backout e5dfe9801f76, 11f3a97d1d2c, e2374762f521, 91db8acb8d7e, d0050ba0b875 due to sync issues
2014-07-21 09:09:41 -04:00
Carsten "Tomcat" Book
0a6b2c043a
Backed out changeset a232fd36c827 (bug 1020416) for nightly startup crashed - bug 1041492 a=sheriffduty
2014-07-21 14:57:09 +02:00
B2G Bumper Bot
e484be6b93
Bumping manifests a=b2g-bump
2014-07-21 05:56:18 -07:00
B2G Bumper Bot
59c9d1ee7c
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fbfc6e04d748
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21952 from KevinGrandon/bug_1021276_sms_icon
Bug 1021276 - [Messages] Update message app icons
========
https://hg.mozilla.org/integration/gaia-central/rev/b21b189c26c7
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021276 - [Messages] Update message app icons r=julienw
========
https://hg.mozilla.org/integration/gaia-central/rev/d170f66c7129
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21951 from KevinGrandon/bug_1021276_dialer_icon
Bug 1021276 - [Dialer] Update dialer app icons
========
https://hg.mozilla.org/integration/gaia-central/rev/0aa93cebf7e0
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021276 - [Dialer] Update dialer app icons r=rik
========
https://hg.mozilla.org/integration/gaia-central/rev/414c564a62ae
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21950 from KevinGrandon/bug_1021276_contacts_icon
Bug 1021276 - [Contacts] Update contacts app icons
========
https://hg.mozilla.org/integration/gaia-central/rev/d6adc59c0d43
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021276 - [Contacts] Update contacts app icons r=arcturus
2014-07-21 05:50:32 -07:00
B2G Bumper Bot
3bdeae39f2
Bumping manifests a=b2g-bump
2014-07-21 05:41:19 -07:00
B2G Bumper Bot
a9878b9e8c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6f9056216772
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #21977 from jmcanterafonseca/fix_loop_contacts2
Bug 1017756 - Update Loop buttons & state (color, name, visibility...) i...
========
https://hg.mozilla.org/integration/gaia-central/rev/e6f901e5ea92
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1017756 - Update Loop buttons & state (color, name, visibility...) in contact details when a branding/UX decision is taken
2014-07-21 05:35:34 -07:00
B2G Bumper Bot
fdc05b7b9f
Bumping manifests a=b2g-bump
2014-07-21 04:47:00 -07:00
B2G Bumper Bot
fdcc1085fa
Bumping manifests a=b2g-bump
2014-07-21 04:07:19 -07:00
B2G Bumper Bot
19f5bcd6fb
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/090c8de8ca1c
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #21849 from steveck-chung/bug-1015390
Bug 1015390 - [SMS] Implement new startup loading events r=julienw
========
https://hg.mozilla.org/integration/gaia-central/rev/01d72446b272
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 1015390 - [SMS] Implement new startup loading events
2014-07-21 04:05:31 -07:00
Carsten "Tomcat" Book
bc86710063
merge b2g-inbound to mozilla-central a=merge
2014-07-21 12:59:29 +02:00
Thomas Zimmermann
6344f16624
Bug 1041440: Create Promise using |Promise::Create|, r=btian
...
This patch fixes a call to the private constructor of |Promise|.
2014-07-21 12:41:29 +02:00
B2G Bumper Bot
214a8b1c1d
Bumping manifests a=b2g-bump
2014-07-21 03:41:55 -07:00
B2G Bumper Bot
31dcd5e75d
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/dd035f212994
Author: Sherman Chen <shamenchens@users.noreply.github.com>
Desc: Merge pull request #21983 from shamenchens/Bug942718-FTUAboutFirefoxOS
Bug 942718 - FTU About Firefox page should not be moved, r=fcampo
========
https://hg.mozilla.org/integration/gaia-central/rev/0d055daec87f
Author: Sherman Chen <shamen.chens@gmail.com>
Desc: Bug 942718 - FTU About Firefox page should not be moved
2014-07-21 03:40:33 -07:00
Jessica Jong
103ad78e68
Bug 1032858 - Part 2: implementation of cell info list. r=hsinyi
2014-07-21 18:21:44 +08:00
Jessica Jong
3292b9b63c
Bug 1032858 - Part 1: interface changes to support cell info list. f=hannosch r=hsinyi
2014-07-21 18:21:42 +08:00
B2G Bumper Bot
fbc32df6e1
Bumping manifests a=b2g-bump
2014-07-21 03:01:17 -07:00
B2G Bumper Bot
ffafd405c6
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/27d1e38b33eb
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 1036821 - git commit hash isn't wrote to settings/resources/gaia_commit.txt on Windows"
This reverts commit 6b6c77c2a1b93deab5466744bb857b37ec755567.
========
https://hg.mozilla.org/integration/gaia-central/rev/142a658bd3d3
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 1039739 - Add some logging when writing the git commit id into the settings app;r=yurenju"
This reverts commit 8d0f21f728c837276b2ad3484213f623622c81bf.
========
https://hg.mozilla.org/integration/gaia-central/rev/f3e5599b7202
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 1039739 - Make it more clear what command we're executing;r=yuren"
This reverts commit 74caef0139574c7fcf2c77255df9088f44a4dafe.
2014-07-21 02:55:33 -07:00
B2G Bumper Bot
e402791f08
Bumping manifests a=b2g-bump
2014-07-21 02:46:25 -07:00
B2G Bumper Bot
d98c41ee5c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/bf1a57f891c0
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #18471 from EragonJ/bug-973466
Bug 973466 - [settings] refactor wifi panel with AMD pattern
========
https://hg.mozilla.org/integration/gaia-central/rev/64a2ff79c756
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 973466 - [settings] refactor wifi panel with AMD pattern
2014-07-21 02:40:33 -07:00
B2G Bumper Bot
ae76ea209f
Bumping manifests a=b2g-bump
2014-07-21 02:16:22 -07:00
B2G Bumper Bot
8d5178ea16
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/654f171deb50
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #21956 from wilsonpage/1040982
Bug 1040982 - [Camera][Hamachi] Doesn't show loading spinner on start-up
========
https://hg.mozilla.org/integration/gaia-central/rev/dd5d1aba7fb8
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1040982 - [Camera][Hamachi] Doesn't show loading spinner on start-up
2014-07-21 02:10:33 -07:00
B2G Bumper Bot
c6e3188156
Bumping manifests a=b2g-bump
2014-07-21 02:01:23 -07:00
B2G Bumper Bot
adfc6f7c91
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/5703878185d4
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #21862 from lodr/bug-1039984-smartcollections-and-homescreen
Bug 1039984 - [System] Trying to open a smartcollection after killing th...
========
https://hg.mozilla.org/integration/gaia-central/rev/dc8c5d9df3c1
Author: Salvador de la Puente <salva@unoyunodiez.com>
Desc: Bug 1039984 - [System] Trying to open a smartcollection after killing the Homescreen do nothing.
Allow Homescreen application window to be killed as other windows. But
avoiding to be marked as _killed as, from a system app perspective, the
homescreen is never killed.
========
https://hg.mozilla.org/integration/gaia-central/rev/fb44b8b6023f
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #21970 from gasolin/issue-1040676
Bug 1040676 - [System] Wrong 2.25x resource for Quick setting bluethooth...r=pavel
========
https://hg.mozilla.org/integration/gaia-central/rev/a51012ca9771
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1040676 - [System] Wrong 2.25x resource for Quick setting bluethooth on indicator
========
https://hg.mozilla.org/integration/gaia-central/rev/e51498449283
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #21934 from acperez/bug-1040700
Bug 1040700 - Modify APN for ATT because last update doesn't work as expected. r=jaoo
========
https://hg.mozilla.org/integration/gaia-central/rev/a2ba0f99da63
Author: Albert <alberto.crespellperez@telefonica.com>
Desc: Bug 1040700 - Modify APN for ATT because last update doesn't work as expected.r=jaoo
2014-07-21 01:55:32 -07:00
B2G Bumper Bot
4c5a1513c1
Bumping manifests a=b2g-bump
2014-07-21 01:31:16 -07:00
B2G Bumper Bot
23b45672b1
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3112418e17e7
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #21955 from arcturus/bug-1038414
Bug 1038414 - [B2G][Contacts][Camera][273MB Flame] Camera app OOMs when adding picture to contact r=jmcf
========
https://hg.mozilla.org/integration/gaia-central/rev/f0ebb320d202
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 1038414 - [B2G][Contacts][Camera][273MB Flame] Camera app OOMs when adding picture to contact
2014-07-21 01:25:32 -07:00
B2G Bumper Bot
ed5ef070f4
Bumping manifests a=b2g-bump
2014-07-21 00:31:20 -07:00
B2G Bumper Bot
3bac31a9d3
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e63ca851cb32
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21944 from wlach/1039739-2
Bug 1039739 - Make it more clear what command we're executing;r=yuren
========
https://hg.mozilla.org/integration/gaia-central/rev/d8802cfd38a5
Author: William Lachance <wlachance@mozilla.com>
Desc: Bug 1039739 - Make it more clear what command we're executing;r=yuren
========
https://hg.mozilla.org/integration/gaia-central/rev/0f061f41a849
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21841 from tenmilestereo/master
Bug 1031998 - JSHint now throwing no errors r=@yurenju
========
https://hg.mozilla.org/integration/gaia-central/rev/a146f315d66b
Author: Lewis Cowper <lewis@lewiscowper.org>
Desc: Bug 1031998 - Fix jshint error for build/config/payment-dev-prefs.js
2014-07-21 00:25:32 -07:00
Bill McCloskey
ac4a08de3d
Bug 1041370 - Fix script entry hook #ifdefing (a=RyanVM)
2014-07-20 21:58:49 -07:00
B2G Bumper Bot
c4379e821c
Bumping manifests a=b2g-bump
2014-07-20 21:41:17 -07:00
B2G Bumper Bot
ae4dd87470
Bumping gaia.json for 10 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d0bfe011a555
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #21898 from timdream/keyboard-target-handler
Bug 1035062 - Implement TargetHandlersManager, r=rudyl
========
https://hg.mozilla.org/integration/gaia-central/rev/aa191e5108e0
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part IX) Implement TargetHandlersManager
========
https://hg.mozilla.org/integration/gaia-central/rev/3128d765dc18
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part VIII) Implement CandidatePanelManager
========
https://hg.mozilla.org/integration/gaia-central/rev/9ada807315de
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part VII) Remove resetScroll from IMERender.toggleCandidatePanel()
========
https://hg.mozilla.org/integration/gaia-central/rev/38a3acf3a372
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part VI) Remove the NO_OP special keyCode
========
https://hg.mozilla.org/integration/gaia-central/rev/c45e1bbb0115
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part V) Use state object in IMERender.setUpperCaseLock()
========
https://hg.mozilla.org/integration/gaia-central/rev/d823635bb36b
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part IV) Make setUpperCase take a state object
========
https://hg.mozilla.org/integration/gaia-central/rev/41aa02c39da0
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part III) Remove resetUpperCase()
========
https://hg.mozilla.org/integration/gaia-central/rev/8608e6421d57
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part II) Move double tap monitoring to ActiveTargetsManager
========
https://hg.mozilla.org/integration/gaia-central/rev/9aae290b5992
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1035062 - (Part I) Remove unused isContinousSpacePressed
remove unused variable
2014-07-20 21:35:32 -07:00
Ben Tian
826912823a
Bug 1038026 - Fire onattributechanged event when adapter fails to turn on/off BT and restores state to Disabled/Enabled, r=echou
2014-07-21 10:44:09 +08:00
Eric Chou
1e0635b293
Bug 1036863 - [MTP] Rename file/folder via MTP, r=dhylands
...
This patch fixed 'unable to rename file/folder via MTP' by
responding to MTP operation 'setObjectPropertyValue' correctly
2014-07-21 09:57:04 +08:00
Eric Chou
bb9df51f8c
Bug 1036861 - [MTP] Write file size into the response of getObjectInfo, r=dhylands
...
In the response of operation GetObjectInfo, there is a field
"ObjectCompressedSize". Currently it's assigned with 0. We need
to put correct file size into it. I also corrected the type of
property value in function getObjectPropertyDesc().
2014-07-21 09:56:58 +08:00
Ryan VanderMeulen
ebc558f27b
Merge inbound to m-c. a=merge
2014-07-20 21:13:15 -04:00