Carsten "Tomcat" Book
503c35caf8
merge fx-team to mozilla-central a=merge
2015-11-09 14:30:43 +01:00
B2G Bumper Bot
2ac0146357
Bumping manifests a=b2g-bump
2015-11-08 23:01:39 -08:00
B2G Bumper Bot
3aeba69319
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ddfcf82a6161
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #33059 from gasolin/master
Bug 1207472 - reorganized reusable file in modules in alphabet order, r=yzen
========
https://hg.mozilla.org/integration/gaia-central/rev/fdc932dde28d
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1207472 - reorganized reusable file in modules in alphabet order, r=yzen
2015-11-08 23:00:15 -08:00
B2G Bumper Bot
012958afdf
Bumping manifests a=b2g-bump
2015-11-08 19:21:40 -08:00
B2G Bumper Bot
43f1a8254e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f8774ffff552
Author: Scott Wu <scottwu@mozilla.com>
Desc: Merge pull request #32933 from scottwu/1220195-addons-dont-appear-WebIDE
Bug 1220195 - addons installed from WebIDE appear in settings, r=gasolin
========
https://hg.mozilla.org/integration/gaia-central/rev/274249a58969
Author: Scott Wu <scottcwwu@gmail.com>
Desc: Bug 1220195 - addons installed from WebIDE appear in settings, r=yzen
2015-11-08 19:20:17 -08:00
B2G Bumper Bot
8571ca771f
Bumping manifests a=b2g-bump
2015-11-08 11:22:00 -08:00
B2G Bumper Bot
739c855784
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0d87077abfab
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #33062 from MichaelKohler/bug1222790
Bug 1222790https://hg.mozilla.org/integration/gaia-central/rev/4d478dbc5f6a
Author: Michael Kohler <mkohler@picobudget.com>
Desc: Bug 1222790
2015-11-08 11:20:36 -08:00
B2G Bumper Bot
193969f44f
Bumping manifests a=b2g-bump
2015-11-08 00:31:38 -08:00
B2G Bumper Bot
5bed5a366e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/57d74d40ef31
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #33058 from mikehenrty/bug-1179579-bookmark-favicon-test
Bug 1179579 - Make sure bookmark menu is not grabbed from the homescreen
========
https://hg.mozilla.org/integration/gaia-central/rev/7036d17a4fc8
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1179579 - Make sure bookmark menu is not grabbed from the homescreen
2015-11-08 00:30:14 -08:00
B2G Bumper Bot
9d47e8c697
Bumping manifests a=b2g-bump
2015-11-07 16:54:29 -08:00
B2G Bumper Bot
3622e5d6c1
Bumping manifests a=b2g-bump
2015-11-07 10:42:02 -08:00
B2G Bumper Bot
7a30d5eb17
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/12687a922fc4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #33037 from Phoxygen/1221367-browser_meta_alignment
Bug 1221367 - Correct alignment for meta in search
========
https://hg.mozilla.org/integration/gaia-central/rev/ed8c54056490
Author: Augustin Trancart <augustin.trancart@phoxygen.com>
Desc: Bug 1221367 - Correct alignment for meta in search
There was a typo in a previous patch: there should be one rule for RTL
and one for LTR.
2015-11-07 10:40:17 -08:00
B2G Bumper Bot
76a2b439dc
Bumping manifests a=b2g-bump
2015-11-07 03:11:55 -08:00
B2G Bumper Bot
29128ba700
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9de74b6e9d6c
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #33057 from Cwiiis/bug1219153-gaia-container-gecko-bug-workaround
Bug 1219153 - Update gaia-container to work around gecko bug. r=me
========
https://hg.mozilla.org/integration/gaia-central/rev/06d7605bd148
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1219153 - Update gaia-container to work around gecko bug. r=me
2015-11-07 03:10:14 -08:00
B2G Bumper Bot
344f890f95
Bumping manifests a=b2g-bump
2015-11-07 00:21:54 -08:00
B2G Bumper Bot
90829da8ec
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/dce6bbc7d3f7
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #33051 from mikehenrty/bug-1204211-pinning-tests-fix
Bug 1204211 - Make pinning the web tests not rely on vertical homescreen
========
https://hg.mozilla.org/integration/gaia-central/rev/c6dbd980859b
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1204211 - Make pinning the web tests not rely on vertical homescreen
2015-11-07 00:20:31 -08:00
B2G Bumper Bot
ea1499ec4f
Bumping manifests a=b2g-bump
2015-11-06 18:21:59 -08:00
B2G Bumper Bot
858e6b5492
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/05bdefedef1e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #32915 from KevinGrandon/bug_1220354_ftu_remove_collections_migration
Bug 1220354 - [FTU] Remove collections migration
========
https://hg.mozilla.org/integration/gaia-central/rev/a67c9e80565f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1220354 - [FTU] Remove collections migration r=sfoster
2015-11-06 18:20:35 -08:00
B2G Bumper Bot
7aa845c1d9
Bumping manifests a=b2g-bump
2015-11-06 17:51:35 -08:00
B2G Bumper Bot
d625234f18
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0151e9083a7a
Author: John Dorlus <jsdorlus@gmail.com>
Desc: Bug 1193978 - Automated Test [Clock] Use stopwatch, set a few laps, reset r=jlorenzo r=mwargers
========
https://hg.mozilla.org/integration/gaia-central/rev/c7869a0c63ed
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Merge pull request #32905 from silne30/Bug_1193978_Stopwatch_Laps_Test"
This reverts commit 547961387fb8ad71f838a55a804fcdd7062a9b3b, reversing
changes made to c3436122d678911d04b8f491724596116890ff9b.
Reverting due to missing bug number. Bug 1193978.
2015-11-06 17:50:11 -08:00
Wes Kocher
e98e767258
Merge m-c to b2ginbound, a=merge
...
--HG--
extra : commitid : 9BSOpO5MEsb
2015-11-06 15:14:26 -08:00
Wes Kocher
35dd7b2e4a
Merge fx-team to central, a=merge
...
--HG--
extra : commitid : 8yedGqK9ojB
2015-11-06 15:09:39 -08:00
Wes Kocher
c1eaf7c700
Merge b2ginbound to central, a=merge
...
--HG--
extra : commitid : DtbJAlOZBMw
2015-11-06 15:03:32 -08:00
B2G Bumper Bot
091abbaa98
Bumping manifests a=b2g-bump
2015-11-06 14:04:40 -08:00
B2G Bumper Bot
2f9697170a
Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/5e22870c35f2
Author: John Dorlus <jsdorlus@gmail.com>
Desc: Merge pull request #32905 from silne30/Bug_1193978_Stopwatch_Laps_Test
Bug 1218930 - test_clock_run_stopwatch_then_reset.py : AssertionError: u'00:01.58' == u'00:01.58 r=mwargers
========
https://hg.mozilla.org/integration/gaia-central/rev/93ccc141d03b
Author: John Dorlus <jsdorlus@gmail.com>
Desc: Removed unnecessary waits
========
https://hg.mozilla.org/integration/gaia-central/rev/28e9ff9cfea7
Author: John Dorlus <jsdorlus@gmail.com>
Desc: deleted environmental file.
========
https://hg.mozilla.org/integration/gaia-central/rev/1019885948e3
Author: John Dorlus <jsdorlus@gmail.com>
Desc: Added pref to ensure that time is not able to update
========
https://hg.mozilla.org/integration/gaia-central/rev/0e7915d258eb
Author: John Dorlus <jsdorlus@gmail.com>
Desc: Got the test working.
========
https://hg.mozilla.org/integration/gaia-central/rev/f7025bcf5a06
Author: John Dorlus <jsdorlus@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia into Bug_1193978_Stopwatch_Laps_Test
========
https://hg.mozilla.org/integration/gaia-central/rev/7fb7747c476c
Author: John Dorlus <jsdorlus@gmail.com>
Desc: Fixed assertion error
========
https://hg.mozilla.org/integration/gaia-central/rev/15c733c38cfb
Author: John Dorlus <jsdorlus@gmail.com>
Desc: Fixed merge conflicts
2015-11-06 14:03:16 -08:00
Gijs Kruitbosch
eb15932c91
Bug 1221500 - followup: allow space for permanent banner, fix tests to deal with this, rs=bustage on a CLOSED TREE
...
--HG--
extra : commitid : LyDaMmjP8YQ
extra : rebase_source : c461bd4a82a6501405242d6759cda3fd21e54fbd
2015-11-06 19:25:17 +00:00
Wes Kocher
8c29b2aace
Backed out 5 changesets (bug 1219711) for frequent android m(9) failures a=bustage
...
Backed out changeset 2d5f09d89424 (bug 1219711)
Backed out changeset cf14a6e5f340 (bug 1219711)
Backed out changeset 4eaa8cf9a752 (bug 1219711)
Backed out changeset 65abe62869df (bug 1219711)
Backed out changeset a21d79a94307 (bug 1219711)
--HG--
extra : commitid : 2uBL6k0T3uy
extra : source : aaee8ec22e5fd0650818aab7d85ff4b069681a35
2015-11-06 11:14:11 -08:00
Jorg K
2bbbf73717
Bug 1214377 - Hack to solve Thunderbird's need to detect style pre-wrap. r=roc a=me
...
--HG--
extra : commitid : 8b0gs3Dmya1
2015-11-06 11:42:29 -08:00
Wes Kocher
c37efdf9c9
Backed out changeset b3d28572da60 (bug 1214377) for breaking thunderbird builds a=backout
...
--HG--
extra : commitid : 1Yy1GwPKEJh
2015-11-06 11:30:00 -08:00
B2G Bumper Bot
12057da236
Bumping manifests a=b2g-bump
2015-11-06 10:46:58 -08:00
B2G Bumper Bot
5d58faa253
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3024543d03a3
Author: Zibi Braniecki <zibi@braniecki.net>
Desc: Merge pull request #33042 from stasm/1222415-l20n-3.4.1
Bug 1222415https://hg.mozilla.org/integration/gaia-central/rev/798c9c6ebf3e
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1222415https://hg.mozilla.org/integration/gaia-central/rev/5b88b115de21
Author: Sam Foster <sfoster@mozilla.com>
Desc: Merge pull request #33003 from sfoster/ftu-2dot6-config-bug-1220942
Bug 1220942 - Add configs for update to 2.6 (current master). r=mhenretty
========
https://hg.mozilla.org/integration/gaia-central/rev/3819c36625c6
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1220942 - Add configs for update to 2.6 (current master). r=mhenretty
2015-11-06 10:45:35 -08:00
B2G Bumper Bot
b410ccc579
Bumping manifests a=b2g-bump
2015-11-06 09:21:58 -08:00
B2G Bumper Bot
de35778408
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4ef504b327d1
Author: Fabrice Desré <fabrice@desre.org>
Desc: Merge pull request #32818 from samgiles/support-remove-in-preprocessor
Bug 1219302 - Support removing files using the preprocessor when a flag is enabled r=rchien
========
https://hg.mozilla.org/integration/gaia-central/rev/f1b0dd924a0a
Author: Sam Giles <sam.e.giles@gmail.com>
Desc: Bug 1219302 - Support removing files using the preprocessor when a flag is enabled or disabled r=rchien
2015-11-06 09:20:35 -08:00
B2G Bumper Bot
831e4d20ed
Bumping manifests a=b2g-bump
2015-11-06 08:56:39 -08:00
B2G Bumper Bot
054e765089
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/76e2439aa4ff
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #33045 from Phoxygen/bug1217781-cancel_button_text_position
Bug 1217781 - [Shared] Fix layout of search form.
========
https://hg.mozilla.org/integration/gaia-central/rev/f93630f0efa1
Author: Augustin Trancart <augustin.trancart@phoxygen.com>
Desc: Bug 1217781 - [Shared] Fix layout of search form.
The search input field wasn't growing enough. Therefore, there was some
space after the "cancel" button. If the word cancel is to small (in
certain locale as arabic), it can apppear shifted to the beginning.
2015-11-06 08:55:15 -08:00
Gregory Arndt
875d555ad4
Bug 1222465 - Add treeherder config to flame/aries OTA tasks r=wcosta
...
--HG--
extra : commitid : 5pTZsAJoLU1
extra : rebase_source : 558c5458595a8218b76e57a4dccb513f17d30085
2015-11-06 09:04:29 -06:00
Carsten "Tomcat" Book
f6a2046f42
Merge mozilla-central to b2g-inbound to fix m1 orange
2015-11-06 14:42:14 +01:00
Carsten "Tomcat" Book
f2961bc526
Merge mozilla-central to b2g-inbound
2015-11-06 14:00:33 +01:00
Carsten "Tomcat" Book
672fda2c82
Merge mozilla-central to fx-team
2015-11-06 13:59:27 +01:00
Carsten "Tomcat" Book
9dc37c18b3
merge mozilla-inbound to mozilla-central a=merge
2015-11-06 13:44:30 +01:00
B2G Bumper Bot
0898950303
Bumping manifests a=b2g-bump
2015-11-06 04:26:42 -08:00
B2G Bumper Bot
aa1b44018e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8bf6fac02e02
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #33040 from Cwiiis/bug1222369-bookmarks-remove-escaping
Bug 1222369 - Escape bookmark names properly when removing. r=gmarty
========
https://hg.mozilla.org/integration/gaia-central/rev/deacce742551
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1222369 - Escape bookmark names properly when removing. r=gmarty
2015-11-06 04:25:14 -08:00
B2G Bumper Bot
8953f6a1a6
Bumping manifests a=b2g-bump
2015-11-06 03:56:37 -08:00
B2G Bumper Bot
7c9ff3de5b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/2c282252acd1
Author: Andreas Tolfsen <ato@mozilla.com>
Desc: Merge pull request #32236 from andreastt/bug_1211501
Bug 1211501 - Support Marionette protocol level 3; r=gaye
========
https://hg.mozilla.org/integration/gaia-central/rev/8699707b027a
Author: Andreas Tolfsen <ato@mozilla.com>
Desc: Bug 1211501 - Support Marionette protocol level 3; r=gaye
Marionette protocol level 3 introduces message sequencing that allows
Marionette to provide an asynchronous, parallel pipelining user-facing
interface, limit chances of payload race conditions, and remove stylistic
inconsistencies in how commands and responses are dispatched internally.
Clients that deliver a blocking WebDriver interface are still be expected
to not send further command requests before the response from the last
command has come back, but if they still happen to do so because of
programming error or otherwise, no harm will be done. This will guard
against bugs such as bug 1207125.
This patch retains compatibility with protocol levels 1 and 2.
2015-11-06 03:55:13 -08:00
Carsten "Tomcat" Book
4b07195199
merge fx-team to mozilla-central a=merge
2015-11-06 12:20:52 +01:00
B2G Bumper Bot
0717391e1e
Bumping manifests a=b2g-bump
2015-11-06 02:56:44 -08:00
B2G Bumper Bot
bb0f1fb5e9
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/441ee1c0dfb3
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #32454 from rexboy7/1214992-filter-folder-cards
Bug 1214992https://hg.mozilla.org/integration/gaia-central/rev/62bae82c42bc
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 1214992https://hg.mozilla.org/integration/gaia-central/rev/165826f62546
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #32965 from ferjm/bug1220600.sync.save.user.prefs
Bug 1220600 - Save user preferences. r=michielbdejong, yifan
========
https://hg.mozilla.org/integration/gaia-central/rev/39e1fc590767
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1220600 - Save user preferences. r=michielbdejong,yifan
2015-11-06 02:55:19 -08:00
B2G Bumper Bot
bede581d2b
Bumping manifests a=b2g-bump
2015-11-06 01:24:34 -08:00
B2G Bumper Bot
6b2f1f97dd
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e90f2c9f372b
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #32990 from rexboy7/TV_FTE_system
Bug 1220589 - [Stingray][system] Add first-time-use screen for pin-to-card.r=lchang
========
https://hg.mozilla.org/integration/gaia-central/rev/3a71d19c2205
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 1220589 - [Stingray][system] Add first-time-use screen for pin-to-card
2015-11-06 01:23:11 -08:00
Kan-Ru Chen
1622b9b730
Bug 1216937 - Assign default URL for mozbrowseropenwindow event. r=smaug
2015-11-06 16:59:08 +08:00
