Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 08:35:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
371,629 Commits 615 Branches 98 Tags 5.9 GiB
54c330ca18
Commit Graph

3090 Commits

Author SHA1 Message Date
Mike de Boer
f4e68f74e8 Backed out 5 changesets (bug 326743) 
Backed out changeset 55fba7bccaaf (bug 326743)
Backed out changeset f4ab79254dfb (bug 326743)
Backed out changeset c8151192e447 (bug 326743)
Backed out changeset 57ceb72568c6 (bug 326743)
Backed out changeset 3081b9770c33 (bug 326743)
 2014-02-14 12:55:13 +01:00
Mike de Boer
c3ee148057 Bug 326743: use cmd-e to set find-in-page search term to currently selected text. r=Unfocused 2014-02-14 11:38:24 +01:00
Victor Porof
c5fceb1e8d Bug 956357 - "Preview Response" tab for HTML in the Network Monitor, r=rcampbell 2014-02-13 10:26:09 -05:00
Gabriel Luong
fa745af414 Bug 972102 - Minor correction to localization note documentation in sourceditor.properties. r=anton 2014-02-13 10:02:51 -05:00
Gabriel Luong
fb40f0df3d Bug 968424 - Change keyboard shortcut to move selected lines in source editor to Alt-Up/Down. r=anton 2014-02-13 10:02:51 -05:00
Francesco Lodolo (:flod)
c2512ed243 Bug 969804 - Use U+2026 for ellipsis in loadingSourcesText (debugger.properties). r=vporof 2014-02-08 21:03:05 -05:00
Francesco Lodolo (:flod)
808d70f42a Bug 966894 - Use U+2026 for ellipsis in netmonitor.properties. r=vporof 2014-02-08 21:02:46 -05:00
Vikneshwar
65e182bee3 Bug 957072 - Add Pretty Print to Scratchpad Menu. r=robcee 2014-02-08 21:02:11 -05:00
Manish Goregaokar
ecf57d3473 Bug 665319 - Add a checkbox to activate network.proxy.socks_remote_dns. r=ttaubert, ui-r=philipp 2014-02-08 21:01:27 -05:00
Bob Owen
2c77d04fcf Bug 624883 - Treat view-source as an unrecognised scheme if not top-level. r=bz 2014-01-23 16:02:33 +00:00
Hubert B Manilla
37f5a906ad Bug 927673 - Fix forPage has no sources showing when debugger is loading. r=fitzgen 2014-02-06 10:04:13 -05:00
Mike Connor
aeb7af6abd Bug 936198 - Updated Yahoo Logo for Metro, r=mbrubeck, a=gavin 
ch drop-DOwnLPATH=/usr/local/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/home/mconnor/scripts

--HG--
extra : rebase_source : c2396a87f2bdcdadf83ba738247f402e57d09a4f
 2014-01-31 16:27:07 -05:00
Victor Porof
78f7c38c83 Bug 967378 - Part 2: Use proper plural form for 'total time' in charts, r=flod, rcampbell 2014-02-04 16:57:09 +02:00
Carsten "Tomcat" Book
7e8455fba7 Merge mozilla-central to fx-team 2014-02-03 13:29:12 +01:00
Blair McBride
1fded49c64 Bug 966933 - [Australis] UITour: Add a UI tour link in the Help menu (Part 1: strings only), r=gijs, DONTBUILD because just some strings 2014-02-03 03:32:00 +00:00
Gavin Sharp
e392563540 Bug 965113: remove reference to "Firefox Accounts" in sync settings, r=markh 2014-02-02 20:27:26 -08:00
Phil Ringnalda
5a886020f9 Merge f-t to m-c 2014-02-02 18:58:48 -08:00
Gijs Kruitbosch
57cc9f1dc9 Bug 966694 - add brandshortname in Australis panel's quit item on Linux, too, r=Unfocused 2014-02-03 09:29:33 +00:00
Gijs Kruitbosch
6a3978451f Bug 966759 - fix up Australis-removed strings in browser.dtd, aboutPrivateBrowsing.dtd, openLocation files, r=ttaubert 2014-02-02 21:34:36 +00:00
Blair McBride
02acc57b4c Bug 966694 - [Australis] Quit button in AppMenu footer has no tooltip on Windows, r=gijs 2014-02-02 16:09:00 +00:00
Phil Ringnalda
c03e10af52 Merge m-c to f-t 2014-02-02 17:47:08 -08:00
Peiyong Lin
ba4f293c75 Bug 964015 - Add "Copy as data URI" for images in the Network Monitor. r=vp 2014-02-02 10:39:53 +02:00
Gijs Kruitbosch
1bcd3ceed8 Bug 940116 - fix tabview button tooltip for Australis, r=jaws 2014-02-01 23:27:54 +00:00
Girish Sharma
a69d3fa343 Bug 966789 - remove duplicate 'networkMenu.minute' string, r=vp 2014-02-03 00:41:07 +05:30
Girish Sharma
c281d27a59 Bug 966755 - Network statistics report wrong total download times, r=vp 2014-02-03 00:11:54 +05:30
Patrick Brosset
5770862b2c Bug 952277 - DOMNodes can be highlighted and selected from the debugger [Australis]; r=past, vporof 2014-02-01 10:24:44 +01:00
Alexey Novak
30c2c88375 Bug 956645 - The strings for the source editor's context menu aren't consistently capitalized like in other menu items; r=vporof 2014-02-01 09:05:33 +02:00
Victor Porof
99bb901b11 Bug 946601 - Add performance statistics/piecharts in the Network Monitor, r=rcampbell 2014-02-01 08:37:53 +02:00
Zachary Carter
89464ece02 Bug 965117 - Custom fonts on about:accounts and other visual/string tweaks. r=ttaubert 2014-01-31 16:50:55 -08:00
Gavin Sharp
09d59a5461 Bug 966511: Tweak Sync UI, r=ttaubert 
Changes:
- rename browser-fxaccounts.js "toggle" to onMenuPanelCommand
- rename openSignInPage->openSignInAgainPage and change it to point to about:accounts?signin=true
- introduce openAccountsPage and change the menu panel "signed in"'s UI to call it
- remove period at the end of "Firefox is now syncing" in the success doorhanger
- rename syncErrorPanel.title->syncErrorPanel.heading for consistency
- remove the "Preferences" button from the "you need to sign in again" doorhanger
- "manage"->"change" in the "What would you like to Sync" dialog
- change "Unlink Browser" to "Disconnect", in both the prefs button and confirmation dialog title
- adjust string in the "Disconnect" confirmation dialog
- change "Device"->"computer" in the relink verification dialog
- fix success panel heading styling (should be bold)

