Commit Graph

452462 Commits

Author SHA1 Message Date
Gregory Arndt
59f3c7f5d2 Bug 1227355 - Configure b2g-ota branch and add update channel r=wcosta
--HG--
extra : commitid : DtYIIbkpguT
extra : rebase_source : 8a5e0d3e0c22968c73ecb926ac03a852315641ef
2015-11-30 20:48:01 -06:00
B2G Bumper Bot
bfe32a0e21 Bumping manifests a=b2g-bump 2015-12-01 11:35:34 -08:00
B2G Bumper Bot
8ba6e6cc78 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0e366e8ecec7
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #33449 from gasolin/issue-1228276-2

Bug 1228276 - refactor StorageHelper.showFormatedSize as a module, r=yzen

========

https://hg.mozilla.org/integration/gaia-central/rev/24fa316caa9e
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1228276 - refactor StorageHelper.showFormatedSize as a module, r=yzen
2015-12-01 11:35:19 -08:00
B2G Bumper Bot
bce25699e1 Bumping manifests a=b2g-bump 2015-12-01 11:15:40 -08:00
B2G Bumper Bot
e58d765dcb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f13e5c6dda61
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #33328 from azasypkin/bug-1226555-conversation-split-mode

Bug 1226555 - [Messages] The Conversation split view is not rendered anymore. r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/93090f1a769b
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1226555 - [Messages] The Conversation split view is not rendered anymore. r=julien
2015-12-01 11:15:25 -08:00
B2G Bumper Bot
a9ebe688d5 Bumping manifests a=b2g-bump 2015-12-01 10:50:04 -08:00
B2G Bumper Bot
3c99c1edf1 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4cc174470ff8
Author: Andreas Tolfsen <ato@mozilla.com>
Desc: Merge pull request #33443 from andreastt/bug_1229011

Bug 1229011 - Make async TCP driver protocol 3 compatible; r=aus

========

https://hg.mozilla.org/integration/gaia-central/rev/e47777c1a95a
Author: Andreas Tolfsen <ato@mozilla.com>
Desc: Bug 1229011 - Make async TCP driver protocol 3 compatible; r=aus

The asynchronous TCP driver in
tests/jsmarionette/client/marionette-client/lib/marionette/drivers/abstract.js
is not compatible with Marionette protocol level 3 that will get
introduced in bug 1211489.

This causes
tests/jsmarionette/runner/marionette-js-runner/test/integration/clientasync.js
to fail with bug 1211489 is applied to Gecko.

To fix this issue we apply the same logic from the synchronous TCP
driver to marshal and unmarshal messages when talking to a protocol
level 3 server.

========

https://hg.mozilla.org/integration/gaia-central/rev/47c3acfbb209
Author: Isabel Rios Escobar <irios@MacBook-Pro-de-Isabel.local>
Desc: Revert "Merge pull request #33392 from isabelrios/Duplicate_phone_number"

This reverts commit 68c7e4103820c3ce3de2ce3b9d8e145fdc67c0aa, reversing
changes made to 76c2dacbcff176563bfdf8068655bb438f49fe55.
2015-12-01 10:49:48 -08:00
B2G Bumper Bot
0b5184aa46 Bumping manifests a=b2g-bump 2015-12-01 09:09:40 -08:00
B2G Bumper Bot
d9666a876a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/980f135a6af6
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #33210 from mikehenrty/bug-1221876-disable-root-settings-test

Bug 1221876 - Disable root_settings_test.js while a fix is incoming

========

https://hg.mozilla.org/integration/gaia-central/rev/b8898d141e40
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1221876 - Disable root_settings_test.js while a fix is incoming
2015-12-01 09:08:16 -08:00
B2G Bumper Bot
455e7f373f Bumping manifests a=b2g-bump 2015-12-01 08:45:36 -08:00
B2G Bumper Bot
e4a839994f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c014d67432aa
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #33465 from arcturus/bug-1219641

Bug 1219641 - Implement *test_delete_all_contacts.py* as an integrati…

========

