Commit Graph

417046 Commits

Author SHA1 Message Date
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
B2G Bumper Bot
29aaa1bf47 Bumping manifests a=b2g-bump 2015-04-14 23:12:51 -07:00
B2G Bumper Bot
28a9d07e1d Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b4cc34dc6893
Author: J. Ryan Stinnett <jryans@gmail.com>
Desc: Merge pull request #29437 from jryans/qr-size-prod-2

Bug 1145772 - Improve WiFi auth image capture

========

https://hg.mozilla.org/integration/gaia-central/rev/0b3d743b3da9
Author: J. Ryan Stinnett <jryans@gmail.com>
Desc: Bug 1145772 - Switch to data URLs in QR auth. r=janx

Somewhat surprisingly, serializing the image to a data URL instead of an object
URL allowed QR recognition to become roughly 2x faster (as measured on Flame).

========

https://hg.mozilla.org/integration/gaia-central/rev/797a15cff986
Author: J. Ryan Stinnett <jryans@gmail.com>
Desc: Bug 1145772 - Require minimum video size for QR auth. r=janx
2015-04-14 23:10:14 -07:00
B2G Bumper Bot
3e1ee64dda Bumping manifests a=b2g-bump 2015-04-14 22:22:20 -07:00
B2G Bumper Bot
70f307af81 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9b4f4ec031e5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #29441 from howareyou322/bug1127170

Bug 1127170 - Reduce the bottom padding for shadow canvas to make no overlap between icon and text, r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/ab0c03f12527
Author: peter chang <pchang@mozilla.com>
Desc: Bug 1127170 Reduce the bottom padding for shadow canvas to make no overlap between icon and text, r=kgrandon
2015-04-14 22:20:09 -07:00
B2G Bumper Bot
536d223045 Bumping manifests a=b2g-bump 2015-04-14 21:52:25 -07:00
B2G Bumper Bot
81e32fac28 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a1be450c8daf
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1101387 - [Build] New makefile target to create the gaia.zip"

This reverts commit 2737e8d714e53af8b18a351874a7c90992fcc2e1.
2015-04-14 21:50:11 -07:00
B2G Bumper Bot
95d5d576de Bumping manifests a=b2g-bump 2015-04-14 21:34:52 -07:00
B2G Bumper Bot
94935a3706 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/43ec588643ee
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #29490 from timdream/gaia-toast-bump

Bug 1154127 - Bump gaia-toast, r=wilsonpage

========

https://hg.mozilla.org/integration/gaia-central/rev/51263d5ce008
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1154127 - Bump gaia-toast
2015-04-14 21:32:38 -07:00
B2G Bumper Bot
99f741392f Bumping manifests a=b2g-bump 2015-04-14 20:59:56 -07:00
B2G Bumper Bot
55d856edfb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/413c73e231fd
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #29417 from huchengtw-moz/bug-1152666-jshint-telephony

Bug 1152666 - [System] fix jshint errors/warnings for telephony related ..., r=gduan

========

https://hg.mozilla.org/integration/gaia-central/rev/fa472d018441
Author: John Hu <johu@mozilla.com>
Desc: Bug 1152666 - [System] fix jshint errors/warnings for telephony related files
2015-04-14 20:57:45 -07:00
B2G Bumper Bot
13ac8af1cd Bumping manifests a=b2g-bump 2015-04-14 20:12:52 -07:00
B2G Bumper Bot
7409cebcf0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/66185fa4a632
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #28584 from snowmantw/bug1138799

Bug 1138799 - [LockScreen] Prevent racing of LockScreen & FTU in LockScreenWindowManager

========

https://hg.mozilla.org/integration/gaia-central/rev/f83d5ed846f6
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1138799 - [LockScreen] Prevent create LockScreenWindow when there is FTU
2015-04-14 20:10:17 -07:00
Junior Hsu
35f5826c5e Bug 1153063 - turn on logging for debug in test_tcp_control_channel.js. r=fabrice
--HG--
extra : rebase_source : 59a826e0518e373680e2062cce45ffa1caa6bce7
2015-04-15 11:01:02 +08:00
B2G Bumper Bot
cc991a6c03 Bumping manifests a=b2g-bump 2015-04-14 19:52:26 -07:00
B2G Bumper Bot
baee9e7921 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/51987fcc81d2
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152502 - merge pull request #29500 from steveck-chung:message-selection to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/c7b94756d11d
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 1152502 - [Message] Set attachment selection to none to prevent cursor displayed inside attachment, r=julienw
2015-04-14 19:50:13 -07:00
B2G Bumper Bot
34c2d97f2c Bumping manifests a=b2g-bump 2015-04-14 19:17:27 -07:00
B2G Bumper Bot
9cc70532ac Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/138ab51ba9ce
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #29475 from crh0716/1144848_master

Bug 1144848 - Adding activity handling for addon details. r=eragonj

========

https://hg.mozilla.org/integration/gaia-central/rev/e46a4583fbfe
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1144848 - Adding activity handling for addon details.

========

https://hg.mozilla.org/integration/gaia-central/rev/d3576481fde7
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #29291 from cctuan/1101387

Bug 1101387 - [Build] New makefile target to create the "gaia.zip"

========