--HG--
extra : rebase_source : 358c93e1123e11200523b96d97ecd25421edaca4
 2014-01-31 17:20:21 -08:00
Gijs Kruitbosch
240fe4437c Bug 964887 - fix menu in Australis to say 'Edit this bookmark' for pages which have already been bookmarked, r=mak 2014-01-31 23:21:41 +00:00
Lalit Khattar
6f8202e976 Bug 944640 - Add a "Watch" button on the new inspect popup. r=vporof 2014-01-31 13:01:27 -05:00
Mike Conley
396bab2549 Bug 863780 - [Australis] Update about:privatebrowsing instructions after appmenu button removal. r=ehsan 
--HG--
extra : rebase_source : 42540c36ee098a8a18aa1bc70127c6120bd5ec7f
 2014-01-30 11:48:00 +00:00
Mike de Boer
458d39f54e [Australis] Bug 966167: update locale string IDs for the tip section. r=Unfocused 2014-01-31 11:30:55 +01:00
Gavin Sharp
e437d43475 Bug 966150: adjust wording/layout of new-sync preferences pane, r=ttaubert 
--HG--
extra : rebase_source : 2736e75660a0def3561070f8f5e4d50f9de1e5cf
 2014-01-30 20:37:43 -08:00
Tim Taubert
7b84b52ad4 Bug 965641 - [Australis] prompt user to sign-in again UI in the menu panel r=markh 2014-01-29 19:06:50 -08:00
Blair McBride
70b754dd3e Bug 958673 - [Australis] UITour: Style doorhanger menu for Australis Update Tour. r=MattN 2014-01-31 15:25:45 +13:00
Tim Taubert
9374d65e86 Backed out [Australis] changeset 7560f1dfaa97 (bug 965641) 2014-01-30 17:44:58 -08:00
Gijs Kruitbosch
ca03b6db29 Bug 940116 - part 3: update XUL buttons to have a dynamic tooltip that includes a shortcut (Australis), r=jaws 2014-01-31 00:16:05 +00:00
Tim Taubert
c10f8b0ad0 Bug 965641 - [Australis] prompt user to sign-in again UI in the menu panel r=markh 2014-01-29 19:06:50 -08:00
Gavin Sharp
70ae2d734e Bug 965703: bump string names after string change, r=markh 
--HG--
extra : rebase_source : 967d49f86494a94542b55563cd1440ac25980d29
 2014-01-30 10:22:14 -08:00
Francesco Lodolo (:flod)
e1f4ca7ad3 Bug 947353 - Use proper plural form for tabs.closeWarningMultipleTabs. r=dao 2014-01-30 13:07:15 -05:00
Gijs Kruitbosch
a734a4bcf0 Bug 928843 - start polishing the Australis history view by improving labels, r=jaws 
--HG--
extra : rebase_source : 9ad68a9fc7a576168c2e179167b885c77efda2df
 2014-01-30 16:53:14 +00:00
Patrick Brosset
742d8c2b57 Bug 964014 - Adds copy-image-data-uri option to images in the markup-view, r=harth 2014-01-30 17:33:53 +01:00
Mike de Boer
dc0df84ab1 [Australis] Bug 870593: update locale strings with brandShortName to be used for tips in Customize Mode. r=Gijs 2014-01-29 18:38:42 +01:00
Zachary Carter
c175b311b7 Bug 965605 - Update about:accounts intro page strings to match the latest draft r=markh 2014-01-29 17:11:05 -08:00
Gijs Kruitbosch
6e04d1bdec Bug 940116 - part 2, include more shortcuts inside Australis widgets, r=jaws 2014-01-29 20:48:28 +00:00
Gijs Kruitbosch
41163b8c89 Bug 940093 - offer UI option in Australis' customization mode to toggle titlebar, r=jaws 2014-01-29 17:19:23 +00:00
Gijs Kruitbosch
73e4f3ab88 Bug 940116 - part 1 of many, fix Australis' customize/quit/help labels, r=jaws 
--HG--
extra : rebase_source : c21f1850c72ed7f11defcd00711f48fd8e12f668
 2014-01-29 17:10:14 +00:00
Mark Hammond
b21501e4dc Bug 958927 - XUL dialogs for sync unlink and relink confirmation dialogs. r=gavin 
Conflicts:
	browser/base/content/aboutaccounts/aboutaccounts.js

--HG--
extra : rebase_source : 2c81fe29d3b85eb8174b988cbaff516e71c39358
 2014-01-28 20:43:01 -08:00
Mark Hammond
387900638e Bug 965016 - about:accounts should always say "Firefox Accounts", not "Nightly Accounts". r=ttaubert 
--HG--
extra : rebase_source : eebff0b5ba1b783fea1bb70fa0b848ac1c7e85e7
 2014-01-28 20:43:01 -08:00
