Commit Graph

8535 Commits

Author SHA1 Message Date
Wes Kocher
ac9763a813 Bug 1017273 - Fix merge conflicts to help fix the CLOSED TREE 2014-07-16 21:32:46 -07:00
Wes Kocher
a6eb8171b1 NO BUG - Fix mistake introduced in a merge to fix this CLOSED TREE 2014-07-16 21:15:04 -07:00
Shane Caraveo
90b5356528 Bug 1036581 add telemetry probes to social buttons and sidebar, r=dolske 2014-07-16 19:15:02 -07:00
Wes Kocher
6dc0a1cdb8 Merge m-c to fx-team 2014-07-16 17:46:33 -07:00
Dão Gottwald
e38c455134 Bug 1037017 - Remove cui-areatype from removable=false widgets. r=gijs 2014-07-16 22:04:06 +02:00
Trishul Goel
7a685663c3 Bug 1038604 - Rename disableMCB to allowMixedContent. r=dao 2014-07-16 22:03:15 +02:00
Mark Banner
793348cd7b Follow up to bug 1017273 - Move the loop-call-button to the correct place in the toolbar to match its default position. rs=gijs 2014-07-16 15:15:08 +01:00
Mark Banner
2c1e0f5872 Bug 1017273 Change Loop from compile-time enabled to runtime-enabled with a pref. r=dolske,r=jesup,r=glandium,r=gijs 2014-07-16 15:15:07 +01:00
Alexander Seleznev
a198316ce9 Bug 1038607 - Fix text color in search field on about:newtab page. r=dao 2014-07-15 03:39:00 +02:00
Tom Schuster
4e27ccd62e Bug 673569 - Let each frame script have its own scope (r=smaug) 2014-06-13 19:56:38 +02:00
Mark Hammond
f49b194318 Bug 1013064 (part 5) - stop disabling the password engine when MP enabled. r=ttaubert
From 07aa9cc1fcd5479976effe29f6adf5ad5ba7a8f8 Mon Sep 17 00:00:00 2001
2014-06-12 18:19:49 +10:00
Mark Hammond
133f66860f Bug 1013064 (part 1) - prompt for master-password unlock when interacting with about:accounts. r=ttaubert
From 18f9d132020afee6004e63c9006245e4d3b04e18 Mon Sep 17 00:00:00 2001
---
 browser/base/content/aboutaccounts/aboutaccounts.js | 9 +++++++++
 1 file changed, 9 insertions(+)
2014-06-11 17:34:24 +10:00
Carsten "Tomcat" Book
4457b01a36 merge fx-team to mozilla-central a=merge 2014-07-15 16:08:30 +02:00
Allison Naaktgeboren
4eb98e74f5 Bug 693555 - Update inline spellchecker underlining for multiprocess(e10s).r=ehsan, mrbkap 2014-07-01 15:24:27 -07:00
Wes Kocher
0c43bada3a Backed out changeset 8673477f5fc2 (bug 862563) for Windows mochitest-5 failures 2014-07-11 17:00:08 -07:00
Georg Fritzsche
a517f367e0 Bug 862563 - Remove implicit acceptance for data reporting notification and notify on first run; r=gps
The data reporting notification was over-complicated. It wasn't
displayed for +24hr after first run and it had a weird, non-required
policy around what constituted acceptance of the policy.

The notification is now shown shortly after first startup.

The logic around "notification accepted" has been greatly simplified by
rolling it into "notification shown." Where we once were checking
whether the notification has been "accepted," we now check whether it
has been displayed. The overly complicated logic around the implicit
acceptance of the policy has also been removed.

The end result is the code for managing the state of the notification is
greatly simplified.

