Ryan VanderMeulen
d7aa41835d
Bug 847903 - Skip 691096-1.html on OSX 10.6 due to intermittent crashes.
2015-04-15 14:35:58 -04:00
B2G Bumper Bot
d17c8e5d6b
Bumping manifests a=b2g-bump
2015-04-15 11:12:56 -07:00
B2G Bumper Bot
fed5cd4d49
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/71d98e4d750c
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1153445 - merge pull request #29512 from sfoster:homescreen-rtl-labels-bug-1153445 to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/ff6e0c9436b9
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1153445 - Icon labels shouls be dir=auto. r=kgrandon
2015-04-15 11:10:21 -07:00
Richard Newman
dfa46e2866
Bug 1153973 - Don't blindly apply deletions as insertions. r=nalexander
2015-04-15 10:24:47 -07:00
B2G Bumper Bot
69b1004b48
Bumping manifests a=b2g-bump
2015-04-15 09:20:00 -07:00
B2G Bumper Bot
6853bff3a1
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1989e8286330
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152772 - merge pull request #29508 from KevinGrandon:bug_1152772_downloaded_event_role to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/0749322a9213
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1152772 - [Search] Wait until downloadapplied to filter hidden roles
2015-04-15 09:17:49 -07:00
Martijn Wargers
e096ca96f0
Bug 970728 - Disable test_bug344861.html on b2g because popup window sizing doesn't work well there. r=RyanVM
2015-04-15 17:47:34 +02:00
Kartikaya Gupta
aec78d5467
Bug 1154614 - Don't try to pick up the same non-reentrant lock twice. r=dvander a=RyanVM
2015-04-15 12:49:28 -04:00
Robert Strong
5905715bf2
Bug 1154603 - useless defined(ANDROID) in nsUpdateDriver.cpp. r=spohl
2015-04-15 08:45:49 -07:00
Robert Strong
f3f5c3e99f
Bug 1154591 - getCanStageUpdates has incorrect checks for Windows and B2G. r=bbondy, r=spohl
2015-04-15 08:44:48 -07:00
Carsten "Tomcat" Book
6fc008ccfc
Backed out changeset 145f6347bb11 (bug 1137285) depending on the backout of bug 1145049
...
--HG--
extra : rebase_source : 3910ece62d2aafe466ce3aff65ebd164052d11cf
2015-04-15 17:24:06 +02:00
Carsten "Tomcat" Book
26799a7307
Backed out changeset 120d272971a6 (bug 1137285)
...
--HG--
extra : rebase_source : 890cba751909152d0e7d7f51db43c10672831d6e
2015-04-15 17:23:18 +02:00
Carsten "Tomcat" Book
bad3cd3153
Backed out changeset 998c4e53c1f8 (bug 1137285)
...
--HG--
extra : rebase_source : 9bad5a7e2d54257b22e290a4d3a354454d9002ea
2015-04-15 17:23:14 +02:00
Carsten "Tomcat" Book
2c95d28b6b
Backed out changeset 3570dbae06e2 (bug 1137285)
...
--HG--
extra : rebase_source : 1f3f448a438812c7e5810ebc8d735755936fdb72
2015-04-15 17:23:10 +02:00
Brian Grinstead
e1f2963567
Bug 1149346 - DevTools sourceeditor: make selection of an autocomplete item include the full text of the item;r=pbrosset
...
Previously, there was a case where typing 'a' and then selecting '#about' would
end up with 'about' in the editor. The selection wasn't taking this situation
into account, so now if the prefix of the autocomplete item contains the entire
text of the line, then replace the first part of the line with the item
2015-04-15 08:15:22 -07:00
Patrick Brosset
4ae0fca079
Bug 1149346 - First word in selector-search also matches classes and ids; r=harth
2015-04-15 08:15:20 -07:00
Brian Grinstead
0511749b55
Bug 969914 - Make developer toolbar match the light devtools theme when applied;r=jwalker,r=pbrosset
2015-04-15 08:12:49 -07:00
Ryan VanderMeulen
b8bfa41dd9
Merge m-c to fx-team. a=merge
2015-04-15 11:09:13 -04:00
Ryan VanderMeulen
47673d1444
Merge m-c to b2g-inbound. a=merge
2015-04-15 11:07:45 -04:00
Ryan VanderMeulen
5d36f17a50
Bug 1154434
- Bump mozharness.json to revision 4567c42063b7. a=me
2015-04-15 11:03:41 -04:00
B2G Bumper Bot
81817081e6
Bumping manifests a=b2g-bump
2015-04-15 07:22:19 -07:00
B2G Bumper Bot
41e9a9030c
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0ecde425b576
Author: Greg Weng <snowmantw@gmail.com>
Desc: Revert "Merge pull request #28584 from snowmantw/bug1138799"
This reverts commit 8b899668a5ef6effcd8b2bd84eea5c1450a3f207, reversing
changes made to db200d75c9fa50b78de6f448e234f9bfc6feb9c9.
2015-04-15 07:20:09 -07:00
Carsten "Tomcat" Book
357fe2f6b4
Merge mozilla-central to b2g-inbound
2015-04-15 15:11:39 +02:00
Carsten "Tomcat" Book
40ae721556
merge mozilla-inbound to mozilla-central a=merge
2015-04-15 14:28:05 +02:00
Steven MacLeod
38ba9eff34
Bug 1079245 - Set about:privatebrowsing to load in child. r=mossop
...
browser_privatebrowsing_downloadLastDir.js and browser_bug963945.js are also updated to work properly when about:privatebrowsing is loaded remotely.
2015-04-15 13:58:21 +02:00
Alessio Placitelli
d1cc43d5ca
Bug 1149980 - Fix Telemetry crashing on shutdown for invalid timestamps during tests. r=vladan
2015-04-15 13:41:00 +02:00
B2G Bumper Bot
f73bac9545
Bumping manifests a=b2g-bump
2015-04-15 04:32:28 -07:00
B2G Bumper Bot
2df5935628
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d692267ff838
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152675 - merge pull request #29419 from ian-liu:bluetooth/bug1152675_btv2_JS_error_while_goes_into_Bluetooth_panel to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/c09674460d39
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 1152675 - Bluetooth v2, JS error while goes into settings::bluetooth panel, r=arthur
2015-04-15 04:30:16 -07:00
B2G Bumper Bot
7bb2153c36
Bumping manifests a=b2g-bump
2015-04-15 03:42:48 -07:00
B2G Bumper Bot
e689b8a386
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/54a9866e1de2
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152938 - merge pull request #29453 from albertopq:1152938-rocketbar-sim to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/f91849f78e80
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1152938 - Preventing rocketbar when search input is not visible
========
https://hg.mozilla.org/integration/gaia-central/rev/69c424997207
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1149443 - merge pull request #29514 from crh0716:1149443 to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/94665883df49
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1149443 - Add missing attribute for multiple buttons
2015-04-15 03:40:14 -07:00
Carsten "Tomcat" Book
07bcc385b7
merge fx-team to mozilla-central a=merge
2015-04-15 12:36:46 +02:00
Thomas Zimmermann
e270538a95
Bug 1153796: Update CLOBBER, r=btian
...
The patch set renames and removes source files, which requires a cleanup
of the file dependencies. The corresponding build-system bug is 1154232.
2015-04-15 11:46:33 +02:00
Thomas Zimmermann
8b16914471
Bug 1153796: Share BluetoothInterfaceHelpers.{cpp,h} between Bluetooth v1 and v2, r=btian
...
The v1 implementation of BluetoothInterfaceHelpers.{cpp,h} is more
up-to-date than the v2 variant. So we can just use the v1 version and
remove the v2 version entirely. Bluetooth v2 contains its own version
of |Convert(nsresult, BluetoothStatus)|, which has been removed in
favor of the shared implementation.
--HG--
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.cpp => dom/bluetooth/BluetoothInterfaceHelpers.cpp
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.h => dom/bluetooth/BluetoothInterfaceHelpers.h
2015-04-15 11:46:33 +02:00
Thomas Zimmermann
25c352176c
Bug 1153796: Share BluetoothInterface.{cpp,h} between Bluetooth v1 and v2, r=btian
...
With this patch, Bluetooth v1 and v2 share the same interfaces classes
for their backend code. Bluetooth v1 doesn't yet support GATT, so the
GATT interfaces are still not implemented.
The patch also fixes the GATT-specific classes to compile under recent GCC
versions 4.8 and later, which are used with Android L.
The patch also preserves the prefered backend for each version. Bluetooth
v1 defaults to 'bluetoothd,' v2 defaults to 'bluedroid.'
2015-04-15 11:46:33 +02:00
Thomas Zimmermann
c3608191ca
Bug 1153796: Move dom/bluetooth/bluetooth2/BluetoothInterface.{cpp,h} to dom/bluetooth, r=btian
...
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothInterface.cpp => dom/bluetooth/BluetoothInterface.cpp
rename : dom/bluetooth/bluetooth2/BluetoothInterface.h => dom/bluetooth/BluetoothInterface.h
2015-04-15 11:46:33 +02:00
Thomas Zimmermann
af21064b9c
Bug 1153796: Unify variants of |BluetoothInterface::SspReply|, r=btian
...
Bluetooth use different types for the second argument of their variant
of |BluetoothInterface::SspReply|. This patch standardizes them on the
v2 version.
2015-04-15 11:46:33 +02:00
Carsten "Tomcat" Book
660521f516
Backed out changeset 3a16edeb9ed2 (bug 1153796) for bustage on a CLOSED TREE
2015-04-15 11:33:02 +02:00
Carsten "Tomcat" Book
4e0750765d
Backed out changeset 0f94e1a00fcd (bug 1153796)
...
--HG--
rename : dom/bluetooth/BluetoothInterface.cpp => dom/bluetooth/bluetooth2/BluetoothInterface.cpp
rename : dom/bluetooth/BluetoothInterface.h => dom/bluetooth/bluetooth2/BluetoothInterface.h
2015-04-15 11:32:21 +02:00
Carsten "Tomcat" Book
90d9543ab6
Backed out changeset a74d1c644c84 (bug 1153796)
2015-04-15 11:32:16 +02:00
Carsten "Tomcat" Book
dc4923c9f7
Backed out changeset 868ace3fafba (bug 1153796)
...
--HG--
rename : dom/bluetooth/BluetoothInterfaceHelpers.cpp => dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.cpp
rename : dom/bluetooth/BluetoothInterfaceHelpers.h => dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.h
2015-04-15 11:32:10 +02:00
B2G Bumper Bot
aa19be884b
Bumping manifests a=b2g-bump
2015-04-15 02:16:22 -07:00
B2G Bumper Bot
e9fb6c5fc0
Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/938ee7e95e8e
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1040621 - merge pull request #29518 from timdream:layout-lang to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/1076a4cf1ebb
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1040621 - Follow up, update layouts.json output reference
========
https://hg.mozilla.org/integration/gaia-central/rev/da373c64f7ca
Author: Anindya Pandey <anindyapandey@gmail.com>
Desc: Bug 1040621 - Set lang attribute to the layout containing div r=timdream
Bug 1040621 - Set lang attribute to the layout containing div(2) r=timdream
Bug 1040621 - Set lang attribute to the layout containing div r=timdream(3)
========
https://hg.mozilla.org/integration/gaia-central/rev/5983493a8d6b
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1151843 - merge pull request #29382 from azasypkin:bug-1151843-notification-data to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/f0b18f287dc1
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1151843 - [Messages][Refactoring] Use notification "data" attribute instead of icon URL query string parameters. r=julien
2015-04-15 02:14:10 -07:00
Thomas Zimmermann
5cb077cd58
Bug 1153796: Share BluetoothInterfaceHelpers.{cpp,h} between Bluetooth v1 and v2, r=btian
...
The v1 implementation of BluetoothInterfaceHelpers.{cpp,h} is more
up-to-date than the v2 variant. So we can just use the v1 version and
remove the v2 version entirely. Bluetooth v2 contains its own version
of |Convert(nsresult, BluetoothStatus)|, which has been removed in
favor of the shared implementation.
--HG--
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.cpp => dom/bluetooth/BluetoothInterfaceHelpers.cpp
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.h => dom/bluetooth/BluetoothInterfaceHelpers.h
2015-04-15 11:04:43 +02:00
Thomas Zimmermann
81e83b639b
Bug 1153796: Share BluetoothInterface.{cpp,h} between Bluetooth v1 and v2, r=btian
...
With this patch, Bluetooth v1 and v2 share the same interfaces classes
for their backend code. Bluetooth v1 doesn't yet support GATT, so the
GATT interfaces are still not implemented.
The patch also fixes the GATT-specific classes to compile under recent GCC
versions 4.8 and later, which are used with Android L.
The patch also preserves the prefered backend for each version. Bluetooth
v1 defaults to 'bluetoothd,' v2 defaults to 'bluedroid.'
2015-04-15 11:04:43 +02:00
Thomas Zimmermann
c2f24a1548
Bug 1153796: Move dom/bluetooth/bluetooth2/BluetoothInterface.{cpp,h} to dom/bluetooth, r=btian
...
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothInterface.cpp => dom/bluetooth/BluetoothInterface.cpp
rename : dom/bluetooth/bluetooth2/BluetoothInterface.h => dom/bluetooth/BluetoothInterface.h
2015-04-15 11:04:43 +02:00
Thomas Zimmermann
c32d85b108
Bug 1153796: Unify variants of |BluetoothInterface::SspReply|, r=btian
...
Bluetooth use different types for the second argument of their variant
of |BluetoothInterface::SspReply|. This patch standardizes them on the
v2 version.
2015-04-15 11:04:43 +02:00
B2G Bumper Bot
786807cafd
Bumping manifests a=b2g-bump
2015-04-15 01:02:47 -07:00
B2G Bumper Bot
528f207feb
Bumping gaia.json for 7 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/84fa3d8b1e28
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1154223 - merge pull request #29501 from crh0716:1154223 to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/48110a1dfa59
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1154223 - Remove the handler for special keys
========
https://hg.mozilla.org/integration/gaia-central/rev/3fdbffe64bd3
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1128390 - merge pull request #29499 from timdream:keyboard-dyn-dialogs to mozilla-b2g:master
========
https://hg.mozilla.org/integration/gaia-central/rev/0358def8948f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1128390 - Part III, Call to gaia toast on download error
========
https://hg.mozilla.org/integration/gaia-central/rev/e37fe3378efa
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1128390 - Part II, LayoutItem onerror and tests
========
https://hg.mozilla.org/integration/gaia-central/rev/268112ffcf60
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1128390 - Part I, Removal Conformation dialog
========
https://hg.mozilla.org/integration/gaia-central/rev/58b9da3f1c9d
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1128390 - Part Zero, Use <gaia-subheader>
2015-04-15 01:00:36 -07:00
Gijs Kruitbosch
23e164625b
Bug 1148923 - min-width the font menulists, r=jaws
...
--HG--
extra : rebase_source : c0fe6bf0643a67db423fc2b1cb47ec23244958d0
2015-04-15 07:57:00 +01:00
Gijs Kruitbosch
e3257e1ae0
Bug 1135545 - disable test on Win8 for frequent failures with no plausible explanation (showing start screen), rs=me
...
--HG--
extra : rebase_source : 715e1fb09b589d510b72c2264889fe67fe6fb72b
2015-04-16 10:12:46 +01:00