Mike de Boer
1dfb968abe [Australis] Bug 870593: add locale strings to be used for tips in Customize Mode. r=Gijs 2014-01-29 15:43:29 +01:00
Tim Taubert
6efeed0150 Bug 964929 - [Australis] Implement doorhanger for sync errors r=gavin 2014-01-28 17:54:36 -08:00
Tim Taubert
53f8947200 Bug 963384 - Implement modal "Choose What To Sync" dialog r=markh 2014-01-28 18:57:19 -08:00
Mark Hammond
75afa10dbb Bug 957426 - Update Sync Options for Firefox Accounts. r=rnewman 2014-01-28 17:51:09 -08:00
Tim Taubert
c681a3762a Bug 957460 - [Australis] Add Firefox Accounts widget for customization panel r=gijs,markh 2014-01-10 19:32:11 +01:00
Girish Sharma
bd4472bb91 Bug 717369 - Autocomplete CSS properties and values in the Style Editor - Part 1 - No tests, r=anton, msucan, dcamp, robcee, harth 2014-01-28 20:38:41 +05:30
Manish Goregaokar
de91d314ec Bug 887951 - [Australis] Update panel menu button tooltip; r=dao DONTBUILD because it's just a tooltip string. 2014-01-27 18:23:07 -05:00
Mike Conley
192e81ecb4 Backed out changeset 39fd448f1994 for bad commit message. 2014-01-27 18:22:37 -05:00
Manish Goregaokar
4eba14888b Bug 887951 - Update panel menu button tooltip; r=dao DONTBUILD because it's just a tooltip string. 2014-01-27 18:19:03 -05:00
Gijs Kruitbosch
4ea270a95c Bug 889220 - update Australis customize mode header, r=mconley 
--HG--
extra : rebase_source : 27986d5a91ee65ca5f9fee3a0788d7bceb776d4b
 2014-01-27 18:44:18 +00:00
Heather Arthur
a4369b7897 Bug 960095 - Remove extra saveStyleSheet.title entities from browser/devtools/styleeditor.properties. r=dcamp 2014-01-27 08:11:48 -05:00
Malintha Fernando
c8698209af Bug 953124 - [Australis] Remove the "Open Location" dialog (openLocation.xul). r=dao 2014-01-25 17:12:20 +01:00
Tim Taubert
e62101c17c Bug 957436 - [Australis] Show doorhanger for first fxa-based sync r=markh 2014-01-25 16:19:07 +01:00
Ryan VanderMeulen
49f48d86f7 Bug 960051 - Update pdf.js to version 0.8.934. r=bdahl, r=Mossop, r=yury 2014-01-23 16:26:26 -05:00
Dão Gottwald
1ac2011e89 Bug 946395 - [Australis] Back out bug 881937 (panel menu keyboard access). r=Gijs ui-r=phlsa 2014-01-24 15:44:08 +01:00
Zachary Carter
0e64d92664 Bug 957425 - make landing pages for sync on about:accounts. r=markh 2014-01-25 00:33:39 +11:00
Mihai Sucan
55c4a8f4f0 Bug 939783 - console.trace() group traces even if part of trace is different; r=robcee 2014-01-23 23:37:32 +02:00
Wes Kocher
d9d629a72e Backed out changeset ad1af0ef7f50 (bug 960051) for potentially breaking xperf on an already CLOSED TREE 2014-01-23 18:54:09 -08:00
Ryan VanderMeulen
a5ae595f6e Bug 960051 - Update pdf.js to version 0.8.934. r=bdahl, r=Mossop, r=yury 2014-01-23 16:26:26 -05:00
Mike de Boer
a734f87591 [Australis] Bug 963085: add header to Subscribe menu. r=Gijs 2014-01-23 17:04:27 +01:00
Florian Quèze
9b04bd88cc Bug 885796 - WebRTC doesn't have UI to stop sharing camera nor microphone, r=dolske, ui-r=Boriss. 2014-01-23 11:50:03 +01:00
Mike de Boer
e2032da70f [Australis] Bug 916953: introduce separator in overflow panel buttons and bookmark star button gets different label when inside overflow panel. r=Gijs 2014-01-22 13:31:09 +01:00
Jared Wein
ee295ec343 Bug 932928 - [Australis] Show something when "More Tools" section is empty in customization mode. r=gijs 2014-01-21 19:04:24 +00:00
Gijs Kruitbosch
f01a73b2ab Bug 940669 - add button menu to toggle toolbars in Australis' customize mode, r=mconley 
--HG--
extra : rebase_source : 096d92876f4827251fd534f7ea76b8dbfd81a691
 2013-11-21 22:59:49 +01:00
Wes Kocher
78477885f2 Merge inbound to m-c 2014-01-14 15:24:45 -08:00
Heather Arthur
2157132f1d Bug 950921 - UI for flipping CSS source map pref. r=dcamp 2014-01-14 10:13:47 -05:00
Hubert B Manilla
38bba68a56 Bug 913665 - Fix wrong entity. r=fitzgen 2014-01-14 09:49:08 -05:00
Axel Hecht
88dd63e834 bug 958703, remove several locales from Firefox as they're stuck, r=jbeatty, DONTBUILD 2014-01-14 15:46:56 +01:00
Patrick Brosset
bf502a47dd Bug 916443 - part 1 - Toolbox level remote highlighter [Australis], r=paul 2014-01-09 12:36:01 +01:00
Victor Porof
cfef4188b5 Bug 868045 - At some threshold, we should convert MS to Seconds in the Waterfall, r=rcampbell 2014-01-08 16:47:59 +02:00
James Kitchener
b15237ca12 Bug 952905 - Change access key to avoid clash with menu bar. r=dao 2014-01-07 10:00:48 -05:00
Victor Porof
e798ebf10c Bug 951795 - Use WidgetMethod's empty text attribute instead of a deck in the tracer, r=fitzgen 2014-01-07 11:57:00 +02:00
Ricardo Palomares
548263d14d Bug 918017 - Add debugger accesskey entities and rename those that were named after ".key" but were accesskeys. r=fitzgen 2014-01-06 09:58:05 -05:00
Neil Rashbrook
fbaa743e6a Bug 940907 Re-introduce the Character Encoding menu to the View Source window r=Unfocused 
--HG--
rename : browser/locales/en-US/chrome/browser/charsetMenu.dtd => toolkit/locales/en-US/chrome/global/charsetMenu.dtd
rename : browser/locales/en-US/chrome/browser/charsetMenu.properties => toolkit/locales/en-US/chrome/global/charsetMenu.properties
rename : browser/modules/CharsetMenu.jsm => toolkit/modules/CharsetMenu.jsm
 2014-01-06 08:44:19 +00:00