--HG--
extra : rebase_source : 808efdf1edd103552f6aa10b5c4309b64e514773
extra : amend_source : e4252e6a850a348d1b5aca733121dd07cbc6a70a
extra : histedit_source : 10ec20a07677674a8c9a705a3ffb4dc46a22b890%2Ca9442934d5964f16e9ad1101b786b4d094ac228d
2014-07-09 14:32:29 -07:00
Shane Caraveo
e6c852f5dd Bug 926417 add microdata support for share/marks, r=markh, r=felipe 2014-07-11 08:50:34 -07:00
Dão Gottwald
f72e42203b Bug 1034845 - Re-enable pasting data URIs to the location bar. r=gijs
--HG--
extra : rebase_source : e03b3d39e47dd1c917e0e343621d8c51f500685e
2014-07-11 00:39:55 +02:00
Gijs Kruitbosch
ba4ae2ee67 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
Ryan VanderMeulen
6199750f94 Merge inbound to m-c on a CLOSED TREE. a=merge 2014-07-10 18:22:38 -04:00
Adam Roach [:abr]
db9c984ac9 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
Gijs Kruitbosch
8e02226b89 Bug 1014313 - part 3: add labels specifically for this context menu, r=dao 2014-07-09 22:59:43 +01:00
Carsten "Tomcat" Book
5442e17dfc merge fx-team to mozilla-central a=merge 2014-07-10 14:54:35 +02:00
Ed Lee
bd1da84e4a Bug 1036280 - Newly added links are type=undefined instead of history [r=adw]
Include history type and make link creation the same by removing bgColor/imageURI.
2014-07-09 21:16:48 -07:00
Gijs Kruitbosch
48df14e59a Bug 1014313 - part 2: add undo close tab item to alltabs-button menu, r=dao 2014-07-03 00:17:15 +01:00
Carsten "Tomcat" Book
5789eb261c Merge mozilla-central to fx-team 2014-07-10 15:15:52 +02:00
Drew Willcoxon
90052e7eb6 Bug 1005601 - "gContextMenu is null" thrown for first textarea context menu in a window. r=Gijs 2014-07-10 03:31:04 -07:00
Carsten "Tomcat" Book
ea15fbd89c Merge mozilla-central to fx-team 2014-07-09 16:15:17 +02:00
Carsten "Tomcat" Book
8d6946d993 merge fx-team to mozilla-central a=merge
--HG--
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/css/ot.min.css => browser/components/loop/content/libs/sdk-content/css/ot.css
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-publisher.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png => browser/components/loop/content/libs/sdk-content/images/rtc/buttons.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif => browser/components/loop/content/libs/sdk-content/images/rtc/loader.gif
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js => browser/components/loop/content/libs/sdk-content/js/dynamic_config.min.js
2014-07-09 16:05:08 +02:00
Shane Caraveo
aedc3b6357 Bug 1029942 allow activation from about: chrome urls, r=felipe 2014-07-08 16:48:12 -07:00
Gijs Kruitbosch
b8ef5bf613 Bug 1014313 - part 1: add tabs options to tabstrip context menu, r=dao 2014-07-02 23:23:48 +01:00
Wes Kocher
267a796ba5 Backed out changeset ca2fd67a4cf7 (bug 1029942) for bc1 orange 2014-07-08 15:11:31 -07:00
Shane Caraveo
99408869c7 Bug 1029942 allow activation from about: chrome urls, r=felipe 2014-07-08 13:50:13 -07:00
Gijs Kruitbosch
8c6a9eaae3 Bug 987230 - use consumeanchor attribute to fix button click, r=enn,mconley
--HG--
extra : rebase_source : 8e52a377eeb708e258f0190fcbc5902c5477c2b8
2014-07-01 01:09:43 +01:00
Blake Kaplan
7b09b38e37 Bug 1001957 - Don't use a CPOW for reload. r=felipe/mccr8/smaug
Original patch from billm.
2014-07-08 18:27:59 -07:00
Wes Kocher
22e853cb38 Backed out changeset 76a96d6f0330 (bug 1001957) for mochitest-2 bustage on a CLOSED TREE 2014-07-08 17:55:35 -07:00
Blake Kaplan
4767b88b60 Bug 1001957 - Don't use a CPOW for reload. r=felipe/mccr8/smaug
Original patch from billm.
2014-07-08 16:19:10 -07:00
Mark Banner
50bafcdcd0 Fix packaged unit test bustage from bug 1032469. rs=bustage fix for CLOSED TREE 2014-07-08 21:11:06 +01:00
Mark Banner
2a1f3ed8fe Bug 1032469 Update Loop to OpenTok library v2.2.6. rs=gijs for test change,r=abr
--HG--
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/css/ot.min.css => browser/components/loop/content/libs/sdk-content/css/ot.css
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-publisher.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png => browser/components/loop/content/libs/sdk-content/images/rtc/buttons.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif => browser/components/loop/content/libs/sdk-content/images/rtc/loader.gif
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js => browser/components/loop/content/libs/sdk-content/js/dynamic_config.min.js
2014-07-08 19:40:59 +01:00
Ryan VanderMeulen
e68b639905 Merge m-c to inbound. a=merge 2014-07-09 16:16:12 -04:00
Wes Kocher
ae6d492e77 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
21cd735f24 Backed out changeset 1db5409ea062 (bug 1037430) for dt orange on a CLOSED TREE 2014-07-18 21:03:15 -07:00
Wes Kocher
2e4b07440d Merge m-c to inbound 2014-07-18 18:42:49 -07:00
Florian Quèze
db151de1f7 Bug 1037430 - implement webrtc global indicator in the Mac menubar, r=dolske. 2014-07-19 02:49:19 +02:00
Florian Quèze
124cb2296c Bug 1037408 - implement the global indicator window, initial patch by Gijs, r=dolske. 2014-07-19 02:49:19 +02:00
Florian Quèze
f83a0b2844 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
Brian R. Bondy
4c19155981 Bug 1009816 - Firefox desktop: openh264 updates: check, download, install. r=rstrong, gfritzsche 2014-07-17 21:46:10 -04:00
Ryan VanderMeulen
22af9b2a16 Merge m-c to inbound. a=merge 2014-07-18 15:47:48 -04:00
Birunthan Mohanathas
124259226c Bug 1024668 - Wait for initial payload event in healthreport_testRemoteCommands.html. r=wchen 2014-07-14 12:35:30 -07:00
Neil Deakin
7f3b5b5800 Bug 1027057, use correct origin for arrowpanel animations in rtl, r=dao 2014-07-14 13:39:04 -04:00
Birunthan Mohanathas
3c00cc1470 Bug 994708 - Part 2: Record submission event for plugin crashes. r=gps 2014-07-09 08:14:42 -07:00
Marco Bonardo
dfbb874586 Bug 995092 - Ensure we can enable Unified Autocomplete in Nightly. r=ttaubert 2014-07-18 09:42:39 +02:00
Ed Lee
b7c040a29c Backed out changeset 9d1b8acf821d for tart crashes (bug 1026561) 2014-07-17 23:49:05 -07:00
Ed Lee
2ef9375b26 Bug 1026561 - The New Tab Page should be smarter about showing more tiles when on large screens [r=adw]
Bump up default columns to fit most Firefox users including 2560px wide resolutions.
2014-07-17 22:32:54 -07:00
David Keeler
e5399ce31b bug 1034270 - test adding a certificate exception via about:certerror r=felipe 2014-07-07 15:32:34 -07:00
David Keeler
e99adf1589 bug 1034270 - expose the channel that failed to load to onAboutCertError in browser.js r=felipe 2014-07-07 15:33:07 -07:00
Marco Bonardo
0383cc2ef4 Bug 1023292 - split up browser_popupNotification.js r=adw,MattN
--HG--
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_2.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_3.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_4.js
rename : browser/base/content/test/general/head.js => browser/base/content/test/popupNotifications/head.js
2014-07-06 10:14:48 +02:00
Dão Gottwald
9ae37d3736 Bug 1034077 - Location bar shouldn't strip whitespace when pasting. r=Gijs 2014-07-04 17:16:55 +02:00
Tim Taubert
59aa45bbe8 Bug 1032243 - about:newtab should use native Promise implementation r=adw 2014-07-02 16:38:20 -07:00
Ryan VanderMeulen
4f1ab194d5 Merge m-c to fx-team. a=merge 2014-07-03 17:07:17 -04:00
Ryan VanderMeulen
19918db2e4 Merge inbound to m-c. a=merge 2014-07-03 17:03:48 -04:00
Shane Caraveo
5e61a2db19 Bug 1032932 fix talos regression with share button, r=Gijs 2014-07-03 12:11:28 -07:00
Marc Schmitzer
ec8cfcf01a Bug 1031942 - Quote URLs for new tab page thumbnails. r=adw
Without quoting, thumbnails for URLs containing e.g.
parenthesis are not shown.
2014-07-01 13:29:00 +02:00
Blair McBride
01e8b44f53 No bug - merge bustage fix on a CLOSED TREE. r=bustage 2014-07-03 15:33:27 +12:00
Wes Kocher
a2ce9d9420 Merge m-c to fx-team 2014-07-02 19:10:42 -07:00
Wes Kocher
4765c9713e Merge fx-team to m-c a=merge 2014-07-02 17:24:00 -07:00
Gijs Kruitbosch
b39bea76c3 Bug 987586 - flex and wrap customization footer, r=jaws, ui-r=phlsa
--HG--
extra : rebase_source : 7bc03a130bdadaeb61854d3e199d285e37e56b80
2014-07-02 10:30:46 +01:00
Jim Mathies
6c4d9ad1b1 Bug 989875 - Forward clicks to chrome js for ux elements in about pages that load remotely. f=felipe, r=mbrubeck 2014-07-02 14:27:35 -05:00
Gijs Kruitbosch
8aeea626ec Bug 1018154 - part 3: add test for URL bar javascript URI pastes, r=Unfocused 2014-07-01 15:04:11 +01:00
Gijs Kruitbosch
256ff301eb Bug 1018154 - part 2: adjust tests now that mayInheritPrincipal has gone the way of the dodo, r=Unfocused
--HG--
rename : browser/base/content/test/general/browser_middleMouse_inherit.js => browser/base/content/test/general/browser_middleMouse_noJSPaste.js
2014-07-01 14:28:49 +01:00
Gijs Kruitbosch
b1562a9e5a Bug 1018154 - part 1: replace blocking of security principal inheriting with onpaste handler, r=dao 2014-07-01 15:27:08 +01:00
Wes Kocher
7ba519593b Backed out changeset d87da7f7a3a9 (bug 693555) for android and b2g build bustage 2014-07-01 15:50:08 -07:00
Allison Naaktgeboren
7810bd8c89 Bug 693555 - Update inline spell checker underlining for multiprocess.r=ehsan,mrbkap 2014-07-01 15:24:27 -07:00
Ed Morley
1b2d38175b Backed out changeset 9879665a17bb (bug 989875) for leaks 2014-07-01 17:58:33 +01:00
Jim Mathies
69d25997f2 Bug 989875 - Forward clicks to chrome js for ux elements in about pages that load remotely. f=felipe, r=mbrubeck 2014-07-01 07:57:33 -05:00
Wes Kocher
36f8d33231 Merge fx-team to m-c a=merge 2014-06-30 18:22:10 -07:00
Mark Banner
46db7528a8 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
Tim Taubert
04921d9b47 Bug 953313 - Fix intermittent browser_tabopen_reflows.js failures r=gijs 2014-06-28 09:19:46 +02:00
Phil Ringnalda
c258b88e5e Merge m-c to m-i 2014-06-28 20:51:49 -07:00
Blake Kaplan
ca30773682 Bug 949617 - Make the login manager work in e10s. r=dolske/mconley/mfinkle/jimm 2014-06-28 11:09:45 -07:00
Shane Caraveo
8e0036ad08 Bug 1011598 fix marks and status buttons for toolbar overflow menu, r=Gijs 2014-06-27 08:58:13 -07:00
Shane Caraveo
1b98903561 Bug 1014254 fix null shareButton breaking various ui bits, r=gijs 2014-06-27 08:46:27 -07:00
Carsten "Tomcat" Book
2216cb670a Backed out changeset 8c1ee05fbbd6 (bug 949617) 2014-06-27 15:17:42 +02:00
Carsten "Tomcat" Book
1098f66f03 Merge mozilla-central to fx-team 2014-06-26 15:53:44 +02:00
Carsten "Tomcat" Book
9c954f17e2 merge fx-team to mozilla-central a=merge 2014-06-26 15:33:24 +02:00
Gregory Szorc
a90fdbb993 Bug 1029031 - Bustage followup to b77106f50779
Fixed bad patch change that was made before landing. Derp.

