Commit Graph

25760 Commits

Author SHA1 Message Date
Wes Kocher
9de1c195f2 Merge m-c to b2ginbound, a=merge 2015-09-14 17:27:31 -07:00
Wes Kocher
3b2eb660d8 Merge b2ginbound to central, a=merge 2015-09-14 17:23:34 -07:00
B2G Bumper Bot
5531e09f74 Bumping manifests a=b2g-bump 2015-09-14 15:52:47 -07:00
B2G Bumper Bot
d7bee76e10 Bumping manifests a=b2g-bump 2015-09-14 12:33:56 -07:00
B2G Bumper Bot
6af9525049 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fc72d649c176
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #31838 from gaye/1200400-marionette-client-v1.9.0

Bug 1200400 - marionette-js-client v1.9.0

========

https://hg.mozilla.org/integration/gaia-central/rev/12d69155b726
Author: gaye <gareth.aye@gmail.com>
Desc: Bug 1200400 - marionette-js-client v1.9.0

========

https://hg.mozilla.org/integration/gaia-central/rev/0011ab9e68b4
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #31636 from yzen/bug-1200400

Bug 1200400 - adding switchToShadowRoot to jsmarionette.

========

https://hg.mozilla.org/integration/gaia-central/rev/1cc7f24746eb
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1200400 - adding switchToShadowRoot to jsmarionette.
2015-09-14 12:30:32 -07:00
B2G Bumper Bot
f3f948347a Bumping manifests a=b2g-bump 2015-09-14 11:52:47 -07:00
B2G Bumper Bot
3811e56e0b Bumping manifests a=b2g-bump 2015-09-14 11:38:56 -07:00
B2G Bumper Bot
b11acf44cf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c11983af54cf
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Merge pull request #31683 from russnicoletti/bug-1198346

Bug 1198346 - [Metrics] AddOns Metric collection r=marshall_law,fabrice

========

https://hg.mozilla.org/integration/gaia-central/rev/333ecadf122a
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Bug 1198346 - [Metrics] AddOns Metric collection
2015-09-14 11:35:33 -07:00
B2G Bumper Bot
ae56ee2d4b Bumping manifests a=b2g-bump 2015-09-14 09:08:54 -07:00
B2G Bumper Bot
b4e224443b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0611acb452ed
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #31806 from sfoster/task-manager-empty-icon-bug-1194217

Bug 1194217 - handle empty response when updating card icon. r=albertopq

========

https://hg.mozilla.org/integration/gaia-central/rev/00fa3dfb1b48
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1194217 - handle empty response when updating card icon. r=albertopq
2015-09-14 09:05:31 -07:00
B2G Bumper Bot
0513329adf Bumping manifests a=b2g-bump 2015-09-14 08:23:53 -07:00
B2G Bumper Bot
b37aa0b050 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5e79ec2ee2e1
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #31803 from Cwiiis/bug1203980-icons-helper-datastore-error

Bug 1203980 - Don't try to add a URL object to datastore. r=albertopq

========

https://hg.mozilla.org/integration/gaia-central/rev/1317e3163e34
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1203980 - Don't try to add a URL object to datastore. r=albertopq
2015-09-14 08:20:32 -07:00
B2G Bumper Bot
f6864db4ad Bumping manifests a=b2g-bump 2015-09-14 03:32:52 -07:00
B2G Bumper Bot
8def418a2c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f90b75f394d8
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #31738 from lissyx/bug1150823

Bug 1150823 - FxA should trigger oncancel when flow is aborted r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/9bbc0dbfabf3
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 1150823 - FxA should trigger oncancel when flow is aborted r=ferjm
2015-09-14 03:29:30 -07:00
B2G Bumper Bot
6c6722f742 Bumping manifests a=b2g-bump 2015-09-14 00:38:32 -07:00
B2G Bumper Bot
4de5e98ef8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d480a4a3f47c
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #31778 from gasolin/issue-1203356

Bug 1203356 - [Settings] remove C-H panel strings in HTML, r=yzen

========

https://hg.mozilla.org/integration/gaia-central/rev/6d77707a51b4
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1203356 - [Settings] remove C-H panel strings in HTML, r=yzen
2015-09-14 00:35:10 -07:00
B2G Bumper Bot
de90e4b72f Bumping manifests a=b2g-bump 2015-09-13 20:03:31 -07:00
B2G Bumper Bot
3d49033913 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f894ddb1493c
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #31715 from scottwu/1199872-audio-turning-sound-off-2

Bug 1199872 - Does not play sound until volumn change occured r=gasolin

========