Henri Sivonen
a350b990ee Bug 952736 - Fix spelling of "Ukrainian". r=dao. 2014-01-02 16:05:24 +02:00
Henri Sivonen
93d2e07020 Bug 213517 part 2 - Remove the x-user-def language group. r=jfkthame. 2014-01-02 09:18:20 +02:00
Wes Kocher
76819e44d8 Merge m-c to inbound 2013-12-24 15:25:23 -08:00
Emma Sajic
40df1f40fd Bug 387849 - [Australis] Remove the "Open Location..." menu item as it's no longer needed. The Location bar is now not removable so it will always be present. Hence no need for a menu item that does the same thing as the bar. r=dao 2013-12-23 11:27:16 +01:00
Wes Kocher
dd72dd2a82 Merge fx-team to m-c 2013-12-20 18:28:28 -08:00
Tim Taubert
d041e15611 merge m-c to elm 2013-12-20 15:05:28 +01:00
Wes Kocher
56d9fc8c65 Merge fx-team to m-c 2013-12-19 19:09:04 -08:00
Tim Taubert
db5adb5385 merge m-c to elm 2013-12-19 15:52:32 +01:00
Nick Fitzgerald
d1c69daf69 Bug 929349 - Integrate a tracing debugger into our existing debugger; r=vporof,past 2013-12-18 14:17:27 -08:00
Tim Taubert
1216e66e74 Bug 951857 - Bring back UI entry points and the setup dialog for old sync r=markh 
From 046c19dae155a175cf6fa5e480f1fa1882f7d51f Mon Sep 17 00:00:00 2001
 2013-12-18 23:10:11 +01:00
Tim Taubert
c53a7066fe merge m-c to elm 2013-12-18 17:54:23 +01:00
Michael Ratcliffe
8af158adc6 Bug 864098 - Add "Disable Cache" to options panel r=jwalker 
--HG--
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.html => browser/devtools/framework/test/browser_toolbox_options_disable_js.html
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.js => browser/devtools/framework/test/browser_toolbox_options_disable_js.js
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs_iframe.html => browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html
 2013-12-18 09:34:49 +00:00
Wes Kocher
8c8f5e1dcb Merge m-c to fx-team 2013-12-17 21:21:30 -08:00
Wes Kocher
29915a0f83 merge inbound to m-c 2013-12-17 21:00:02 -08:00
Tetsuharu OHZEKI
f2775b3f8b Bug 881436 - [Australis] Add History Sidebar toggle item to History widget panel. r=jaws DONTBUILD 2013-12-17 22:12:13 -05:00
Jared Wein
469f5ac340 Backed out changeset 8d77e66558eb (bug 881436) for not including [Australis] in the commit message. 2013-12-17 22:20:26 -05:00
Tetsuharu OHZEKI
eadbeb4c79 Bug 881436 - Add History Sidebar toggle item to History widget panel. r=jaws 
--HG--
extra : rebase_source : a6b7b7e2cf689c35b2a18e705cc232efa86eeac4
 2013-12-17 22:12:13 -05:00
Nick Alexander
50afb4c829 Merge m-c to elm 2013-12-17 13:31:03 -08:00
Justin Dolske
a5467b23c8 Bug 951364 - [Australis] button context menu should offer to "move", not "add". r=jaws 2013-12-17 13:21:37 -08:00
Shane Caraveo
cb057ada9c bug 935640 part 1 Australis, update social sidebar with new ux, r=markh 2013-12-16 21:37:30 -08:00
Carsten "Tomcat" Book
b966ec963c Backed out changeset 812c5f165aca (bug 864098) for XPC Bustage on a CLOSED TREE 
--HG--
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js.html => browser/devtools/framework/test/browser_toolbox_options_disablejs.html
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js.js => browser/devtools/framework/test/browser_toolbox_options_disablejs.js
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html => browser/devtools/framework/test/browser_toolbox_options_disablejs_iframe.html
 2013-12-17 13:58:55 +01:00
Michael Ratcliffe
fc851c63c7 Bug 864098 - Add "Disable Cache" to options panel r=jwalker 
--HG--
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.html => browser/devtools/framework/test/browser_toolbox_options_disable_js.html
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.js => browser/devtools/framework/test/browser_toolbox_options_disable_js.js
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs_iframe.html => browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html
 2013-12-17 10:58:21 +00:00
Nick Alexander
163b1929e5 Merge m-c to elm 2013-12-16 09:13:10 -08:00
Mike Connor
7122ff527c bug 950204 - Bing search suggestions on desktop do not include locale, r=gavin 2013-12-19 14:51:09 -05:00
Phil Ringnalda
b53eaccd4d Merge f-t to m-c 2013-12-14 18:21:57 -08:00
Steffen Wilberg
5a454ed633 Bug 950357: The About dialog shouldn't check for updates without asking if the 'Never check for updates' option is selected. Instead, present a 'Check for Updates' button. r=felipe 2013-12-16 22:55:44 +01:00
Nick Alexander
03c9e15f08 Merge m-c to elm 
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
 2013-12-12 08:21:15 -08:00
Mihai Sucan
e6218da369 Bug 843004 - Part 3: VariablesView ObjectActor pretty output; r=benvie,vporof 2013-12-18 20:17:05 +02:00
Jared Wein
828a0acf8e Bug 931891 - [Australis] Backed out bug 887515 and the followups (bug 896291, 909662, 896896). r=ttaubert 
--HG--
extra : rebase_source : f6568e83e23c036f21270e0f133ee06b192b1f9e
 2013-12-13 16:55:49 -05:00
