ec55a186c7
Bug 1194534 - Disable two failing tests. r=billm
2015-10-28 17:13:12 -07:00
4792069b33
Bug 1218591 - Reset the WebSocket retry counter when the server replies. r=dragana
...
--HG--
extra : commitid : L8bN4lFe50x
2015-10-28 17:07:11 -07:00
93f1a9c66a
Merge m-c to inbound, a=merge
...
--HG--
rename : netwerk/protocol/websocket/PWebSocketFrameListener.ipdl => netwerk/protocol/websocket/PWebSocketEventListener.ipdl
rename : netwerk/protocol/websocket/WebSocketFrameListenerChild.cpp => netwerk/protocol/websocket/WebSocketEventListenerChild.cpp
rename : netwerk/protocol/websocket/WebSocketFrameListenerChild.h => netwerk/protocol/websocket/WebSocketEventListenerChild.h
rename : netwerk/protocol/websocket/WebSocketFrameListenerParent.cpp => netwerk/protocol/websocket/WebSocketEventListenerParent.cpp
rename : netwerk/protocol/websocket/WebSocketFrameListenerParent.h => netwerk/protocol/websocket/WebSocketEventListenerParent.h
rename : netwerk/protocol/websocket/WebSocketFrameService.cpp => netwerk/protocol/websocket/WebSocketEventService.cpp
rename : netwerk/protocol/websocket/WebSocketFrameService.h => netwerk/protocol/websocket/WebSocketEventService.h
rename : netwerk/protocol/websocket/nsIWebSocketFrameService.idl => netwerk/protocol/websocket/nsIWebSocketEventService.idl
extra : commitid : 2GNXiCovu83
2015-10-28 17:05:01 -07:00
5c6d443c92
Merge inbound to central, a=merge
...
--HG--
extra : commitid : 9CmKkEXHeLM
2015-10-28 17:00:22 -07:00
e9996401a9
Merge fx-team to central, a=merge
...
--HG--
extra : commitid : JQEuPmLFiKH
2015-10-28 16:41:39 -07:00
ff6e2e0aae
Bumping manifests a=b2g-bump
2015-10-28 10:33:10 -07:00
414564e653
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/62309a2099d3
Author: Guillaume C. Marty <gmarty@users.noreply.github.com>
Desc: Merge pull request #32777 from gmarty/Bug-1217730-Duplicated-home-screens-shown-as-separate-home-screens
Bug 1217730 - Duplicated home screens shown as separate home screens
========
https://hg.mozilla.org/integration/gaia-central/rev/3d199958fb3c
Author: Guillaume Marty <edo999@gmail.com>
Desc: Bug 1217730 - Duplicated home screens shown as separate home screens
2015-10-28 10:30:27 -07:00
64dd7d26a2
Bug 1213851 - test bustage fix when rebasing on bug 1214582 [r=Mardak]
2015-10-28 10:10:57 -07:00
523a46fa6e
Bug 1219079 - Small breakdown-related fixes for the memory tool; r=jsantell
...
* Add "Breakdown by" in front of dropdown selector for the selected breakdown.
* "Allocation Site" => "Allocation Stack" for breakdown's label.
* Make the coarse type breakdown bucket strings by count.
2015-10-28 10:59:25 -07:00
a62c2ba141
Bug 1219071 - Cache the results of the dfs when rendering the tree widget; r=jsantell
2015-10-28 10:20:32 -07:00
441ca7c0a9
Bug 1217867 - Prevent actor id clash when debugging the same e10s tab with multiple clients. r=jryans
2015-10-28 09:56:17 -07:00
8163078f99
Bug 1217559 - Fix chrome overrides after new devtools files layout. r=jryans
2015-10-28 09:56:17 -07:00
d98ea6a4ba
Bug 1213011 - Add a route to post-build simulator task to easily download it. r=garndt
2015-10-28 09:56:17 -07:00
c70c99994d
Bug 1213011 - Allow post-build tasks to use build_{name,type,product} variables. r=garndt
2015-10-28 09:56:17 -07:00
4b54607553
Bumping manifests a=b2g-bump
2015-10-28 09:43:40 -07:00
902136deca
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/19e6bdab6d0e
Author: Sam Foster <sfoster@mozilla.com>
Desc: Merge pull request #32697 from Phoxygen/bug1216496-email_rtl_refactoring
Bug 1216496 - [email] RTL CSS refactor. r=jrburke
========
https://hg.mozilla.org/integration/gaia-central/rev/d1f62f64e691
Author: Augustin Trancart <augustin.trancart@phoxygen.com>
Desc: Bug 1216496 - [email] RTL CSS refacto
2015-10-28 09:40:31 -07:00
b8555d522b
Bug 1213851 - Display only active room when user enters room [r=Mardak]
2015-10-28 09:35:56 -07:00
2325f694ea
Bug 1217985 Follow up fix test bustage
2015-10-28 09:16:44 -07:00
b84b853f1b
Bumping manifests a=b2g-bump
2015-10-28 09:13:41 -07:00
76d66a97b4
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/30bc519e9ed2
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #32773 from albertopq/1217361-overlap-service-provider
Bug 1217361 - Setting the statusbar as minimized when the utility tray is active r=gmarty
========
https://hg.mozilla.org/integration/gaia-central/rev/0ddf2f8ede9a
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1217361 - Setting the statusbar as minimized when the utility tray is active
2015-10-28 09:10:34 -07:00
a409041ed0
Bug 1219004 - Improve error management in getFullAppByManifestURL r=ferjm
2015-10-28 09:00:50 -07:00
c43a4bf584
Backout "Bug 1144808 part 2: Harden phone-builder image."
...
Things just got too hard for B2G people to change build scripts, so we
are backing out this.
--HG--
extra : commitid : 16CKTLSAi3B
2015-10-28 11:17:58 -02:00
11134d73ce
Bumping manifests a=b2g-bump
2015-10-28 04:48:09 -07:00
1ed4f95203
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/296355042e8c
Author: Guillaume C. Marty <gmarty@users.noreply.github.com>
Desc: Merge pull request #32752 from gmarty/Bug-1217734-Deleted-duplicate-home-screens-can-be-selected
Bug 1217734 - Deleted duplicate home screens can be selected
========
https://hg.mozilla.org/integration/gaia-central/rev/088e2f3aecdf
Author: Guillaume Marty <edo999@gmail.com>
Desc: Bug 1217734 - Deleted duplicate home screens can be selected
2015-10-28 04:45:24 -07:00
a0eb5a426a
Bumping manifests a=b2g-bump
2015-10-28 03:34:17 -07:00
c6e38c9b27
Bumping manifests a=b2g-bump
2015-10-28 03:25:15 -07:00
f1c362fd02
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9f9dbeaf8620
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #32717 from mwargers/1217485
Bug 1217485 - Make various methods in cards_view part of class Card instead of class CardsView
========
https://hg.mozilla.org/integration/gaia-central/rev/27b038ca8604
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1217485 - Make various methods in cards_view part of class Card instead of class CardsView
2015-10-28 03:24:58 -07:00
e1d9c4438f
Bug 1209892 - Add marionette test case for timezone. r=edgar
...
--HG--
extra : amend_source : 7094dd7c0c7509795c9c645f6ccd7aea73fc2944
2015-10-27 15:41:07 +08:00
fdbefc9418
Bumping manifests a=b2g-bump
2015-10-28 03:00:05 -07:00
0083389e72
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1d60e8984e05
Author: Yi-Fan Liao <yliao@mozilla.com>
Desc: Merge pull request #32794 from begeeben/1218440_cannot_delete_email
Bug 1218440 - [TV] Cannot delete email address on FxA login flow, r=ferjm
========
https://hg.mozilla.org/integration/gaia-central/rev/3f358a8fb005
Author: yifan <yliao@mozilla.com>
Desc: Bug 1218440 - [TV] Cannot delete email address on FxA login flow
2015-10-28 02:59:47 -07:00
99312718d9
Merge mozilla-central to b2g-inbound
2015-10-28 10:53:33 +01:00
3ec5c00413
merge mozilla-inbound to mozilla-central a=merge
2015-10-28 10:43:33 +01:00
f7861e7c36
merge fx-team to mozilla-central a=merge
2015-10-28 10:38:11 +01:00
46f2e660b1
Bumping manifests a=b2g-bump
2015-10-28 02:28:12 -07:00
914f6e5282
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/737bfea2ea0d
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #32732 from schien/bug1218247
Bug 1218247 - disable adds-on support on TV 2.5. r=rexboy.
========
https://hg.mozilla.org/integration/gaia-central/rev/2b75e406dca4
Author: Shih-Chiang Chien <schien@mozilla.com>
Desc: Bug 1218247 - disable adds-on support on TV 2.5. r=rexboy.
========
https://hg.mozilla.org/integration/gaia-central/rev/13e952f9e4bb
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #32771 from gasolin/issue-1218271
Bug 1218271 - move panel specific styles into app.css, r=yzen
========
https://hg.mozilla.org/integration/gaia-central/rev/0ccb68c09541
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1218271 - move panel specific styles into app.css, r=yzen
2015-10-28 02:25:28 -07:00
ac20a4d9be
Bumping manifests a=b2g-bump
2015-10-28 01:33:19 -07:00
3890fd409d
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4ee7860cab2b
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #32755 from hkasemir/1203967-optgroup-color
Bug 1203967 - change color of optgroup header. r=pivanov
========
https://hg.mozilla.org/integration/gaia-central/rev/83b16b3229be
Author: Heidi Kasemir <heidi.kasemir@gmail.com>
Desc: Bug 1203967 - change color of optgroup header
2015-10-28 01:30:36 -07:00
528b7007e2
Bumping manifests a=b2g-bump
2015-10-27 23:23:14 -07:00
156e124a46
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/dbb8dfb4dd9b
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #32690 from steveck-chung/bug-1217075-dup-draft
Bug 1217075 - [Messages] Both message and draft are preserved in the main app instance in case message is sent from another activity instance, r=azasypkin
========
https://hg.mozilla.org/integration/gaia-central/rev/a37228588843
Author: steveck-chung <schung@mozilla.com>
Desc: Bug 1217075 - [Messages] Both message and draft are preserved in the main app instance in case message is sent from another activity instance, r=azasypkin
========
https://hg.mozilla.org/integration/gaia-central/rev/1c0b735049c3
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #32733 from gasolin/issue-1216075
Bug 1216075 - add version information in addon detail screen, r=yzen
========
https://hg.mozilla.org/integration/gaia-central/rev/322a1ca7017a
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1216075 - add version information in addon detail screen, r=yzen
========
https://hg.mozilla.org/integration/gaia-central/rev/89a0fc30eeb0
Author: Sam Foster <sfoster@mozilla.com>
Desc: Merge pull request #32786 from Phoxygen/bug1213226-ftu_rtl_header
Bug 1213226 - [FTU] remove ignore-dir on gaia-header. r=sfoster
========
https://hg.mozilla.org/integration/gaia-central/rev/1b84033cac8d
Author: Augustin Trancart <augustin.trancart@phoxygen.com>
Desc: Bug 1213226 - [FTU] remove ignore-dir on gaia-header.
Now that navigation is mirrored in FTU, header should be mirrored as
well.
2015-10-27 23:20:30 -07:00
f8946dbe50
Bumping manifests a=b2g-bump
2015-10-27 22:27:59 -07:00
0f4e23867b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4a596a387a18
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #32010 from tedders1/bug-1042807-fix
Bug 1042807 - Vertical homescreen uses getIcon() API. r=kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/733ffa7fe640
Author: Ted Clancy <tclancy@mozilla.com>
Desc: Bug 1042807 - Vertical homescreen uses getIcon() API. r=kgrandon
2015-10-27 22:25:15 -07:00
8b23fb0ad9
Bumping manifests a=b2g-bump
2015-10-27 21:57:59 -07:00
bb67a980f3
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6ab5217f27b9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #32724 from KevinGrandon/bug_1172349_settings_remaining_switches
Bug 1172349 - [Settings] Convert root panel switches to use gaia-switch
========
https://hg.mozilla.org/integration/gaia-central/rev/dfa16a0ac786
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1172349 - [Settings] Convert root panel switches to use gaia-switch r=gasolin
2015-10-27 21:55:15 -07:00
b53bda208d
Bug 1218694 - Test that AudioNode.connect() returns the node connected to. r=smaug
...
--HG--
extra : rebase_source : 8a7e450160512bb0f4f0ed4fb9b5aa7c534c23db
2015-10-28 13:54:57 +09:00
b42848e60e
Bug 1218694 - Return the AudioNode connected to when calling AudioNode.connect(). r=smaug
...
--HG--
extra : rebase_source : c5a58a51f1f43aad2fe64d872009dee88c564503
2015-10-28 13:54:35 +09:00
eb77f3eb71
Bumping manifests a=b2g-bump
2015-10-27 21:08:18 -07:00
38369f01bf
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e3126c1b11c3
Author: Scott Wu <scottwu@mozilla.com>
Desc: Merge pull request #32767 from scottwu/1215546-addons-dont-appear-settings
Bug 1215546 - Fixes add-on list after installation, r=gasolin
========
https://hg.mozilla.org/integration/gaia-central/rev/1455c5280782
Author: Scott Wu <scottcwwu@gmail.com>
Desc: Bug 1215546 - Fixes add-on list after installation, r=gasolin
2015-10-27 21:05:30 -07:00
d144c904f6
Bumping manifests a=b2g-bump
2015-10-27 19:43:44 -07:00
0d082840f6
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f1f820a8a19f
Author: tamarahills <thills@mozilla.com>
Desc: Merge pull request #32639 from tamarahills/bugfix/1215654-ftu-enable-hud-when-enhanced-metrics-chosen
Bug 1215654 - Enable HUD when FTU choice is enhanced metrics. r=sfoster.
========
https://hg.mozilla.org/integration/gaia-central/rev/69c709534a1a
Author: Tamara Hills <thills@mozilla.com>
Desc: Bug 1215654 - Enable HUD when FTU choice is enhanced metrics. r=sfoster.
2015-10-27 19:40:33 -07:00
2a4b3611c9
Bumping manifests a=b2g-bump
2015-10-27 18:53:20 -07:00
Blake Kaplan
Kit Cambridge
Wes Kocher
B2G Bumper Bot
David Critchley
Nick Fitzgerald
Alexandre Poirot
Philip Chee
Fabrice Desré
Wander Lairson Costa
Samael Wang
Carsten "Tomcat" Book
Paul Adenot