https://hg.mozilla.org/integration/gaia-central/rev/85c727c8c778
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1219641 - Implement *test_delete_all_contacts.py* as an integration test in JavaScript r=jlorenzo
2015-12-01 08:44:04 -08:00
B2G Bumper Bot
c5da010650 Bumping manifests a=b2g-bump 2015-12-01 07:15:33 -08:00
B2G Bumper Bot
ef39bcf02d Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c0a9ca077eb9
Author: isabelrios <isabelrios@gmail.com>
Desc: Merge pull request #33392 from isabelrios/Duplicate_phone_number

Bug 1228294 - Verify that the duplicates found screen is shown

========

https://hg.mozilla.org/integration/gaia-central/rev/65cf787b892d
Author: Isabel Rios Escobar <irios@MacBook-Pro-de-Isabel.local>
Desc: Bug 1228294 - Verify that the duplicates found screen is shown

adding the missing file

adding the missing file

completing the test

addressing pr comments

return class and tests affected

change in tap_update

========

https://hg.mozilla.org/integration/gaia-central/rev/7ca802ed401d
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33439 from ferjm/bug1227593.syncengine.shared

Bug 1227593 - Sync engine shared lib. r=michielbdejong

========

https://hg.mozilla.org/integration/gaia-central/rev/b3a37b948db3
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1227593 - Sync engine shared lib. r=michielbdejong
2015-12-01 07:13:59 -08:00
Carsten "Tomcat" Book
31b570ce3c Merge mozilla-central to b2g-inbound 2015-12-01 15:28:29 +01:00
Carsten "Tomcat" Book
f3e1aec951 merge mozilla-inbound to mozilla-central a=merge 2015-12-01 15:25:14 +01:00
Carsten "Tomcat" Book
207c64c6c1 Backed out changeset f4348b2f5c5f (bug 1223678) for bustage
--HG--
extra : rebase_source : 1e7bf92b54ceff74b6eee2143a2f82434af1e8e3
2015-12-01 15:01:36 +01:00
B2G Bumper Bot
400e056d0d Bumping manifests a=b2g-bump 2015-12-01 04:15:35 -08:00
B2G Bumper Bot
5de2ce5f40 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8c8d9d65c4ca
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #33447 from zbraniecki/1228056-use-normalizedDate-for-dateFormatting

Bug 1228056 - Use normalized date for date formatting in Contacts

========

https://hg.mozilla.org/integration/gaia-central/rev/48e14c9f5e61
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: t Bug 1228056 - Use normalized date for date formatting in Contacts
2015-12-01 04:13:58 -08:00
Carsten "Tomcat" Book
e224f27637 merge fx-team to mozilla-central a=merge 2015-12-01 12:00:42 +01:00
B2G Bumper Bot
fdb9a156a6 Bumping manifests a=b2g-bump 2015-11-30 19:26:34 -08:00
B2G Bumper Bot
1d4d5e0ff1 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

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

Bug 1228449 - [Clock] Remove unused switches.css file

========

https://hg.mozilla.org/integration/gaia-central/rev/c30e446ed3b6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1228449 - [Clock] Remove unused switches.css file

========

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

Bug 1147860 - Guard test logic using promise so files are fully loaded

========

https://hg.mozilla.org/integration/gaia-central/rev/a8cfd1f8884e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1147860 - Guard test logic using promise so files are fully loaded r=francisco
2015-11-30 19:25:12 -08:00
Wes Kocher
a9f3d0548f Merge m-c to b2ginbound, a=merge
--HG--
extra : commitid : 9iU9jlQA1EL
2015-11-30 17:47:26 -08:00
Wes Kocher
c2bb30818f Merge fx-team to central, a=merge
--HG--
extra : commitid : DAAe5Px3YqH
2015-11-30 17:44:10 -08:00
B2G Bumper Bot
4e0d00b8a4 Bumping manifests a=b2g-bump 2015-11-30 16:34:32 -08:00
B2G Bumper Bot
8447038c80 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

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

Bug 1163205 - remove the focus when user open an external link, r=yzen

========

https://hg.mozilla.org/integration/gaia-central/rev/effb541b0ccb
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1163205 - remove the focus when user open an external link, r=yzen