Jared Wein
d049d3bf34 Backed out changeset 1566f020e34e (bug 931891) for timing out some mochitest-bc tests on a CLOSED TREE 
--HG--
extra : rebase_source : 423f491a0bedebfd9350167340d6f65d275a64cd
 2013-12-13 15:57:31 -05:00
Jared Wein
d1bf402a34 Bug 931891 - [Australis] Backed out bug 887515 and the followups (bug 896291, 909662, 896896). r=ttaubert 2013-12-13 14:27:56 -05:00
Nick Alexander
3520f2dfa1 Merge m-c to elm 2013-12-11 14:08:02 -08:00
Nick Alexander
f99f8d5a0d Merge m-c to elm 2013-12-11 10:25:40 -08:00
Victor Porof
42ceb02f64 Bug 815280 - Add a enable/disable all breakpoints button to the sources toolbar, r=rcampbell 
--HG--
rename : browser/themes/linux/devtools/blackBoxMessageEye.png => browser/themes/linux/devtools/debugger-blackboxMessageEye.png
rename : browser/themes/osx/devtools/blackBoxMessageEye.png => browser/themes/osx/devtools/debugger-blackboxMessageEye.png
rename : browser/themes/windows/devtools/blackBoxMessageEye.png => browser/themes/windows/devtools/debugger-blackboxMessageEye.png
 2013-12-11 14:34:53 +02:00
Alex Keybl
00125a9d9f Bug 946719 - [xh, an] Add Xhosa and Aragonese locales to shipped-locales r=pike CLOSED TREE 2013-12-09 13:41:37 -05:00
Gregory Szorc
e396fc159d Bug 774572 - Part 2: Define JAR_MANIFESTS in moz.build files; r=glandium 
Every directory with a jar.mn now has JAR_MANIFESTS defined in its
moz.build file.

We also removed the may_skip special consideration of jar.mn files
because this information is now available during tier traversal by the
reader courtesy of the variables being present in moz.build files.

--HG--
extra : rebase_source : 21049b15e6bd9cf65b0805ccaccc4ba5aae93c98
extra : amend_source : 0b1ea866d725beef92d37c6f6d475369ac002e19
 2013-12-10 16:18:11 +09:00
Brian Grinstead
b26cf505f9 Bug 938616 - webconsole UI updates while in split mode with other panels;r=msucan 2013-12-06 09:46:51 -06:00
Victor Porof
1d9cc46801 Bug 905981 - Have a classic vertical display of stack frames persistently available in the debugger UI, r=rcampbell 2013-12-06 18:33:59 +02:00
Ryan VanderMeulen
d0595b15b9 Merge fx-team to m-c. 2013-12-05 17:35:21 -05:00
Marina Samuel
b112dc8bbf [Australis] Bug 946181: Update Metro button string ids for localization. r=jaws 2013-12-04 15:32:31 -05:00
Henri Sivonen
35a8e654fa Bug 946676 - Remove iso-8859-8-i from the Character Encoding menu. r=emk. 2013-12-05 15:23:13 +02:00
Nick Alexander
97f0b84177 Merge m-c to elm 2013-11-18 08:22:59 -08:00
Steffen Wilberg
8bc776ce98 Bug 600500: About Dialog should check for updates automatically, but not trick the user into installing them if updates are set to manual. ui-review=faaborg and shorlander, r=felipe 2013-12-12 00:14:58 +01:00
Steffen Wilberg
b2e1a3355c Backed out changeset 43d16a0ca410 2013-12-12 00:08:39 +01:00
Steffen Wilberg
4bd0730265 Bug 600500: About Dialog should check for updates automatically, but not trick the user into installing them if updates are set to manual. ui-review=faaborg and shorlander, r=felipe 2013-12-12 00:01:17 +01:00
Gijs Kruitbosch
c3218cf205 Merge m-c to ux 2013-11-17 23:37:53 +01:00
J. Ryan Stinnett
4bae8066d9 Bug 951518 - Added missing ending whitespace to help text. r=flod 2013-12-17 22:34:23 -06:00
Gijs Kruitbosch
cc2610edfd Merge mozilla-central and ux 2013-11-15 18:32:01 +01:00
Nick Alexander
512ba56709 Merge m-c to elm 2013-11-14 22:41:14 -08:00
Nick Alexander
c01daad066 Merge b-i to elm 
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
 2013-11-13 15:16:51 -08:00
Nick Alexander
fbff534ad2 Merge m-c to elm 2013-11-13 13:43:32 -08:00
Mike Connor
640e4550f0 bug 947275 - updated Bing branding for desktop and Metro, r=gavin 
--HG--
extra : rebase_source : 375fe6e5cc5c7cc13326a35c1572c69dbec58bd1
 2013-12-13 13:42:30 -05:00
Mike Connor
ae39aa6b05 bug 936198 - update small Yahoo! icon, including on MetroFx, r=gavin 
--HG--
extra : rebase_source : 770893767db1836b13e5cf4bd0904b402ce0d15b
 2013-12-13 13:38:29 -05:00
