Commit Graph

394008 Commits

Author SHA1 Message Date
Wes Kocher
87398db1ad Merge fx-team to m-c a=merge 2014-11-20 17:55:52 -08:00
Wes Kocher
fb1e2f696b Merge b2g-inbound to m-c a=merge 2014-11-20 17:49:07 -08:00
B2G Bumper Bot
1a9c88d260 Bumping manifests a=b2g-bump 2014-11-20 14:36:57 -08:00
B2G Bumper Bot
dd6d454040 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/830d094e3135
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #26258 from jmcanterafonseca/fix_fb_remove_photo

Bug 1098218 - [Contacts] [Regression] Facebook contact photo should not ...

========

https://hg.mozilla.org/integration/gaia-central/rev/5998d9e9655c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1098218 - [Contacts] [Regression] Facebook contact photo should not be removed and could be changed by a local photo
2014-11-20 14:31:53 -08:00
Brian Grinstead
58df142cef Bug 1102308 - Refactor pref-changed emitting in toolbox-options.js;r=jryans 2014-11-20 14:11:34 -08:00
Brian Grinstead
ecad4235cb Bug 1102369 - Convert existing devtools colors to CSS variables - part 2;r=vporof 2014-11-20 12:10:32 -08:00
Benoit Girard
df8f80814b Bug 1098495 - Part 2: Run the layer tree invalidation code on windows. r=mstange ON A CLOSED TREE
--HG--
extra : rebase_source : 1e98356dabedb557ad786dbd49679206e24cf09e
2014-11-20 15:10:18 -05:00
Ben Turner
44622b4efd Bug 1102052 - Crash for PBackground protocol errors, r=mrbkap. 2014-11-20 11:48:18 -08:00
Armen Zambrano Gasparnian
08f987df9c Bug 1064002 - Modify Android Arm in-tree configs to allow more customizations
--HG--
extra : rebase_source : 09c130d67cb052068e7d8612805bb6c03645de57
2014-11-20 14:43:37 -05:00
B2G Bumper Bot
96cf7db567 Bumping manifests a=b2g-bump 2014-11-20 11:06:57 -08:00
B2G Bumper Bot
556038d6d3 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f5df20744bba
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1092362 - Use the default audio channel when playing audible tones outside of calls r=drs,francisco

========

https://hg.mozilla.org/integration/gaia-central/rev/5fb00829c724
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #26288 from azasypkin/bug-1100954-set-header-content

Bug 1100954 - Activities menu has no text after forwarding a SMS. r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/86ea5190c23d
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1100954 - Activities menu has no text after forwarding a SMS. r=julien
2014-11-20 10:56:52 -08:00
B2G Bumper Bot
c653c3b3b2 Bumping manifests a=b2g-bump 2014-11-20 10:31:55 -08:00
B2G Bumper Bot
fd1e1f3ad0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9d453249697f
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #26334 from Cwiiis/bug1102220-install-in-last-group

Bug 1102220 - Always place apps in the last group when installing. r=kgrandon,crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/8c47423a409e
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1102220 - Always place apps in the last group when installing. r=kgrandon,crdlc

If the last group is collapsed, instead of placing newly installed apps
into a new group, expand that group and place it there as normal.
2014-11-20 10:26:52 -08:00
B2G Bumper Bot
3b6be73c98 Bumping manifests a=b2g-bump 2014-11-20 10:17:03 -08:00
B2G Bumper Bot
ea994347c3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/869eadff4bf0
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #26001 from pacorampas/1094746

Bug 1094746 - [Dialer][Call Screen] Remove horizontal line at the bottom of a conference participant list overlay of a conference participant list overlay. r=gtorodelvalle

========

https://hg.mozilla.org/integration/gaia-central/rev/9ef175edfc67
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1094746 - [Dialer][Call Screen] Remove horizontal line at the bottom of a conference participant list overlay
2014-11-20 10:11:53 -08:00
B2G Bumper Bot
f5bdf30f34 Bumping manifests a=b2g-bump 2014-11-20 09:31:59 -08:00
B2G Bumper Bot
1dd6c38870 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b4d91dbb0c87
Author: Guillaume C. Marty <gmarty@users.noreply.github.com>
Desc: Merge pull request #26241 from gmarty/Bug-1099137-Status-bar-is-not-updated-when-you-re-in-an-app

Bug 1099137 - Status bar is not updated when you're in an app

========

https://hg.mozilla.org/integration/gaia-central/rev/bac38e7f3bac
Author: Guillaume Marty <edo999@gmail.com>
Desc: Bug 1099137 - Status bar is not updated when you're in an app
2014-11-20 09:26:56 -08:00
B2G Bumper Bot
24d9a8b033 Bumping manifests a=b2g-bump 2014-11-20 08:31:32 -08:00
B2G Bumper Bot
259878d173 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/515e1675fc2e
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #26267 from yzen/bug-1101192

