393840 Commits

Author SHA1 Message Date
Ryan VanderMeulen
581dc3f3c7 Merge b2g-inbound to m-c. a=merge 2014-11-17 16:23:09 -05:00
Ryan VanderMeulen
e7718a4c34 Merge fx-team to m-c. a=merge 2014-11-17 16:21:20 -05:00
B2G Bumper Bot
8a721b95b2 Bumping manifests a=b2g-bump 2014-11-17 11:51:49 -08:00
B2G Bumper Bot
0a62958d29 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/587d98bf2662
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #26192 from jmcanterafonseca/fix_del_button"

This reverts commit 6f6e4b9b395b95dd920ee701d0c5ec6aa2c1d805, reversing
changes made to f004f8c891c4a6510a4679f3804ba3123af26615.
2014-11-17 11:46:48 -08:00
Nick Alexander
3cab90a5de Bug 1099501 - Export and use ANDROID_TOOLS where appropriate. r=snorp,bnicholson
In certain configurations, in particular when installing the Android SDK
using HomeBrew, one sees a configuration with symlinks like:

    [brian@brian-macbook git]$ ls -l /usr/local/Cellar/android-sdk/23.0.2/
    total 72
    ...
    lrwxr-xr-x   1 brian  admin    38 Nov 14 16:39 platforms -> ../../../var/lib/android-sdk/platforms
    ...
    drwxr-xr-x  26 brian  admin   884 Nov 14 17:43 tools

In this case, we have
ANDROID_SDK=/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21.

It is an anti-pattern to use ANDORID_SDK/.. to find other paths in the
tree.  This pattern is used in at least two places:

1) When we try to find
/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21/../../tools,
we end up in the /usr/local/var/lib subtree.  This patch works around
that by exporting and using ANDROID_TOOLS; ANDROID_TOOLS itself is
extracted using path matching, rather than following .. through the
filesystem.

2) We also need to use ANDROID_SDK_ROOT rather than
ANDROID_SDK/../.. through-out.

--HG--
extra : rebase_source : 5e0323a94f2b80550f17a624e16f338cdeec406d
2014-11-17 11:12:00 -08:00
Mike Conley
ccd8edc947 Bug 1008435 - Let the Gecko Profiler work with child processes. r=BenWa,smaug.
We now allow profiling the content process for e10s, and plugin processes.

--HG--
extra : rebase_source : 1f2e35d4d55b33b56160132893dbf7d4787925fa
extra : amend_source : d03465d4318f8e50c7624ad0eeb681b30c068b11
2014-11-18 12:50:25 -05:00
Jared Wein
f9cfe19c63 Bug 1101006 - Refactor mozLoop.{get, set}LoopCharPref and mozLoop.{get, set}LoopBoolPref to mozLoop.{get, set}Pref that uses getPrefType. r=mikedeboer 2014-11-19 13:29:27 -05:00
Jared Wein
cda17719db Bug 1074932 - Desktop client user can access product tour from gears menu. r=MattN 2014-11-19 13:29:17 -05:00
Carsten "Tomcat" Book
cf1e11e596 Backed out changeset 5b80055fba93 (bug 949104) for Android 4.0 Debug Test failures 2014-11-19 17:08:09 +01:00
Nicolas Perriault
538e169c18 Bug 1094137 - Create a common shared store creator for Loop. r=Standard8 2014-11-19 14:59:08 +00:00
Mark Finkle
81e40db8c4 Bug 949104 - Don't write history visits during HTTP redirection r=rnewman 2014-11-19 09:06:16 -05:00
J. Ryan Stinnett
ac4f40eee0 Bug 1097833 - Move local runtime behind a pref again. r=paul 2014-11-19 07:41:42 -06:00
Carsten "Tomcat" Book
778d930067 Merge mozilla-central to fx-team 2014-11-19 13:52:17 +01:00
Patrick Brosset
0bf9a725d0 Bug 1076866 - Rect highlighter; r=bgrins 2014-11-19 11:16:25 +01:00
B2G Bumper Bot
eaae879ffd Bumping manifests a=b2g-bump 2014-11-17 11:06:44 -08:00
B2G Bumper Bot
b5036e5791 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/01d806f7e891
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #26163 from kanru/bug-1098118"

This reverts commit 488c8369d4e06745d0e452b7887abf2af44a8e6c, reversing
changes made to 046e2783d2be7b6103a7220aa691fd14f4acb76a.

========