Victor Porof
539a0cdebe Bug 758157 - Clearly indicate overridden variables, r=past 2013-12-12 19:38:12 +02:00
J. Ryan Stinnett
68143b7310 Bug 937607 - Add explicit save button for the manifest editor. r=paul 2013-11-13 13:34:29 -06:00
Oprea Andrei
9fcb1703b9 Bug 722267 - Option to enable/disable timestamps for messages in the console; r=msucan 2013-11-11 19:00:07 +02:00
Hubert B Manilla
4e53556018 Bug 913665 - Detect minified files and pretty print them by default; r=fitzgen 2013-12-24 15:32:55 +01:00
Marina Samuel
052d1710e5 Bug 944828: Update metro button text. r=bbondy 2013-12-03 14:04:02 -05:00
Marina Samuel
7d0e8c072c Bug 939092: Update Metro folder text. r=bbondy 2013-12-03 13:49:55 -05:00
Ryan VanderMeulen
4829857b56 Merge m-c to inbound. 2013-12-02 16:58:15 -05:00
Mike Hommey
881a7c1554 Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense). r=mshal 2013-12-03 06:34:21 +09:00
Francesco Lodolo (:flod)
78dd124a1d Bug 944871 - Add localization comment to "Firefox Touch" string. r=bbondy 2013-12-02 13:05:13 -05:00
J. Ryan Stinnett
64ea1cec79 Bug 912057 - Replace Browser Debugger with Browser Toolbox. r=past 
--HG--
rename : browser/devtools/debugger/DebuggerProcess.jsm => browser/devtools/framework/ToolboxProcess.jsm
 2013-12-02 02:28:01 -06:00
Jared Wein
80a2d02722 Bug 939943 - [Australis] Make the Exit Customize button more obvious. r=mconley 2013-12-02 00:27:39 -05:00
Victor Porof
952b20eb2d Bug 725235 - In the debugger, show a details bubble while hovering over a variable or property in the source editor, r=past,rcampbell 2013-11-29 16:47:52 +02:00
Marina Samuel
ac44257569 Bug 924914 - Added string that is only going to be used in Holly non Autralis mirror. r=bbondy 2013-11-28 20:12:42 -05:00
Marina Samuel
b0727306b9 Bug 939092 - Bookmarks are not shared between profiles. r=bbondy 2013-11-23 15:03:34 -05:00
Brian R. Bondy
da816d6874 Bug 924900 - Remove unused auto-sync setup code. r=jimm 2013-11-20 13:45:08 -05:00
Marina Samuel
ef2d108ec4 Bug 934032 - Add View on Metro feature to Desktop Firefox in Australis. r=bbondy 2013-11-19 13:06:58 -05:00
Gijs Kruitbosch
2604cdd6d9 Bug 942803 - remove bogus keycode from devtoolboxmenuitem, r=mikeratcliffe 2013-11-28 12:12:09 +01:00
Cameron Paul
67e5d120f1 Bug 859057 - Add clear button to network monitor. r=vporof 2013-11-26 14:21:23 -05:00
Carsten "Tomcat" Book
d548ed7959 merge fx-team to mozilla-central 2013-11-26 12:38:36 +01:00
Henri Sivonen
a581322e18 Bug 805374 - Clean up the Character Encoding menu. r=Gijs,Unfocused. 2013-11-26 09:31:52 +02:00
Gabriel Luong
5d43d99088 Bug 924996 - Implement keyboard shortcut to move selected lines in source editor. r=anton 2013-11-25 19:06:42 -08:00
Felix H. Dahlke
d6dfa4ccda Bug 879982 - [Australis] Add Email Link widget; r=jaws 2013-11-23 01:40:18 +01:00
Carsten "Tomcat" Book
37ac775340 merge mozilla-inbound to mozilla-central 2013-11-11 08:50:14 +01:00
Nick Alexander
e16fe14d12 Merge m-c to elm 2013-11-04 21:25:12 -08:00
Ryan VanderMeulen
d638624a4b Merge m-c to fx-team. 2013-11-04 16:33:35 -05:00
Jared Wein
ea476120a6 Bug 880164 - Australis toolbar buttons contextual menu in toolbar, palette and customize mode. r=Gijs 2013-11-21 23:09:34 -05:00
Gijs Kruitbosch
7fd8c018c3 Merge mozilla-central and ux 2013-11-11 09:29:29 +01:00
Matthew Noorenberghe
aba2581f1a Merge mozilla-central to UX 2013-11-09 17:46:29 -08:00
Jared Wein
8a50677a0d Automated merge with https://hg.mozilla.org/mozilla-central 2013-11-08 13:22:23 -05:00
Gijs Kruitbosch
2d25f5955d Merge mozilla-central and ux 2013-11-07 19:21:54 +00:00
J. Ryan Stinnett
ba00ad3348 Bug 912918 - Part 2: Display warnings and errors if both are present. r=paul 
--HG--
extra : rebase_source : fe7a8989c9e09b42b31c76c14cbd08034c5b91f3
 2013-11-07 11:31:32 -06:00
Mike Hommey
50e2fd01b1 Bug 935387 - Remove non recursed install targets. r=mshal 2013-11-07 10:37:45 +09:00
Gijs Kruitbosch
7211b5e0ad Merge mozilla-central and ux 2013-11-06 09:01:08 +01:00
Tim Taubert
43df2515e7 Bug 754344 - Make in-content prefs navigation look like about:addons r=jaws 
From 8e5ce19d039052d06c099a87c2c315353bc589cf Mon Sep 17 00:00:00 2001
 2013-11-05 13:21:28 +01:00