https://hg.mozilla.org/integration/gaia-central/rev/a6d8b0aa82fc
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1101387 - [Build] New makefile target to create the gaia.zip
2015-04-14 19:15:13 -07:00
Robert Strong
2773a89419 Bug 1154179 - Add FAIL_ON_WARNINGS to app update. r=glandium 2015-04-14 17:00:11 -07:00
Robert Strong
91cf4cb89f Bug 1152997 - Cleanup app update build to exclude android. r=glandium, r=mossop
--HG--
rename : toolkit/mozapps/update/moz.build => toolkit/components/timermanager/moz.build
rename : toolkit/mozapps/update/nsIUpdateTimerManager.idl => toolkit/components/timermanager/nsIUpdateTimerManager.idl
rename : toolkit/mozapps/update/nsUpdateTimerManager.js => toolkit/components/timermanager/nsUpdateTimerManager.js
rename : toolkit/mozapps/update/nsUpdateTimerManager.manifest => toolkit/components/timermanager/nsUpdateTimerManager.manifest
rename : toolkit/mozapps/update/tests/unit_timermanager/consumerNotifications.js => toolkit/components/timermanager/tests/unit/consumerNotifications.js
rename : toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini => toolkit/components/timermanager/tests/unit/xpcshell.ini
2015-04-14 17:00:02 -07:00
Wander Lairson Costa
2920c1b952 Bug 1134226: Add lightsaber nightly builds. 2015-04-14 20:16:01 -03:00
Wes Kocher
806114c6d0 Merge m-c to b2ginbound a=merge CLOSED TREE 2015-04-14 15:38:10 -07:00
B2G Bumper Bot
107d94122a Bumping manifests a=b2g-bump 2015-04-14 15:18:20 -07:00
B2G Bumper Bot
fa0e94ae83 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ada9e2533637
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152127 - merge pull request #29511 from mikehenrty:bug-1152127-LRM-control to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/241c7402942d
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1152127 - Add LRM character to voicemail notification for proper + display
2015-04-14 15:16:07 -07:00
B2G Bumper Bot
37bce924f9 Bumping manifests a=b2g-bump 2015-04-14 14:22:23 -07:00
B2G Bumper Bot
37822215c4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b85548bd119c
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1071348 - merge pull request #29405 from sfoster:ftu-geolocation-persist-bug-1071348 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/fe80766b28c7
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1071348 - Observe setting in FTU UI. r=fcampo
2015-04-14 14:20:10 -07:00
Morris Tseng
8b1d489941 Bug 1147279 - Get correct translation when layer optimize away. r=roc
--HG--
extra : rebase_source : e9e56fe3a0f1d8a88de1e0b40151ed2e452e4ff9
2015-04-14 22:39:00 +02:00
B2G Bumper Bot
95d2c4d89c Bumping manifests a=b2g-bump 2015-04-14 13:32:34 -07:00
B2G Bumper Bot
dbb3e9483d Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

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

Bug 1150587 - Intermittent text_selection_test.js, wait for system app in test setup

========

https://hg.mozilla.org/integration/gaia-central/rev/a01b16896b33
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1150587 - Intermittent text_selection_test.js, wait for system app in test setup

========

https://hg.mozilla.org/integration/gaia-central/rev/3694459db25c
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152948 - merge pull request #29483 from punamdahiya:Bug1152948 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/402d0180e7d5
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug 1152948 - [Gallery] - Display saved edited image by insert position in fullscreen view r=djf
2015-04-14 13:30:22 -07:00
Ryan VanderMeulen
49e688766a Merge fx-team to m-c. a=merge 2015-04-14 16:22:54 -04:00
Ryan VanderMeulen
40b9880ce0 Merge b2g-inbound to m-c. a=merge 2015-04-14 16:14:45 -04:00
Ryan VanderMeulen
16c36d245d Merge inbound to m-c. a=merge 2015-04-14 16:01:51 -04:00
B2G Bumper Bot
9178ceeb4c Bumping manifests a=b2g-bump 2015-04-14 12:57:26 -07:00
B2G Bumper Bot
165300f55a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6a426594bfd3
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #29510 from gaye/bug-1150523

Bug 1150523 - marionette-client@1.7.3 r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/d7958c5543b4
Author: gaye <gaye@mozilla.com>
Desc: Bug 1150523 - marionette-client@1.7.3 r=gaye
2015-04-14 12:55:14 -07:00
B2G Bumper Bot
2db1efc833 Bumping manifests a=b2g-bump 2015-04-14 12:07:32 -07:00
B2G Bumper Bot
9728341f85 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ff36a42838b3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1154405 - Disable intermittent test, statusbar_home_button_test.js | Closing statusbar via home button > Home screen keeps scroll position AssertionError: false == true
2015-04-14 12:05:20 -07:00
Jordan Lund
2d03e67eb1 No Bug - bump mozharness.json to rev ed7cbf080ee6, r=mshal, a=testing 2015-04-14 11:42:38 -07:00
Ryan VanderMeulen
4fa8326641 Backed out 3 changesets (bug 1137252) for suspicion of causing frequent B2G mochitest timeouts.
Backed out changeset bbb1b526cb56 (bug 1137252)
Backed out changeset 0c3d670f0c14 (bug 1137252)
Backed out changeset 1e0fa4ab7c6f (bug 1137252)

CLOSED TREE
2015-04-14 13:33:28 -04:00
Ryan VanderMeulen
b488aec511 Backed out changeset dd10ce7a6b1a (bug 1151242) for bustage.
CLOSED TREE
2015-04-14 13:20:05 -04:00
jlal@mozilla.com
bfa0897aef Bug 1154358 - Add mulet reftests to all branches r=me
--HG--
extra : rebase_source : 9ea5277cb672407cfa4fa20efc2c95c9d8b15162
2015-04-14 10:16:44 -07:00
B2G Bumper Bot
c6ad89f9cd Bumping manifests a=b2g-bump 2015-04-14 10:17:47 -07:00