========

https://hg.mozilla.org/integration/gaia-central/rev/6d11d82b206b
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #33401 from gasolin/issue-1228265

Bug 1228265 - Remove unused functions in util.js, r=yzen

========

https://hg.mozilla.org/integration/gaia-central/rev/8cdd4d73c73b
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1228265 - Remove unused functions in util.js, r=yzen
2015-11-30 16:33:10 -08:00
B2G Bumper Bot
c78125da53 Bumping manifests a=b2g-bump 2015-11-30 13:26:34 -08:00
B2G Bumper Bot
c9188f753f Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/183b45c6d967
Author: Sam Foster <sfoster@mozilla.com>
Desc: Merge pull request #33444 from sfoster/ftu-date-format-bug-1228144

Bug 1228144 - Use toLocaleString when updating date. r=zbraniecki

========

https://hg.mozilla.org/integration/gaia-central/rev/402755199d40
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1228144 - Use toLocaleString when updating date. r=zbraniecki

========

https://hg.mozilla.org/integration/gaia-central/rev/1eecd7f22dd6
Author: Sam Foster <sfoster@mozilla.com>
Desc: Merge pull request #33347 from sfoster/ftu-curtainup-gij-bug-1227705

Bug 1227705 - Use waitForCurtainUp before interacting in tests. r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/2a9c76e8f81e
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1227705 - Use waitForCurtainUp/waitForFtuReady before interacting in tests. r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/aa13cb19a78e
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33326 from michielbdejong/1181687-MockLazyLoader-Promises

Bug 1181687 - Use real Promises in MockLazyLoader, r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/4e47990e1a61
Author: Michiel de Jong <mbdejong@mozilla.com>
Desc: Bug 1181687 - Use real Promises in MockLazyLoader, r=ferjm
2015-11-30 13:25:11 -08:00
B2G Bumper Bot
5b50407e43 Bumping manifests a=b2g-bump 2015-11-30 12:03:12 -08:00
B2G Bumper Bot
6fbf475f87 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/406f8198e2b1
Author: Reza Akhavan <reza@akhavan.me>
Desc: Merge pull request #33261 from jedireza/home-button-closes-update-manager-dialogs

Bug 1225330 - Status bar icons change color before homescreen transition when home button is pressed

========

https://hg.mozilla.org/integration/gaia-central/rev/005d4d88cd10
Author: jedireza <reza@akhavan.me>
Desc: Bug 1225330 - Status bar icons change color before homescreen transition when home button is pressed
2015-11-30 11:56:59 -08:00
B2G Bumper Bot
e344bf12d3 Bumping manifests a=b2g-bump 2015-11-30 11:50:02 -08:00
B2G Bumper Bot
20dbd92b8b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/491ca5a2c7b5
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #33372 from bzbarsky/more-promise-bustage

Bug 1228239 - Fix more misuse of Promise static methods in Gaia unit tests

========

https://hg.mozilla.org/integration/gaia-central/rev/a736b63af802
Author: Boris Zbarsky <bzbarsky@mit.edu>
Desc: Bug 1228239 - Fix more misuse of Promise static methods in Gaia unit tests.
2015-11-30 11:48:27 -08:00
B2G Bumper Bot
a6fbde2b01 Bumping manifests a=b2g-bump 2015-11-30 08:39:52 -08:00
B2G Bumper Bot
4aa4f308c1 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/85dc0648c84f
Author: KWierso <KWierso@users.noreply.github.com>
Desc: Merge pull request #32618 from jhector/bug-1214634-warning-fix

Bug 1214634 - Use createSafeHTML instead of escapeHTML r=russn

========

https://hg.mozilla.org/integration/gaia-central/rev/1278cd102e51
Author: Julian Hector <julian.r.hector@gmail.com>
Desc: Bug 1214634 - Use createSafeHTML instead of escapeHTML r=russn

========

https://hg.mozilla.org/integration/gaia-central/rev/09b8d1e58688
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33362 from ferjm/bug1227085.empty.sync.account