Anton Kovalyov
d9c929551a Bug 929234 - Make CodeMirror extraKeys localizable. r=vporof 2013-11-07 14:39:31 -08:00
Ryan VanderMeulen
a49676ce2c Backed out changesets 45b199e32b8e, 0b7c44eff352, and 763edcbd5757 (bug 912918) for test_app_validator.html timeouts. 2013-11-07 16:35:18 -05:00
Matthew Noorenberghe
be474fa47a Merge mozilla-central to UX 2013-11-05 01:04:20 -08:00
Gijs Kruitbosch
7735c1ae5f Merge mozilla-central and ux 2013-11-04 23:41:59 +01:00
cptanu
d6606a229d Bug 934274 - [app manager] changed invalidLaunchPath to accessFailedLaunchPath and edited the text. r=jryans 2013-11-05 09:16:47 -05:00
Gijs Kruitbosch
ad9e61fa26 Merge mozilla-central and ux 2013-11-01 23:24:47 +01:00
Gijs Kruitbosch
f298c06fde Merge mozilla-central and ux 2013-11-01 09:20:15 +01:00
Tim Taubert
dddd9e2bd7 Backed out changeset 109710b0f5f6 (bug 754344) 2013-11-01 12:08:37 +01:00
Ratnadeep Debnath
5d45e1a22e Bug 916694 - Clarify app types in App Manager's permissions table. r=jryans 2013-10-31 11:40:31 -04:00
Nick Alexander
e3f1e90097 Merge m-c to elm 2013-10-26 17:23:11 -07:00
Patrick Brosset
20557c91d0 Bug 765105 - Tooltip shared component, showing image previews in markup, css rules and computed views, r=miker,harth 2013-10-26 00:51:01 +05:30
Henri Sivonen
1a7a08adca Bug 910192 UI part - Get rid of intl.charset.default as a localizable pref and deduce the fallback from the locale. r=gavin. 2013-11-04 13:24:37 +02:00
Carsten "Tomcat" Book
84fb4e377c Backed out changeset a34d87e94281 (bug 910192) bustage on a CLOSED TREE 2013-11-04 13:03:41 +01:00
Henri Sivonen
b02a679fb6 Bug 910192 UI part - Get rid of intl.charset.default as a localizable pref and deduce the fallback from the locale. r=gavin. 2013-11-04 13:24:37 +02:00
Nick Alexander
8920f74077 Merge m-c to elm 2013-10-24 09:35:02 -07:00
Li Xiaodong
b8152a6414 Bug 917617 - Simulator start button UI tweaks; r=paul 2013-10-24 09:05:00 +01:00
J. Ryan Stinnett
118502c30b Bug 912918 - Part 2: Display warnings and errors if both are present. r=paul 2013-11-07 11:31:32 -06:00
Nick Fitzgerald
8db5f53579 Bug 922812 - Add an 'eval current top level function' command to scratchpad; r=past 2013-11-19 15:17:40 -08:00
Paul Rouget
73bbf74120 Bug 939122 - Move styleinspector.properties in /toolkit. r=miker 2013-11-19 09:15:46 -05:00
Benjamin Smedberg
7791df60f8 Bug 932854 - trunk-only patch to use new strings for the buttons, r=jaws 2013-11-19 08:17:04 -05:00
Brandon Benvie
9272e50551 Bug 936101 - Make ObjectActor.onDisplayString not call debuggee code. r=fitzgen 2013-11-18 13:24:54 -08:00
Victor Porof
b2a7636fab Bug 910955 - Implement a live WebGL shader editor, r=dcamp 2013-10-25 10:18:41 +03:00
Nick Alexander
c787539e66 Merge m-c to elm 2013-10-21 09:19:47 -07:00
Nick Alexander
c0e6e1451b Merge fx-team to elm 2013-10-18 11:39:01 -07:00
Tim Taubert
5f24a97891 Bug 754344 - Make in-content prefs navigation look like about:addons r=jaws 
From 958cacee91f0730b407bf35a65dd0bc9116cdd9e Mon Sep 17 00:00:00 2001
 2013-10-17 16:42:31 -07:00
Will Nayes
00921477be Bug 909249 - Fix checkmark in Netmonitor Header. r=robcee 2013-10-31 22:51:48 -04:00
Tareq Khandaker
e6bf4c21a9 Bug 927974 - Rewrite Connect help text to move link out of translated string. r=past 2013-10-18 10:04:18 -04:00
Tim Taubert
e2df2442f1 merge m-c to elm 2013-10-17 10:51:26 -07:00
Phil Ringnalda
e1c74de457 Merge m-c to a CLOSED TREE f-t 2013-10-18 21:27:48 -07:00
Ehsan Akhgari
7a6c00ee31 Backed out changeset 52b1205696cd (bug 927974) on the suspicion of this having caused frequent mochitest-bc oranges 2013-10-18 20:51:18 -04:00
Alexandre Poirot
a1b3f0577d Bug 920478 - Print errors when something is wrong with app launch path. r=paul 2013-10-17 14:27:04 -04:00
Tim Taubert
a17a006bcc Bug 926709 - Replace UI entry points for sync setup with opening about:accounts; r=gavin 2013-10-16 17:42:01 -07:00
Tim Taubert
b08ff3c212 merge m-c to elm 2013-10-16 10:25:32 -07:00
Mike Hommey
a470038314 Bug 935305 - Move preprocessor to mozbuild.action. r=gps 
--HG--
rename : config/Preprocessor.py => python/mozbuild/mozbuild/preprocessor.py
rename : config/tests/unit-Expression.py => python/mozbuild/mozbuild/test/test_expression.py
rename : config/tests/unit-LineEndings.py => python/mozbuild/mozbuild/test/test_line_endings.py
rename : config/tests/unit-Preprocessor.py => python/mozbuild/mozbuild/test/test_preprocessor.py
 2013-11-09 10:35:44 +09:00
Tareq Khandaker
fb55c67e9b Bug 927974 - Rewrite Connect help text to move link out of translated string. r=past 2013-10-18 10:04:18 -04:00
Matt Brubeck
ce20eb66d0 Back out 7063d9f5c1fd (bug 920478) on a CLOSED TREE because a dependency was backed out 2013-10-17 15:32:45 -07:00
Alexandre Poirot
c24be3721c Bug 920478 - Print errors when something is wrong with app launch path. r=paul 2013-10-17 14:27:04 -04:00
Nick Alexander
42a469772e Merge m-c to elm 2013-10-14 09:05:11 -07:00
Gavin Sharp
91a2a2c395 Bug 925892: add "channel=searchbar" parameter to Google plugin to distinguish search bar searches, r=MattN 
--HG--
extra : transplant_source : %CD%D4%0BqxCt%82%BA%80%CE%E6%C3%E1%F3V%96xo%81
 2013-10-11 14:30:31 -07:00