https://hg.mozilla.org/integration/gaia-central/rev/5d9069701f01
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #26158 from justindarc/bug1097136-2

Bug 1097136 - [Gallery] Blank screen appears when opening Gallery when U...

========

https://hg.mozilla.org/integration/gaia-central/rev/86c322c41bb0
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 1097136 - [Gallery] Blank screen appears when opening Gallery when USB is connected
2014-11-17 11:01:43 -08:00
Dave Townsend
39cd3d1e3e Bug 1060138: Add a hook for extensions to provide data to send across the synchronous contextmenu message. r=mconley 2014-11-17 10:58:13 -08:00
B2G Bumper Bot
0e98896a56 Bumping manifests a=b2g-bump 2014-11-17 10:45:38 -08:00
B2G Bumper Bot
d2505b51bd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3fffefef2940
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #26153 from Cwiiis/bug1099055-anchor-link-disables-rocketbar-collapsing

Bug 1099055 - Fix rocketbar collapse being disabled by anchor links. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/59ce7e78b890
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1099055 - Fix rocketbar collapse being disabled by anchor links. r=etienne
2014-11-17 10:44:00 -08:00
Patrick McManus
82ea2eebd2 bug 1095859 - proxy tweak r=valentin.gosu 2014-11-17 13:27:12 -05:00
Dave Townsend
ee4eba3ba8 Bug 1097334: Fix console tests in mochitest-jetpack by setting the default log level to info. r=erikvold 2014-11-17 09:58:08 -08:00
Sam Penrose
4aa8938365 Bug 1095617 - Don't break when loggedInUser == 'null'. r=ferjm 2014-11-17 08:53:16 -08:00
Albert Juhe
d945800811 Bug 1059376 - DevTools themes - Update arrow color to match the info bar color; r=bgrins 2014-11-17 08:47:56 -08:00
B2G Bumper Bot
f9053167ea Bumping manifests a=b2g-bump 2014-11-17 07:34:23 -08:00
B2G Bumper Bot
927d448559 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/37d229d9c418
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #26192 from jmcanterafonseca/fix_del_button

Bug 1094709 - [Flame][Contacts]Tap x in left of Name Input Box when edit...

========

https://hg.mozilla.org/integration/gaia-central/rev/0b62de57fd64
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1094709 - [Flame][Contacts]Tap x in left of Name Input Box when edit a contact, it will not delete the name.
2014-11-17 07:34:08 -08:00
Jonathan Kew
2162f6bcb7 Bug 1098497 - Update OTS to latest upstream (at commit 7091a232a10a741591ff25158c98ca3f0c319cf9) to pick up recent fixes. r=jdaggett 2014-11-17 15:24:05 +00:00
Mark Banner
07bb5e198f Bug 1074681 - When Loop "rooms" are enabled, hide the old call url generation UI. r=mikedeboer 2014-11-17 14:18:46 +00:00
Martyn Haigh
963757124b Bug 1097193 - Increase close button hit area in tabs panel (r=lucasr) 2014-11-17 14:03:49 +00:00
Kai Engert
63ef926a61 Bug 1088969 - Upgrade Mozilla 36 to use NSS 3.18 - NSS_3_18_BETA2 2014-11-17 14:57:45 +01:00
neil@parkwaycc.co.uk
7925fb0e28 Bug 579208 - Sizes of some XUL elements changes when lightweight themes are applied. r=dao
--HG--
extra : rebase_source : f2276fef3f0e0be1cc245a3d889ee396f3d45515
2014-11-17 14:27:23 +01:00
Mike de Boer
9d020c6017 Bug 1074666 - Part 3 Play a sound when a participant joined a room. Updated by pkerr,r=Standard8 2014-11-17 13:28:59 +00:00
Mike de Boer
ad49c745df Bug 1074666 - Part 2 Change the toolbar icon when participants join and leave. Updated by pkerr,r=Standard8 2014-11-17 13:28:58 +00:00
Carsten "Tomcat" Book
fd89c946a4 Merge mozilla-central to fx-team 2014-11-17 14:17:35 +01:00
Carsten "Tomcat" Book
bf551bc75c Merge mozilla-central to mozilla-inbound 2014-11-17 14:15:50 +01:00
Carsten "Tomcat" Book
d8d3a20495 merge fx-team to mozilla-central a=merge 2014-11-17 14:10:08 +01:00
Carsten "Tomcat" Book
5a3c5be60a merge mozilla-inbound to mozilla-central a=merge
--HG--
extra : amend_source : bc1a2d4e4f8ba9197da4e0e72ab01990885ce2b4
2014-11-17 14:06:00 +01:00
Gabor Krizsanits
e63652f217 Bug 1094930 - part3: test. r=bz 2014-11-17 14:04:28 +01:00
Gabor Krizsanits
84831ee6e1 Bug 1094930 - part2: init LifecycleCallbacks in the caller compartment. r=bz 2014-11-17 14:04:28 +01:00
Gabor Krizsanits
4e773fc696 Bug 1094930 - Allow registerElement to take protos from other scopes. r=bz 2014-11-17 14:04:27 +01:00
Ebrahim Byagowi
76676fd0be Bug 1081514 - Update the default font used on Windows for sans-serif in Arabic. r=jfkthame 2014-11-17 12:30:48 +00:00
B2G Bumper Bot
04f5663d05 Bumping manifests a=b2g-bump 2014-11-17 00:42:19 -08:00
B2G Bumper Bot
113e9127b2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8c025d0c8038
Author: pacorampas <b.frv@tid.es>
Desc: Merge pull request #26137 from pacorampas/1094781-v2