Bug 1227085 - Allow creating new Sync users, but warn about empty acc…

========

https://hg.mozilla.org/integration/gaia-central/rev/99f80dad65e7
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1227085 - Allow creating new Sync users, but warn about empty accounts. r=yzen,michielbdejong
2015-11-30 08:38:30 -08:00
B2G Bumper Bot
f11cc46054 Bumping manifests a=b2g-bump 2015-11-30 07:45:34 -08:00
B2G Bumper Bot
072bfe2f2a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5ad1dad7954d
Author: Fischer-L <Fischer-L@users.noreply.github.com>
Desc: Merge pull request #33437 from Fischer-L/bug_1228929-separate-offline-content-from-iframe

Bug 1228929 - [TV] Seperate the Send-to-TV offline content from the iframe, r=rexboy

========

https://hg.mozilla.org/integration/gaia-central/rev/226567a1110f
Author: Fischer.json <foxbrush@Fischerjsons-MacBook-Pro.local>
Desc: Bug 1228929 - [TV] Seperate the Send-to-TV offline content from the iframe
2015-11-30 07:44:02 -08:00
Felipe Gomes
8fb91380ed Bug 1228627 - Conflict, browser-loop.js just got removed from fx-team in bug 1223573. r=bustage 2015-11-30 12:59:02 -02:00
Felipe Gomes
909d49249d Bug 1228627 - Remove #includes from browser.js. r=Gijs 2015-11-30 12:13:57 -02:00
Carsten "Tomcat" Book
590590b407 Merge mozilla-central to b2g-inbound 2015-11-30 13:47:32 +01:00
Carsten "Tomcat" Book
906d89bc14 Merge mozilla-central to fx-team 2015-11-30 13:46:30 +01:00
Jocelyn Liu
963cd9f23f Bug 1228519 - Fix RequestReadNotification for GATT Server API. r=brsun 2015-11-30 20:24:07 +08:00
Jocelyn Liu
a84e009ffd Bug 1228521 - Fix PDU packing in |ServerSendResponseCmd| for GATT Server API. r=brsun 2015-11-30 20:23:04 +08:00
Jocelyn Liu
f692ee9ee4 Bug 1228909 - Fix PDU packing in |ClientSetAdvDataCmd| for GATT API. r=brsun 2015-11-30 20:21:52 +08:00
Carsten "Tomcat" Book
5a9f09086a merge mozilla-inbound to mozilla-central a=merge 2015-11-30 13:19:02 +01:00
Carsten "Tomcat" Book
4939dfc1a1 merge fx-team to mozilla-central a=merge 2015-11-30 13:15:40 +01:00
Thomas Zimmermann
63fd9969ce Bug 1228946: Remove '#if 0' block from Bluetooth module, r=joliu
This is a cleanup patch for removing an '#if 0' that was landed in
the Bluetooth code.
2015-11-30 12:46:09 +01:00
Carsten "Tomcat" Book
1b6db90e27 Backed out changeset 258cff340229 (bug 1200798) for new intermittent test failures in browser_dbg_breakpoints-button-02.js
--HG--
extra : rebase_source : ba3db839fc1d0a5fb1a44ca77ab2149b2304ad35
2015-11-30 12:45:12 +01:00
Mark Banner
c96e025e76 Bug 1228628 - Add a minimal .eslintrc configuration for browser and start linting a few browser files with basic rules. r=Mossop 2015-11-30 11:42:25 +00:00
Carsten "Tomcat" Book
d33e281693 merge b2g-inbound to mozilla-central a=merge 2015-11-30 12:27:26 +01:00
B2G Bumper Bot
9b54cf6c5c Bumping manifests a=b2g-bump 2015-11-30 02:56:41 -08:00
B2G Bumper Bot
32ab3e292d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f45dfa81d0c3
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #33440 from timdream/jszhuyin-bump2

Bug 1228962 - Update Zhuyin IME to latest version, r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/fb3285677686
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1228962 - Update Zhuyin IME to latest version

hash=ba19a625e675f234d12872bee6d4ff8e95ef806c
2015-11-30 02:55:19 -08:00