https://hg.mozilla.org/integration/gaia-central/rev/b6627aa9bdf9
Author: Scott Wu <scottcwwu@gmail.com>
Desc: Bug 1199872 - Does not play sound until volumn change occured r=gasolin
2015-09-13 20:00:10 -07:00
B2G Bumper Bot
7dbaa930a5 Bumping manifests a=b2g-bump 2015-09-13 19:38:33 -07:00
B2G Bumper Bot
838d4fd5aa Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b19c7256a967
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #31717 from scottwu/1179343-hotspot-enable-disable-msg

Bug 1179343 - Wi-Fi hotspot layout to show enabled/disabled messages, r=gasolin

========

https://hg.mozilla.org/integration/gaia-central/rev/b50656788a20
Author: Scott Wu <scottcwwu@gmail.com>
Desc: Bug 1179343 - Wi-Fi hotspot layout to show enabled/disabled messages. r=gasolin
2015-09-13 19:35:11 -07:00
B2G Bumper Bot
d951844c20 Bumping manifests a=b2g-bump 2015-09-13 15:58:51 -07:00
B2G Bumper Bot
e093e31401 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/daee6dfb8bf7
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1194979 - Follow-up, add firefox directory to .gitignore r=me
2015-09-13 15:55:29 -07:00
Phil Ringnalda
3cfa3e89c4 Merge m-i to m-c, a=merge 2015-09-13 11:58:18 -07:00
B2G Bumper Bot
8e588ec0f6 Bumping manifests a=b2g-bump 2015-09-13 04:11:20 -07:00
B2G Bumper Bot
185e583cbb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/616fa9b10c5e
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31812 from mermi/bug1188926

Bug 1188926 - Make all the apps have an manifestURL as well as a name and check for that

========

https://hg.mozilla.org/integration/gaia-central/rev/eeed80acbe6b
Author: mermi <manel.rhaiem92@gmail.com>
Desc: Bug 1188926 - Make all the apps have an manifestURL as well as a name and check for that
2015-09-13 04:10:31 -07:00
B2G Bumper Bot
1c854d38b1 Bumping manifests a=b2g-bump 2015-09-13 02:33:52 -07:00
B2G Bumper Bot
bd93b4856f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8d08d4c88188
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #31601 from ferjm/bug1168160.statemachine

Bug 1168160 - Sync state machine. r=etienne, michielbdejong, seanless

========

https://hg.mozilla.org/integration/gaia-central/rev/641b352d173b
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1168160 - Sync state machine. r=etienne, michielbdejong, seanlee
2015-09-13 02:30:30 -07:00
B2G Bumper Bot
462004afc1 Bumping manifests a=b2g-bump 2015-09-12 17:03:52 -07:00
B2G Bumper Bot
6ea256f886 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/358472e162de
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1197619 - [Messages] Convert switch controls to use web components"

This reverts commit 8e99736b95d9f54396ee0c1ebe060afe2b52a09c.
2015-09-12 17:00:31 -07:00
B2G Bumper Bot
ca4107b229 Bumping manifests a=b2g-bump 2015-09-12 14:33:51 -07:00
B2G Bumper Bot
a83187dfce Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

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

Bug 1197619 - [Messages] Convert switch controls to use web components

========

https://hg.mozilla.org/integration/gaia-central/rev/4a3f6f7fa2cf
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1197619 - [GaiaCheckbox] Make non-inline label wrapper stretch to height of container

========

https://hg.mozilla.org/integration/gaia-central/rev/1fc713285c9b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1197619 - [Messages] Convert switch controls to use web components
2015-09-12 14:30:29 -07:00
B2G Bumper Bot
756fb60750 Bumping manifests a=b2g-bump 2015-09-12 00:18:59 -07:00
B2G Bumper Bot
b2a8fcaa06 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/229ccafd68fd
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #31808 from jimporter/music-nga-bulletproof

Bug 1191760 - [music] Speculative patch to bulletproof metadata parsi…

========

https://hg.mozilla.org/integration/gaia-central/rev/ec6528ed1f0e
Author: Jim <jporter@mozilla.com>
Desc: Bug 1191760 - [music] Speculative patch to bulletproof metadata parsing, NGA version

========

https://hg.mozilla.org/integration/gaia-central/rev/28bb24805346
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #31805 from jimporter/music-check-playability

Bug 1191760 - [music] App doesn't load all music; fix checkPlayabilit…

========

https://hg.mozilla.org/integration/gaia-central/rev/3aff9e283e71
Author: Jim <jporter@mozilla.com>
Desc: Bug 1191760 - [music] App doesn't load all music; fix checkPlayability() so it doesn't hang
2015-09-12 00:15:38 -07:00
Phil Ringnalda
cfd5f1e391 Merge m-c to b-i 2015-09-11 22:07:15 -07:00
Phil Ringnalda
c5faed392a Merge b-i to m-c, a=merge 2015-09-11 20:27:20 -07:00
B2G Bumper Bot
5e1ed7b942 Bumping manifests a=b2g-bump 2015-09-11 17:44:10 -07:00
B2G Bumper Bot
81ce353dca Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/dbd05f0dba99
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #31796 from jimporter/music-nga-metadata-docs