Bug 1094781 - [Dialer][Callscreen] The call on hold shouldn't be red (follow up 977588) r=german

========

https://hg.mozilla.org/integration/gaia-central/rev/5befcd49fe2a
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1094781 - [Dialer][Callscreen] The call on hold shouldn't be red (follow up 977588)
2014-11-17 00:35:55 -08:00
B2G Bumper Bot
58abc0d3ea Bumping manifests a=b2g-bump 2014-11-16 23:57:18 -08:00
B2G Bumper Bot
c8e680b708 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1086167 - [Settings] remove redundant Apps.mgmt calls based on new

========

https://hg.mozilla.org/integration/gaia-central/rev/3a4fe552d9c1
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1086167 - [Settings] remove redundant Apps.mgmt calls based on new
designed AppsCache
2014-11-16 23:50:54 -08:00
B2G Bumper Bot
6c23f287a1 Bumping manifests a=b2g-bump 2014-11-16 23:27:20 -08:00
B2G Bumper Bot
aa24f56adc Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5b11ae798175
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #25919 from huchengtw-moz/bug-1093529-invoke-settings-at-home

Bug 1093529 - [Stingray] link home app to settings app, r=dwi2

========

https://hg.mozilla.org/integration/gaia-central/rev/25892e76a410
Author: John Hu <johu@mozilla.com>
Desc: Bug 1093529 - [Stingray] link home app to settings app

========

https://hg.mozilla.org/integration/gaia-central/rev/d80e27509554
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #25930 from RudyLu/keyboard/Bug1095355-KeyView

Bug 1095355 - Create KeyView component, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/28a76b455c80
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 1095355 - Create KeyView component.
 - Add registerView method for Views.
 - Remove target -> DOM element mapping
 - Clean up the code for set target <-> view mapping
2014-11-16 23:20:56 -08:00
B2G Bumper Bot
6c63604a6d Bumping manifests a=b2g-bump 2014-11-16 23:12:20 -08:00
B2G Bumper Bot
f48f895028 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/46a604d70635
Author: RickyChien <RickyChien@users.noreply.github.com>
Desc: Merge pull request #26173 from mozilla-b2g/revert-26101-bug-1022728

Revert "Bug 1022728 - Prevent building gaia when running ./build.sh gecko

========

https://hg.mozilla.org/integration/gaia-central/rev/8b17ea7f537c
Author: RickyChien <RickyChien@users.noreply.github.com>
Desc: Revert "Bug 1022728 - Prevent building gaia when running ./build.sh gecko"

========

https://hg.mozilla.org/integration/gaia-central/rev/499d16a64799
Author: Tzu-Lin Huang <dwi019@gmail.com>
Desc: Merge pull request #26171 from dwi2/bug1014405

Bug 1014405 - [Stingray] Keyboard event handling in Gaia, r=johnhu

========

https://hg.mozilla.org/integration/gaia-central/rev/eab031938fa7
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 1014405 - [Stingray] Keyboard event handling in Gaia
2014-11-16 23:05:56 -08:00
Francesco Lodolo (:flod)
601cc07878 Bug 1100385 - Improve accesskeys in Privacy panel of Preferences. r=mak 2014-11-17 07:18:00 +01:00
B2G Bumper Bot
a1b5e589e0 Bumping manifests a=b2g-bump 2014-11-16 22:07:19 -08:00