Wes Kocher
00a0a043dc
Merge inbound to m-c a=merge
2014-07-25 15:59:01 -07:00
Tim Taubert
d5ed3d4768
Bug 1037415 - remove existing webrtc indicator in the browser toolbar r=florian
2014-07-23 17:34:31 +02:00
Trevor Saunders
0cdb19dabd
bug 1036694 - merge nsIMarkupDocumentViewer into nsIContentViewer r=smaug
2014-07-09 17:27:49 -04:00
Neil Deakin
01aeed75b7
Bug 1026310, use proper check for popup visibility, r=MattN
2014-07-22 11:17:26 -04:00
Florian Quèze
b1cd1a20c6
Bug 1037430 - implement webrtc global indicator in the Mac menubar, r=dolske.
2014-07-19 02:49:19 +02:00
Florian Quèze
3dcd33f32f
Bug 1037408 - implement the global indicator window, initial patch by Gijs, r=dolske.
2014-07-19 02:49:19 +02:00
Florian Quèze
8e59cae92a
Bug 1037408 - webrtcUI's activeStreams getter should be able to return lists for a specific device type, r=dolske.
2014-07-19 02:49:19 +02:00
Florian Quèze
daa31c1f41
Bug 1037408 - add booleans to webrtcUI indicating which sharing indicators should be shown, r=dolske.
2014-07-19 02:49:18 +02:00
Neil Deakin
c42d5e542c
Bug 1026310, disable this test again
2014-07-24 08:04:39 -04:00
Wes Kocher
1ad8f33b85
Backed out 3 changesets (bug 1037408) for dt orange on a CLOSED TREE
...
Backed out changeset 8833bb7e90de (bug 1037408)
Backed out changeset c9cfdc0bbfbc (bug 1037408)
Backed out changeset f875dc5e0df7 (bug 1037408)
2014-07-18 21:04:00 -07:00
Wes Kocher
0714191b1d
Backed out changeset 1db5409ea062 (bug 1037430) for dt orange on a CLOSED TREE
2014-07-18 21:03:15 -07:00
Florian Quèze
0fff7f0166
Bug 1037430 - implement webrtc global indicator in the Mac menubar, r=dolske.
2014-07-19 02:49:19 +02:00
Florian Quèze
a0ad6075ba
Bug 1037408 - implement the global indicator window, initial patch by Gijs, r=dolske.
2014-07-19 02:49:19 +02:00
Florian Quèze
db66c87c16
Bug 1037408 - webrtcUI's activeStreams getter should be able to return lists for a specific device type, r=dolske.
2014-07-19 02:49:19 +02:00
Florian Quèze
66a9db8c30
Bug 1037408 - add booleans to webrtcUI indicating which sharing indicators should be shown, r=dolske.
2014-07-19 02:49:18 +02:00
Ryan VanderMeulen
c300f93ef4
Merge fx-team to m-c. a=merge
2014-07-18 15:21:24 -04:00
Shane Caraveo
bf1b792930
Bug 1032432 remove builtin manifest support, r=felipe
2014-07-18 10:27:52 -07:00
Florian Quèze
a99226a382
Bug 1037405 - implement the screen sharing urlbar indicator, r=Gijs.
...
--HG--
extra : rebase_source : ae477beaae5553db887589bd5ce314fb2a63c2ef
2014-07-18 12:14:29 +02:00
Florian Quèze
740dd926dd
Bug 1037405 - adapt the label of the main action in the screensharing doorhanger prompt, r=Gijs.
...
--HG--
extra : rebase_source : 4cf00c04c99814c2bb040ff65d3d37793ac59976
2014-07-18 12:14:29 +02:00
Florian Quèze
7960aa9c7b
Bug 1037405 - implement the doorhanger prompting the user to share a screen/window, r=Gijs.
...
--HG--
extra : rebase_source : 394a06b14a7561ea1f43d3c7a8ce52ad4a4fe447
2014-07-07 09:08:00 +02:00
Blake Winton
e95052c3f8
Bug 1038248 - Add UITelemetry to count the number and type of searches. r=mconley
2014-07-17 11:37:22 -04:00
Neil Deakin
f82e039e48
Bug 1026310 and 1032137, re-enable browser_UITour_panel_close_annotation.js to see if the intermittent problem goes away now that bug 1026310 is fixed
2014-07-14 13:39:04 -04:00
Neil Deakin
d9a6133a9f
Bug 1026310, set the open state only once the opening transition is finished, rename the internal popup states to be clearer, fix UITour.jsm to check the showing state, r=MattN,neil
2014-07-14 13:39:04 -04:00
Ryan VanderMeulen
27a0fdf6de
Merge inbound to m-c. a=merge
2014-07-11 16:34:56 -04:00
Shane Caraveo
6ce6beedad
Bug 926417 add microdata support for share/marks, r=markh, r=felipe
2014-07-11 08:50:34 -07:00
Marco Castelluccio
e17aacfe37
Bug 906114 - Wait local installation before sending messages to content. r=myk
2014-07-11 13:25:46 +02:00
Gijs Kruitbosch
1207074468
Bug 577892 - allow icons to change when href attribute is set directly, with automated test, r=dolske,bz
...
--HG--
extra : rebase_source : 8b74cb3e4c60df4b84c207f2ae1bc371e238d19d
2014-07-03 22:40:52 +01:00
Adam Roach [:abr]
a130efd232
Bug 1015486 Bypass the video and audio permission prompts for Loop, as Loop will provide its own mechanisms. Patch by abr, tests by Standard8. r=jesup,r=florian
2014-07-10 21:14:57 +01:00
Shane Caraveo
e183db5ece
Bug 1036646 fix double command handling for socialmarks button, r=Gijs
2014-07-09 16:40:26 -07:00
Carsten "Tomcat" Book
52abeab55b
Merge mozilla-central to mozilla-inbound
2014-07-09 16:13:17 +02:00
Ryan VanderMeulen
3f179b2e84
Bug 1026310 - Really skip browser_UITour_panel_close_annotation.js on Windows.
...
DONTBUILD
--HG--
extra : rebase_source : 60ef0efe8d2ec531a12cbb4de56d001bd820c235
2014-07-09 09:57:14 -04:00
Shane Caraveo
7e8122ec26
Bug 1029942 allow activation from about: chrome urls, r=felipe
2014-07-08 16:48:12 -07:00
Wes Kocher
2d8c232a05
Backed out changeset ca2fd67a4cf7 (bug 1029942) for bc1 orange
2014-07-08 15:11:31 -07:00
Shane Caraveo
670e1f258e
Bug 1029942 allow activation from about: chrome urls, r=felipe
2014-07-08 13:50:13 -07:00
Marco Castelluccio
c56414d138
Bug 1029674 - Fix installation of apps with custom origin. r=myk,keeler
...
--HG--
rename : toolkit/webapps/tests/test_packaged_launch.xul => toolkit/webapps/tests/test_custom_origin.xul
2014-07-04 15:23:16 +02:00
Ed Morley
33f538f0d7
Bug 1032137 - Disable browser_UITour_panel_close_annotation.js on Windows for intermittent test failures
2014-07-03 13:57:15 +01:00
Mark Banner
44170b73b2
Bug 1027014 Loop panel is cut off on first display - always fire the mechanism to resive the panel if the ready state is complete. r=mixedpuppy
2014-06-30 21:10:19 +01:00
Shane Caraveo
2a4fa4eb9a
Bug 1011598 fix marks and status buttons for toolbar overflow menu, r=Gijs
2014-06-27 08:58:13 -07:00
Carsten "Tomcat" Book
47cf842c48
Merge mozilla-central to fx-team
2014-06-25 15:48:21 +02:00
Carsten "Tomcat" Book
9bf09b73ad
merge fx-team to mozilla-central a=merge
2014-06-25 15:34:21 +02:00
Jim Blandy
4d6a633bba
Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
...
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):
- Never set the buffer's mode.
Years ago, Emacs did not have a good JavaScript mode, so it made sense
to use Java or C++ mode in .js files. However, Emacs has had js-mode for
years now; it's perfectly serviceable, and is available and enabled by
default in all major Emacs packagings.
Selecting a mode in the -*- file variable line -*- is almost always the
wrong thing to do anyway. It overrides Emacs's default choice, which is
(now) reasonable; and even worse, it overrides settings the user might
have made in their '.emacs' file for that file extension. It's only
useful when there's something specific about that particular file that
makes a particular mode appropriate.
- Correctly propagate settings that establish the correct indentation
level for this file: c-basic-offset and js2-basic-offset should be
js-indent-level. Whatever value they're given should be preserved;
different parts of our tree use different indentation styles.
- We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
Remove tab-width: settings, at least in files that don't contain tab
characters.
- Remove js2-mode settings that belong in the user's .emacs file, like
js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
David Rajchenbach-Teller
8b13f20daa
Bug 1019670 - Fix error in AboutHome.sendAboutHomeData: "TypeError: target.messageManager is undefined". r=felipc
2014-06-03 08:16:00 -04:00
Drew Willcoxon
baefc93614
Bug 1029735 - ContentSearch sometimes leaks event listeners and their closures (follow-up). r=ttaubert
2014-06-24 13:38:13 -07:00
Drew Willcoxon
a10fd2ac69
Bug 1029735 - ContentSearch sometimes leaks event listeners and their closures. r=ttaubert
2014-06-24 12:49:52 -07:00
Bill McCloskey
37e4d10f6b
Bug 1005696 - Make sure test blocklist.xml isn't overwritten before use (r=Unfocused)
2014-06-20 17:46:02 -07:00
Wes Kocher
04a521faea
merge m-c to inbound on a CLOSED TREE
2014-06-20 14:02:54 -07:00
Drew Willcoxon
26b8c91615
Bug 1027303 - Certain image URIs in search plugins break ContentSearch. r=felipe
2014-06-19 14:34:12 -07:00
Mike Conley
30b7a68d16
Bug 989501 - Part 3: If a newly created browser.xul window has the CHROME_REMOTE_WINDOW chromeflag set, make sure the initial browser has remote="true" set on it. r=felipe.
2014-06-20 14:08:05 -04:00
Birunthan Mohanathas
ec8396a564
Bug 1016240 - Exterminate CR+LF line endings. r=briansmith,cpearce,ehsan,gavin
2014-06-18 17:56:02 -07:00
Wes Kocher
0030eb2f8f
merge fx-team to m-c a=merge
2014-06-17 18:48:51 -07:00