Bug 1203822 - [music][nga] Provide metadata documentation

========

https://hg.mozilla.org/integration/gaia-central/rev/42d73264dc06
Author: Jim <jporter@mozilla.com>
Desc: Bug 1203822 - [music][nga] Provide metadata documentation
2015-09-11 17:40:13 -07:00
B2G Bumper Bot
1c28909a31 Bumping manifests a=b2g-bump 2015-09-11 16:57:52 -07:00
B2G Bumper Bot
266c525d60 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6bf63f9dca3d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1188926 - Revert "make manifestURL instead of name"

This reverts commit 53b345d53d9d273d6c857eae1181c08bb162d441.
2015-09-11 16:54:30 -07:00
B2G Bumper Bot
efcffe0ae6 Bumping manifests a=b2g-bump 2015-09-11 16:03:35 -07:00
B2G Bumper Bot
d5b65a0dc3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e6d3ee802cd7
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31747 from mermi/bug1188926

Bug 1188926 - Make all the apps have an manifestURL as well as a name and check for that

========

https://hg.mozilla.org/integration/gaia-central/rev/23d5b1cc5b88
Author: mermi <manel.rhaiem92@gmail.com>
Desc: make manifestURL instead of name
2015-09-11 16:00:12 -07:00
B2G Bumper Bot
9ceecd17a2 Bumping manifests a=b2g-bump 2015-09-11 14:19:00 -07:00
B2G Bumper Bot
3c61748184 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c0f536773eca
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #31551 from jimporter/music-pick-search

Bug 1191233 - [music] Closing search view from picker breaks the picker

========

https://hg.mozilla.org/integration/gaia-central/rev/63c20306bed6
Author: Jim <jporter@mozilla.com>
Desc: Bug 1191233 - [music] Closing search view from picker breaks the picker
2015-09-11 14:15:37 -07:00
B2G Bumper Bot
e6fab2c29e Bumping manifests a=b2g-bump 2015-09-11 12:08:29 -07:00
B2G Bumper Bot
4a1117fe82 Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fc6be47c9a6d
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #31791 from sfoster/ftu-navigation-bug-1203677

Bug 1203677 - refactor Navigation to expose API for step registration. r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/5ea94c9b6750
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1203677 - refactor Navigation to expose API for step registration. r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/675b2d4c74ef
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31795 from mwargers/1203734

Bug 1203734 - test_import_gmail_no_network.py is passing unexpectedly

========

https://hg.mozilla.org/integration/gaia-central/rev/355c695d5238
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1203734 - test_import_gmail_no_network.py is passing unexpectedly

========

https://hg.mozilla.org/integration/gaia-central/rev/318cff8a8b7f
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31801 from mwargers/1202831

Bug 1202831 - Fix failure in test_findmydevice.py

========

https://hg.mozilla.org/integration/gaia-central/rev/ab6b1c087822
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1202831 - Fix failure in test_findmydevice.py

========

https://hg.mozilla.org/integration/gaia-central/rev/2b06f1d7fcbf
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31793 from mwargers/1201211

Bug 1201211 - Workaround fix for failure in test_add_new_contact.py

========

https://hg.mozilla.org/integration/gaia-central/rev/250ceda6c870
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1201211 - Workaround fix for failure in test_add_new_contact.py
2015-09-11 12:05:07 -07:00
Carsten "Tomcat" Book
826e271f1a merge mozilla-inbound to mozilla-central a=merge 2015-09-11 16:36:35 +02:00
B2G Bumper Bot
040dd77cb0 Bumping manifests a=b2g-bump 2015-09-11 09:51:52 -07:00
B2G Bumper Bot
4c5326daf9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/55a71ca30475
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #31567 from michielbdejong/1191776-fxsyncwebcrypto

Bug 1191776 - FxSyncWebCrypto component of Sync app r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/d2bd294f75e3
Author: Michiel de Jong <mbdejong@mozilla.com>
Desc: Bug 1191776 - FxSyncWebCrypto component of Sync app r=ferjm
2015-09-11 09:45:40 -07:00
B2G Bumper Bot
d9d74a6e26 Bumping manifests a=b2g-bump 2015-09-11 08:16:50 -07:00
B2G Bumper Bot
1417cdb1a6 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3dba1d8c3f85
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #31233 from hfiguiere/bug1157782-shuffle-test

Bug 1157782 - Fix the shuffle test to make it more robust. r=squib

========

https://hg.mozilla.org/integration/gaia-central/rev/32ac7a531130
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1157782 - Make all the test files a 10sec blank so that we have time to stuff

========

https://hg.mozilla.org/integration/gaia-central/rev/af8ce7bd2295
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1157782 - Fix the shuffle test to make it more robust.
2015-09-11 08:16:26 -07:00