--HG--
extra : amend_source : 6d49ce3db4908a75f9c3ec2931ed97fb41e1f9ff
2014-06-25 23:21:23 -07:00
Gregory Szorc
aeee093c16 Bug 1029031 - Record default search provider in FHR; r=bsmedberg, MattN
--HG--
extra : rebase_source : 7e3c2688db567bac8760c405d9e9d7d41e8564d9
extra : amend_source : a5f4264ec947ae27e3036018034e0b17bf1e8590
2014-06-25 12:44:00 -07:00
Gregory Szorc
f593a4a7fb Bug 1029031 - Rewrite test to use tasks; r=MattN
An upcoming patch will add more code to
browser_urlbar_search_healthreport.js. We now have support for running
tasks in bc tests, so let's use it to make my life easier.

--HG--
extra : rebase_source : 2fbec7c264f7ebaa8b9abd49694ae56c4d74b7c7
extra : amend_source : 551ee4c0e87f42cd44c9b5395278b56dfbc89b90
2014-06-25 12:38:37 -07:00
Wes Kocher
97b6283a0e Merge m-c to fx-team a=merge 2014-06-25 18:44:50 -07:00
Tim Taubert
91f351662c Bug 993013 - Fix 'this._cps2 is undefined' errors in test runs r=adw 2014-06-25 16:30:17 +02:00
Mark Banner
bb36e9377a Bug 1030103 Loop button doesn't overflow when window width is reduced. r=mconley 2014-06-26 09:00:07 +01:00
Kestrel
d6e54f0575 Bug 378775 - Implement Opera's behavior for selecting text inside of a link and link drag and drop. r=Enn 2014-07-03 04:26:00 -04:00
Ed Morley
b4c148d239 Bug 941575 - Disable browser_fullscreen-window-open.js on Linux for intermittent failures 2014-07-03 14:05:56 +01:00
David Keeler
ecb65d95bf bug 1029797 - remove redundant "Security information for this page" section of Page Info window r=dao 2014-06-24 14:31:06 -07:00
David Keeler
3016adb4de bug 1029862 - hide unnecessary 'which is run by (unknown)' text in site identity popup for domain validated sites r=dao 2014-06-24 15:12:52 -07:00
David Keeler
9e5235aedf bug 1025332 - use nsIDocshell.failedChannel in certificate exception dialog instead of recent bad certs service r=jaws 2014-06-13 16:13:09 -07:00
Jim Blandy
b6b202b6bb 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
Brian R. Bondy
cc9a9c1577 Bug 1017156 - Fix tests for blank tab name now expected in TabOpen event. r=dao 2014-06-24 09:45:38 -04:00
Brian R. Bondy
5176e7726c Bug 1017156 - about:preferences briefly shows as the tab title when opening the in-content preferences. r=dao 2014-06-24 09:45:31 -04:00
Ryan VanderMeulen
d81f69eb72 Merge m-c to fx-team. a=merge 2014-06-23 10:59:41 -04:00