Bug 1101192 - added labels for missing elements in Email's manual setup.

========

https://hg.mozilla.org/integration/gaia-central/rev/1e04596590aa
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1101192 - added labels for missing elements in Email's manual setup. r=jrburke
2014-11-20 08:26:58 -08:00
B2G Bumper Bot
380a5f1dc1 Bumping manifests a=b2g-bump 2014-11-20 08:17:07 -08:00
B2G Bumper Bot
0862e7253a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/806b0bb0e348
Author: autolander <kgrandon@mozilla.com>
Desc: Bug 1094598 - merge pull request #25865 from KevinGrandon:bug_1094598_remove_strings to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/732dfdfec7be
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1094598 - [VerticalHome] Remove strings from home index.html
2014-11-20 08:11:58 -08:00
B2G Bumper Bot
0969eb03d9 Bumping manifests a=b2g-bump 2014-11-20 07:46:38 -08:00
B2G Bumper Bot
de22a7eef8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/802192c4ebc5
Author: autolander <kgrandon@mozilla.com>
Desc: Bug 1102120 - merge pull request #26320 from KevinGrandon:bug_1102120_collection_remove_strings_delete to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/296dfba1cf82
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1102120 - [Collection] Remove html strings from delete page
2014-11-20 07:36:59 -08:00
Carsten "Tomcat" Book
1670df97eb Merge mozilla-central to b2g-inbound 2014-11-20 16:14:53 +01:00
B2G Bumper Bot
0acc412ee3 Bumping manifests a=b2g-bump 2014-11-20 06:57:00 -08:00
B2G Bumper Bot
37e475da7e Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/42232444b435
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #26298 from hfiguiere/rtl-fixes

Lists RTL fixes for music. Bug 1074546 and bug 1101537. r=squib

========

https://hg.mozilla.org/integration/gaia-central/rev/32b41a33f27e
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1101537 - Align list header and item content properly in RTL

========

https://hg.mozilla.org/integration/gaia-central/rev/e8256bb26983
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1074546 - The album cover should be on the right in RTL.
2014-11-20 06:51:56 -08:00
Carsten "Tomcat" Book
2a90415e24 Backed out changeset 7c4360f398ff (bug 1064002) for causing Bug 1102115 2014-11-20 14:30:54 +01:00
B2G Bumper Bot
b82e5423b5 Bumping manifests a=b2g-bump 2014-11-20 04:26:56 -08:00
B2G Bumper Bot
4169a4f3a0 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7cfd39b4164a
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #26187 from huchengtw-moz/bug-1100282-lock-configure-activity

Bug 1100282 - [Stingray][System] only allow smart-settings app to handle..., r=rexboy

========

https://hg.mozilla.org/integration/gaia-central/rev/ee061d839814
Author: John Hu <johu@mozilla.com>
Desc: Bug 1100282 - [Stingray][System] only allow smart-settings app to handle configure activity

========

https://hg.mozilla.org/integration/gaia-central/rev/39c1880f4697
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #26178 from huchengtw-moz/bug-1098663-rename-system

Bug 1098663 - [Stingray][System] Rename System to Services to prevent co..., r=rexboy

========

https://hg.mozilla.org/integration/gaia-central/rev/a7b89f03fc10
Author: John Hu <johu@mozilla.com>
Desc: Bug 1098663 - [Stingray][System] Rename System to Services to prevent conflict with ES6
2014-11-20 04:21:53 -08:00
B2G Bumper Bot
07180bc351 Bumping manifests a=b2g-bump 2014-11-20 03:56:57 -08:00
B2G Bumper Bot
a2bdb21acb Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/bfad9b779186
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #26169 from yfdyh000/add_default_theme_to_tablet

Bug 1082516 - add default_theme to Flatfish tablet. r=rchen

========

https://hg.mozilla.org/integration/gaia-central/rev/15b1949f162d
Author: YFdyh000 <yfdyh000@gmail.com>
Desc: Bug 1082516 - Add the default_theme to Flatfish tablet build

========

https://hg.mozilla.org/integration/gaia-central/rev/ab2b5ddd1894
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1094896 - Make sure we un-highlight the hash key when requesting the IMEI code(s) r=drs
2014-11-20 03:51:54 -08:00
Carsten "Tomcat" Book
47ef3040be Merge mozilla-central to b2g-inbound 2014-11-20 12:40:14 +01:00
B2G Bumper Bot
2a1fa78093 Bumping manifests a=b2g-bump 2014-11-20 03:38:21 -08:00
Carsten "Tomcat" Book
16d197f520 merge mozilla-inbound to mozilla-central a=merge 2014-11-20 11:38:15 +01:00
Carsten "Tomcat" Book
72dbf27b21 merge fx-team to mozilla-central a=merge 2014-11-20 11:36:19 +01:00
B2G Bumper Bot
04a3b6412a Bumping manifests a=b2g-bump 2014-11-20 02:33:25 -08:00
B2G Bumper Bot
7bc0b51668 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1120755bb4c5
Author: EragonJ (E.J.) <eragonj@eragonj.me>
Desc: Merge pull request #26130 from EragonJ/bug-1086686