Nick Fitzgerald
d5689dad95 Bug 917072 - Move black box eyeball into sources toolbar; r=vporof 2013-10-23 02:10:08 -07:00
Nick Alexander
ffc65203a0 Merge m-c to elm 2013-10-10 08:29:47 -07:00
Nick Alexander
17580da435 Merge m-c to elm 2013-10-07 12:23:37 -04:00
Nick Alexander
062d95c446 Merge m-c to elm 2013-10-02 10:46:44 -07:00
Ryan VanderMeulen
17c3edcaca Bug 922693 - Update pdf.js to version 0.8.558. r=bdahl 2013-10-01 12:27:44 -04:00
Nick Alexander
2c8842b2b6 Merge m-c to elm 2013-09-27 08:41:13 -07:00
Minarto Margoliono
92220481f0 Bug 428943 - Add help button to the relevant support page for site identity pop-up. r=mconley 2013-10-09 09:31:33 -04:00
Nick Alexander
2a54591395 Merge m-c to elm 2013-09-25 08:47:59 -07:00
Nick Alexander
f8b82bf7ff Merge m-c to elm. 2013-09-24 09:17:43 -07:00
Jared Wein
7a53fb5e45 Bug 920803 - Blocked plug-in click-to-activate doorhanger is too narrow for some locales. r=dao 2013-09-26 15:18:25 -04:00
Nick Alexander
1c33b9c9ee Merge m-c to elm. 2013-09-23 08:47:42 -07:00
Nikhil Johny
3f62415d69 Bug 381519 - "Visit Date" should be "Most Recent Visit" in the Library. r=mak 2013-09-24 18:26:46 +02:00
Brandon Benvie
bc310a6405 Bug 895180 - Add a Scratchpad tab for remote targets. r=dcamp, r=robcee, r=msucan 2013-10-04 12:44:09 -07:00
Panos Astithas
d2a7feb211 Remove mentions of restarting in the options panel when toggling the remote and chrome debugging prefs (bug 918240). r=jwalker,mratcliffe 2013-09-20 16:31:20 +03:00
Tim Taubert
452dc0c60a merge m-c to elm 
--HG--
rename : browser/base/content/test/Makefile.in => browser/base/content/test/general/Makefile.in
 2013-09-20 08:55:13 +02:00
Anton Kovalyov
ff54039ba4 Bug 912260 - Make Scratchpad use CodeMirror. r=robcee r=msucan 2013-09-20 11:34:10 -07:00
Shane Caraveo
e653876403 bug 914927 change string for enable/disable social menuitem, r=felipc 2013-09-19 09:25:56 -07:00
Jared Wein
dc05b48985 Bug 917844 - Add a keyboard accesskey to the Browser Debugger menuitem. r=jwalker 2013-09-19 10:47:12 -04:00
Brian R. Bondy
6ead835f00 Bug 917933 - Update Bing search code. r=jimm 2013-09-19 09:47:30 -04:00
Nick Alexander
750c76f251 Merge m-c to elm 2013-09-18 11:08:28 -04:00
Sebastian Hengst
3fb161d39e Bug 919188 - help.intro in app-manager.dtd should use 'i.e.', not 'i.e' (dot is missing). r=dao 2013-09-23 19:20:43 +02:00
Tim Taubert
e023a63414 merge m-c to elm 2013-09-16 09:14:47 +02:00
Ryan VanderMeulen
13efcd8ed8 Merge inbound to m-c. 2013-09-15 21:48:02 -04:00
Paul Rouget
78979e2433 Bug 916597 - [app manager] Fix locales in help.xhtml. r=ochameau 2013-09-15 16:05:54 -04:00
Heather Arthur
bf2d8df761 Bug 892268 - Zoom devtools with Ctrl/Cmd +/-/0; r=dcamp 2013-09-14 23:26:18 -07:00
Michael Ratcliffe
ddd2281784 Bug 911748 - Add default color dropdown to devtools options panel. r=jwalker 2013-09-16 11:01:25 +01:00
Michael Harrison
3106319d69 Bug 832636 - Improve the Style Editor tab tooltip. r=paul.rouget 2013-09-17 11:36:40 -04:00
Mihai Sucan
c23595f345 Bug 916329 - Use proper plural forms in messageRepeats.tooltip. r=robcee 2013-09-14 13:43:44 +03:00
Nick Alexander
4603aa7048 Merge m-c to elm. 2013-09-13 11:59:08 -07:00
Ed Morley
dfd548545c Merge latest green fx-team changeset and mozilla-central 2013-09-13 15:02:24 +01:00
Michael Ratcliffe
99ef1680aa Bug 917863 - Add XUL context menu back into rule and computed views. r=jwalker 2013-09-20 01:15:34 +01:00
Darrin Henein
7ba07a761e Bug 912929 - Updated Devtools' App Manager UI to better reflect new style guidelines. r=paul 2013-09-13 00:54:00 +02:00
Paolo Amadini
147dff90bb Bug 899110 - Remove the code to switch between different back-ends from the Downloads Panel. r=enn 2013-11-04 19:21:13 +01:00
Ryan VanderMeulen
a28ce26ea4 Bug 914603 - Update pdf.js to version 0.8.505. r=bdahl 2013-09-12 16:28:48 -04:00
Francesco Lodolo
965120e847 Bug 915556 - Replace multiple dots with single unicode character … in project.installing. r=paul.rouget 2013-09-12 13:15:47 -04:00
Paul Rouget
c5c8639c55 Bug 915388 - Remove 'my' from the panels name in index.xul. r=ochameau 2013-09-12 13:15:47 -04:00
Tim Taubert
54216b11ce merge m-c to elm 2013-09-12 10:35:40 +02:00
Ryan VanderMeulen
ed0259103b Merge fx-team to m-c. 2013-09-11 21:48:20 -04:00
Tanvi Vyas
0a6c6669db Bug 913710 - When a page has mixed active content blocked and mixed display content loaded, show the same site identity message as you would when a site just has mixed display content loaded. 2013-09-14 23:36:22 -07:00