Bug 1086686 - [2.1][l10n][Settings] Basque: The USB button header text

========

https://hg.mozilla.org/integration/gaia-central/rev/798d5beaed88
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1086686 - [2.1][l10n][Settings] Basque: The USB button header text
"USB storage" is truncated
2014-11-20 02:31:52 -08:00
Thomas Zimmermann
62dd1a1b70 Bug 1100883: Cleanup |BluetoothServiceBluedroid::AdapterStateChangedNotification|, r=btian
This patch replaces |ToggleBtAck| with |AcknowledgeToggleBt| in
|BluetoothServiceBluedroid::AdapterStateChangedNotification| and
cleans up the remaining runnables used by this method.

All runnables need to be handled in the same patch, because the
order of operation must not be changed.
2014-11-20 11:06:01 +01:00
Thomas Zimmermann
d305868eed Bug 1100883: Replace most instances of |ToggleBtAck| with calls to |AcknowledgeToggleBt|, r=btian
|AcknowledgeToggleBt| completes a Bluetooth start or stop operation
in the context of |BluetoothService|; That was done by |ToggleBtAck|
before.

This patch replaces |ToggleBtAck| with calls to |AcknowledgeToggleBt|
in |BluetoothServiceBluedroid| for all the trivial cases.
2014-11-20 11:06:01 +01:00
Thomas Zimmermann
e7b6dea79d Bug 1100883: Move |ToggleBtAck| into |BluetoothService|, r=btian
|ToggleBtAck| completes a start of stop operation on the main thread.

This patch moves the runnable's functionality into |BluetoothService|
and makes it available for methods running on the main thread.
2014-11-20 11:06:00 +01:00
Thomas Zimmermann
39334508d6 Bug 1100883: Move helpers of |BluetoothServiceBluedroid| into its namespace, r=btian 2014-11-20 11:06:00 +01:00
B2G Bumper Bot
979eb405a7 Bumping manifests a=b2g-bump 2014-11-20 01:51:35 -08:00
B2G Bumper Bot
38a443f634 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f8201603e0ad
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #26318 from timdream/keyboard-setting-no-text-select

Bug 1095279 - Stop Keyboard app settings panel to be selectable, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/7d5cd3c54363
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1095279 - Stop Keyboard app settings panel to be selectable
2014-11-20 01:47:00 -08:00
B2G Bumper Bot
c18bfad610 Bumping manifests a=b2g-bump 2014-11-20 01:33:27 -08:00
B2G Bumper Bot
83b7b084a0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d58735d54794
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #26185 from huchengtw-moz/bug-1093530-transparent-inline-activity

Bug 1093530 - [Stingray][System] let inline-activity to have transparent..., r=rexboy

========

https://hg.mozilla.org/integration/gaia-central/rev/2b7a0fa8ffbc
Author: John Hu <johu@mozilla.com>
Desc: Bug 1093530 - [Stingray][System] let inline-activity to have transparent background
2014-11-20 01:31:54 -08:00
B2G Bumper Bot
a720d6195f Bumping manifests a=b2g-bump 2014-11-20 00:36:56 -08:00
B2G Bumper Bot
c1f1b383b9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/17efedc0220b
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #26278 from rexboy7/1098274-add-and-remove-card

bug 1098274 - [Stingray][Home] Add and remove card programitacally. r= dwi2

========

https://hg.mozilla.org/integration/gaia-central/rev/25dfaebb353f
Author: Rex Lee <rexboy@mozilla.com>
Desc: bug 1098274 - [Stingray][Home] Add and remove card programitacally
2014-11-20 00:31:52 -08:00
B2G Bumper Bot
d51674480c Bumping manifests a=b2g-bump 2014-11-20 00:27:42 -08:00
B2G Bumper Bot
e0d7e2b378 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/dd1a3ba00f63
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: Revert "Merge pull request #25484 from mancas/bug1082936"

This reverts commit 11bb4b4526df09ddc006fb8cd294fc29ceb23d77, reversing
changes made to 75e10bb632b1e4a47493d0a66bc32fb74249c57f.

Conflicts:
	apps/system/js/icc_worker.js
2014-11-20 00:26:09 -08:00
B2G Bumper Bot
c5c09322c1 Bumping manifests a=b2g-bump 2014-11-19 22:52:02 -08:00