Jared Wein
b885fc599d
Bug 917844 - Add a keyboard accesskey to the Browser Debugger menuitem. r=jwalker
2013-09-19 10:47:12 -04:00
Brian R. Bondy
3dd531727f
Bug 917933 - Update Bing search code. r=jimm
2013-09-19 09:47:30 -04:00
Nick Alexander
937400d40b
Merge m-c to elm
2013-09-18 11:08:28 -04:00
Sebastian Hengst
5be268b869
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
b19217e348
merge m-c to elm
2013-09-16 09:14:47 +02:00
Ryan VanderMeulen
b01a3d362f
Merge inbound to m-c.
2013-09-15 21:48:02 -04:00
Paul Rouget
f35ac64855
Bug 916597 - [app manager] Fix locales in help.xhtml. r=ochameau
2013-09-15 16:05:54 -04:00
Heather Arthur
464f98fada
Bug 892268 - Zoom devtools with Ctrl/Cmd +/-/0; r=dcamp
2013-09-14 23:26:18 -07:00
Michael Ratcliffe
f15cf75697
Bug 911748 - Add default color dropdown to devtools options panel. r=jwalker
2013-09-16 11:01:25 +01:00
Michael Harrison
6812507afd
Bug 832636 - Improve the Style Editor tab tooltip. r=paul.rouget
2013-09-17 11:36:40 -04:00
Mihai Sucan
e29c4e9f30
Bug 916329 - Use proper plural forms in messageRepeats.tooltip. r=robcee
2013-09-14 13:43:44 +03:00
Nick Alexander
d4de7fd64f
Merge m-c to elm.
2013-09-13 11:59:08 -07:00
Ed Morley
976b3a737e
Merge latest green fx-team changeset and mozilla-central
2013-09-13 15:02:24 +01:00
Michael Ratcliffe
91b15a73ee
Bug 917863 - Add XUL context menu back into rule and computed views. r=jwalker
2013-09-20 01:15:34 +01:00
Darrin Henein
d74fa740eb
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
43a05f12e6
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
81977c4664
Bug 914603 - Update pdf.js to version 0.8.505. r=bdahl
2013-09-12 16:28:48 -04:00
Francesco Lodolo
6a4b6654f8
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
fb2cb6bfca
Bug 915388 - Remove 'my' from the panels name in index.xul. r=ochameau
2013-09-12 13:15:47 -04:00
Tim Taubert
a49f955317
merge m-c to elm
2013-09-12 10:35:40 +02:00
Ryan VanderMeulen
b2d6edce8e
Merge fx-team to m-c.
2013-09-11 21:48:20 -04:00
Tanvi Vyas
0161f4c2c7
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
J. Ryan Stinnett
322fb9d673
Bug 928144 - Make Manifest Editor read-only for hosted apps. r=paul
...
--HG--
extra : rebase_source : 66b5c3aaab33ba714e4740bbf54d20ffa40e2132
2013-10-22 19:42:13 -05:00
Brian Grinstead
0a5eda33d0
Bug 895561 - 'Edit As HTML' option in the markup view - browser changes, r=jwalker
2013-10-24 08:41:03 -05:00
Paul Rouget
da1ab9e787
Bug 926371 - show reflow events in the webconsole. r=msucan
2013-10-22 08:43:00 +01:00
Shane Caraveo
f23bd02a7d
bug 914927 change string for enable/disable social menuitem, r=felipc
2013-09-14 10:13:24 -07:00
Paul Rouget
b6d1645088
Bug 915740 - Integrate adb helper addon into the app manager (UI part). r=ochameau
2013-09-13 05:18:00 +02:00
Alexandre Poirot
cd08a7ca39
Bug 915226 - Merge all refresh/start/stop/debug buttons to two buttons called update and debug r=paul
2013-09-13 15:36:00 +02:00
Paul Rouget
ab0fb0f06b
Bug 912887 - [app manager] first run experience. r=ochameau
2013-09-14 04:49:00 +02:00
Francesco Lodolo
56771fbcbf
Bug 913826 - New social bookmark button: rename entities to reflect string changes. r=mixedpuppy
2013-09-11 09:51:03 -04:00
Alexandre Poirot
c92c39403a
Bug 911785 - Allow installing local apps from the app manager UI r=paul
2013-09-10 13:26:00 +02:00
Paul Rouget
d07cde75a0
Bug 912892 - [app manager] simulator launch UI. r=ochameau
2013-09-10 11:42:00 +02:00
J. Ryan Stinnett
345e528c05
Bug 913717 - Fix placeholder text for hosted apps. r=paul
2013-09-09 11:14:06 -05:00
Manish Goregaokar
96f5806a87
Bug 767313 - Merge the Tabs category into the General category in in-content preferences. r=Unfocused
2013-09-11 13:22:44 +12:00
Axel Hecht
2fe55056d4
bug 907146, update filter.py for metro, f=flod
...
I also reworked the python code to be easier to read, and
use string return values instead of bools.
2013-09-11 14:12:05 +02:00
Nick Alexander
652bd33c7d
Merge m-c to elm
2013-09-03 10:45:50 -07:00
Paul Rouget
d0bf61ad80
Bug 777972 - [responsive mode] translate click events to touch events. r=mratcliffe
2013-09-03 09:15:51 +02:00
Paul Rouget
816ef18a40
Bug 777972 - [responsive mode] translate click events to touch events. r=mratcliffe
2013-09-03 09:15:51 +02:00
Paul Rouget
f3957f191d
Bug 908003 - [responsive mode] Better precision during resizing. r=mratcliffe
2013-09-03 09:15:51 +02:00
Paul Rouget
2ccce337ae
Bug 849236 - Add a screenshot button to the responsive mode. r=mratcliffe
2013-09-03 09:15:51 +02:00
Rodrigo Silveira
dd2ea59559
Bug 895520 - Firefox Search Autocomplete theme changes r=sfoster
...
--HG--
extra : rebase_source : ae7e20ba077bd80d6d752ab4f50f5358276f9d24
2013-09-19 13:33:12 -07:00
Tim Taubert
c1cf087a32
merge m-c to elm
2013-08-30 06:54:48 +02:00
Nick Fitzgerald
45c3de0da3
Bug 762761 - part 2: front end changes for debugger pretty printing; r=vporof
2013-09-18 17:56:20 -07:00
Zach Carter
8bb429fab0
Bug 904612 - Implement first version of about:accounts wrapper for desktop; r=gavin,ttaubert
2013-08-27 13:31:03 -07:00
Tim Taubert
04984d86c5
Backed out changeset 571b2854e11f
2013-08-28 09:56:59 +02:00
Tim Taubert
1dc04333ed
merge m-c to elm
2013-08-28 09:56:53 +02:00
Zach Carter
397c27a774
imported patch lloyd-patch
2013-08-27 13:31:03 -07:00
J. Ryan Stinnett
2bab79c5d7
Bug 926929 - Update documentation link on Connect page. r=vporof
2013-10-15 10:00:51 -05:00
J. Ryan Stinnett
4e8142efe5
Bug 922193 - Add VariablesView as manifest editor in App Manager. r=paul
2013-10-09 00:52:38 -05:00
Sunny
2306b5ed20
Bug 898472 - Give Browser Debugger window a title. r=vp
2013-10-11 15:09:00 -07:00
Ryan VanderMeulen
aaaebeb484
Backed out 4 changesets (bug 747428, bug 907324, bug 899353, bug 747552) for mochitest-other assertions.
...
Backed out changeset ee2bf84036fb (bug 907324)
Backed out changeset 17f932a5856d (bug 899353)
Backed out changeset b277e7b08f88 (bug 747552)
Backed out changeset 6ae3b1195542 (bug 747428)
2013-08-26 12:25:49 -04:00
Marco Castelluccio
65583c33e5
Bug 899353 - Show progress while downloading webapps. r=felipc
2013-08-26 10:32:09 -04:00
Doug Turner
15a1a561b0
Bug 912347 - Prevent already registered protocol handler info bar. r=jaws
2013-09-12 10:41:08 +02:00
J. Ryan Stinnett
fca8e384d5
Bug 912889 - Add tooltips and help to App Manager. r=paul.rouget
2013-09-13 11:43:49 -05:00
Ed Morley
7c054b34d0
Merge mozilla-central and fx-team
2013-09-13 15:13:34 +01:00
Victor Porof
dc7ea4a61b
Bug 881219 - When filtering sources, hiding items in the sources list is redundant, r=rcampbell
2013-09-13 16:23:14 +03:00
Mihai Sucan
6578791d44
Bug 760876 - Part 1: switch from XUL to XHTML for the Web Console output; r=robcee,paul
2013-09-13 15:06:46 +03:00
Ton
59a434d60d
Bug 951132 - Remove periods in App Manager tooltips. r=jryans
2013-12-18 19:09:52 -06:00
Anton Kovalyov
78a2edc300
Bug 912240 - Restore access key for the Clear button in console; r=msucan
2013-10-03 23:25:22 +03:00
Victor Porof
3cd6865e48
Bug 800857 - Handle event listener objects added by plugins, r=past
2013-10-04 10:33:08 +03:00
Victor Porof
98c03e2f04
Bug 800857 - Implement debugger frontend for breaking on dom events, r=rcampbell
2013-10-04 10:33:08 +03:00
Avinash Kundaliya
300ef6e45b
Bug 889944 - Add "Open in New Tab" context menu item on resources; r=harth
2013-08-27 13:39:44 +02:00
Joe Walker
cc27ce7289
Bug 900114 - Rollup for bugs 781856, 884015, 789884, 892901, 773188, r=mratcliffe
2013-08-29 14:00:55 +01:00
Joe Walker
0246eb6faf
Bug 904549 - Make browser_dbg_cmd.js wait for helpers.audit to complete; r=past,anton,nfitzgerald
2013-08-29 14:00:52 +01:00
Wes Kocher
03f1a9748a
Bug 907316 - Add keyboard shortcuts for opening Scratchpad and the Browser Console to the detached devtools toolbox window. r=dcamp"
2013-08-28 08:26:01 -07:00
Suyash Agarwal
a21bb74d78
Bug 888587 - Change the History menu access key to y. r=msucan
2013-08-14 16:18:00 +02:00
Phil Ringnalda
b263cee66b
Back out ae91affad44f (bug 889944) for browser-chrome bustage
...
CLOSED TREE
2013-08-16 19:04:25 -07:00
Avinash Kundaliya
597b82ff98
Bug 889944 - add "open in new tab" context menu item on resources; r=harth
2013-08-16 15:33:11 -07:00
Anup Allamsetty
a25a78a661
Bug 896911 - Rename "Resend" item to "Edit and Resend"; r=harth
2013-08-16 13:51:42 -07:00
Matt Brubeck
dd735b7105
Bug 852236 - re-enable localization in browser/metro [r=Pike]
2013-08-15 22:02:42 -04:00
Anton Kovalyov
1ab3c1a7c7
Bug 904212 - Remove obsolete Profiler localization strings. r=me
2013-08-13 13:48:08 -07:00
Anton Kovalyov
cdbd1f1c26
Bug 892289 - Ctrl+L should clear the console output. r=robcee
2013-08-13 13:26:55 -07:00
Axel Hecht
5d459386c3
bug 848830, fix regression in app updater localization, r=glandium, rstrong
...
--HG--
extra : rebase_source : 66b4e3e55a05d4b74bd39a40c4768c620b74062a
2013-08-13 17:15:42 +02:00
Oprea Victor Andrei
7b11362e49
Bug 901733 - Add "--invert" flag to the "dbg blackbox" command; r=fitzgen
2013-08-12 13:58:22 -07:00
Brian R. Bondy
5d6a81559c
Bug 791706 - Search defaults for Metro v1. r=jimm
2013-09-16 20:35:57 -07:00
Phil Ringnalda
da34cf8ed0
Backed out changeset 1d12266ddc4c (bug 914927)
...
CLOSED TREE
2013-09-16 17:55:17 -07:00
Eddy Bruel
277dd9a07f
Bug 906963 - Add a "ignore caught exceptions" checkbox to the UI; r=dcamp
2013-09-09 19:02:41 +02:00
Marco Castelluccio
e877419b4c
Bug 899353 - Show progress while installing apps. r=felipc
2013-09-09 08:57:37 -04:00
Srinath N
3e18dfe670
Bug 897697 - The start button in the profiler needs a label or at least a tooltip, r=anton
2013-09-09 00:05:45 +03:00
Ryan VanderMeulen
9ec48e8308
Merge inbound to m-c.
2013-09-06 16:41:07 -04:00
Shane Caraveo
8c2d33f410
bug 891219 new social bookmarks, part 2, new implementation, r=markh
2013-09-06 10:56:01 -07:00
Shane Caraveo
c14643f48f
bug 891219 new social bookmarks, part 1, remove old socialmarks code
2013-09-06 10:55:43 -07:00
Axel Hecht
1e63de455c
bug 911745, sync browser/locales/all-locales with build configs, r=gavin
2013-09-06 15:57:28 +02:00
Paul Rouget
4ecc5de17e
Bug 912910 - [app manager] add a menuitem to the devtools menu. r=mossop
2013-09-05 07:37:00 +02:00
Hubert B Manilla
10aec2ea5b
Bug 884484 - Don't show Loading... forever if loading a source fails; r=fitzgen
2013-09-05 09:10:12 -07:00
Ed Morley
28a868781a
Merge mozilla-central and fx-team
2013-09-05 14:54:06 +01:00
Paul Rouget
8b9fcfe546
Bug 911781 - Implement a module to validate the app manifest. r=paul
2013-09-05 15:15:37 +02:00
Paul Rouget
6cd7501f9e
Bug 912447 - [app manager] land the app manager front end. r=poirot.alex r=mratcliffe
2013-09-05 15:15:37 +02:00
Wes Kocher
10df022340
Merge m-c to inbound
2013-09-04 18:04:50 -07:00
Mike Hommey
05b3f24e0e
Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps
2013-09-05 09:01:46 +09:00
Nick Fitzgerald
cbac25c28b
Bug 906640 - add a pretty print button to the scratchpad; r=anton
2013-09-03 19:22:08 -07:00
Michael Ratcliffe
6d96d85783
Bug 694019 - we should be able to highlight and inspect a :pseudo element r=mratcliffe
2013-09-04 17:43:40 +02:00
Felipe Gomes
c91633a792
Bug 899348 - Implement about:tabcrashed page. r=jaws
...
--HG--
rename : browser/themes/linux/aboutSocialError.css => browser/themes/linux/aboutTabCrashed.css
rename : browser/themes/osx/aboutSocialError.css => browser/themes/osx/aboutTabCrashed.css
rename : browser/themes/windows/aboutSocialError.css => browser/themes/windows/aboutTabCrashed.css
2013-09-03 19:11:22 -03:00
Francesco Lodolo [:flod]
c6c8610bec
Bug 913366 - Improve strings and l10n comment in app-manager.properties. r=paul.rouget
2013-09-06 09:18:19 -04:00
Ivan Alagenchev
372fb3e439
Bug 762593 - DEVTOOLS patch. Adds tests and logic to output warning messages for insecure passwords to web console. r=msucan
2013-08-06 10:14:51 -04:00
Tim Taubert
b9c090c518
Backed out changeset fa280c8a55f0 (bug 892185)
2013-08-05 06:11:17 +02:00
Brian Grinstead
142d0770cc
Bug 892168 - Ctrl+Shift+I/Cmd+Opt+I should toggle the devtools open/closed
2013-07-31 10:38:59 -07:00
Heather Arthur
80fa8cef4f
Bug 892185 - Ctrl+Shift+J/Cmd+Opt+J should toggle the console; r=fitzgen
2013-07-31 11:39:00 -07:00
Nick Fitzgerald
a0e6ec559a
Backout revision 141246:8780f778bc45 for style editor failures
2013-08-03 11:29:37 -07:00
Brandon Benvie
2e3d477e15
Bug 892277 - Change stepping hotkeys. r=fitzgen
...
--HG--
extra : rebase_source : 485d6a4d7f16186c2fc452e3c6bb652d1842e40c
2013-07-31 16:43:15 -07:00
Rob Campbell
cb4ef24fb6
Bug 878412 - Use F12 to open the Toolbox; r=jwalker
2013-08-03 17:34:05 +01:00
Brian Grinstead
8df3b01be5
Bug 891556 - Add Ctrl-Shift-C (Cmd-Opt-C) shortcut to toggle highlighting; r=jwalker
2013-08-02 11:28:37 -07:00
Brian Grinstead
2c16b8d160
Bug 892168 - Ctrl+Shift+I/Cmd+Opt+I should toggle the devtools open/closed; r=jwalker
2013-07-31 10:38:59 -07:00
Tiziana Sellitto
1154e76a61
Bug 854952 - Delete fullscreen approval question from fullscreen approval pane, change fullscreen exit hint message fullscreenExitHint2, halve border radius, add background texture, and change button order of the fullscreen permission prompt. r=dolske
2013-08-02 20:36:10 -04:00
Ryan VanderMeulen
31bba8d791
Backed out changeset fa4afb7214ae (bug 878412) for suspected xperf orange.
2013-08-02 09:51:37 -04:00
Rob Campbell
74830712a1
Bug 878412 - Use F12 to open the Toolbox, r=dcamp
2013-08-02 16:05:51 +05:30
Gijs Kruitbosch
3e54109a58
merge m-c to UX
2013-10-27 21:18:18 +01:00
Matthew Noorenberghe
a65ad34081
Merge mozilla-central to UX
2013-10-25 18:30:46 -07:00
Gijs Kruitbosch
e0cd81c15d
Merge m-c to ux
2013-10-25 11:45:31 +02:00
Gijs Kruitbosch
4593d1248d
Merge mozilla-central and ux
2013-10-24 10:18:26 +02:00
Gijs Kruitbosch
2893bbe381
Bug 894375 - change web developer tools tooltip, r=mconley
2013-10-21 12:48:38 +02:00
Mike Conley
31b6a1d552
Automated merge with https://hg.mozilla.org/mozilla-central
2013-10-19 21:58:39 -04:00
Gijs Kruitbosch
8075b6f634
Merge mozilla-central and ux
2013-10-17 13:48:43 +02:00
Gijs Kruitbosch
93dcef516a
Bug 887853 - part 2: add shortcut references and display them, r=mconley
2013-10-14 14:39:30 +02:00
Gijs Kruitbosch
641a62f58e
Bug 887853 - part 1: remove shortcuts from l10n file, r=mconley
2013-10-14 13:52:12 +02:00
Gijs Kruitbosch
9f466ffaf0
Merge mozilla-central and ux
2013-10-16 13:15:41 +02:00
Gijs Kruitbosch
df46ecf97e
Merge m-c to ux
2013-10-13 23:58:05 +02:00
Gijs Kruitbosch
392e2189f8
Merge mozilla-central and ux
2013-10-10 09:27:14 +02:00
Gijs Kruitbosch
ffa05cbe44
Merge mozilla-central and ux
2013-10-05 07:56:29 +02:00
Gijs Kruitbosch
6571c9c165
Merge mozilla-central and ux
2013-10-02 00:00:14 +02:00
Gijs Kruitbosch
548bb53b54
Merge mozilla-central and ux
2013-09-27 10:35:54 +02:00
Gijs Kruitbosch
68b05691e5
Merge mozilla-central and ux
2013-09-25 10:16:54 +02:00
Gijs Kruitbosch
e4b7441f3e
Merge mozilla-central and ux
2013-09-24 14:55:03 +02:00
Gijs Kruitbosch
9078ed78b8
Bug 882582 - Make 'Preferences' be 'Options' on Windows, r=jaws
2013-09-20 13:13:00 +02:00
Gijs Kruitbosch
3b0604988f
Merge mozilla-central and ux
2013-09-23 17:59:41 +02:00
Gijs Kruitbosch
44a1e1eaca
Merge mozilla-central and ux
2013-09-21 13:14:05 +02:00
Gijs Kruitbosch
e09b74b1b3
Merge mozilla-central and ux
2013-09-20 11:54:02 +02:00
Gijs Kruitbosch
3b9ad26395
Merge m-c to UX
...
--HG--
rename : browser/base/content/test/Makefile.in => browser/base/content/test/general/Makefile.in
rename : browser/base/content/test/browser_bug462289.js => browser/base/content/test/general/browser_bug462289.js
rename : browser/base/content/test/browser_bug624734.js => browser/base/content/test/general/browser_bug624734.js
rename : browser/base/content/test/head.js => browser/base/content/test/general/head.js
2013-09-19 17:15:24 +02:00
Gijs Kruitbosch
1ad320d951
Merge m-c to UX
2013-09-18 10:31:05 +02:00
Gijs Kruitbosch
e2f47baa44
Merge mozilla-central and ux
2013-09-17 11:58:14 +02:00
Gijs Kruitbosch
cf60ec415a
Merge mozilla-central and ux
2013-09-16 09:13:50 +02:00
Gijs Kruitbosch
2c07477df1
Merge m-c to ux
2013-09-15 19:30:19 +02:00
Gijs Kruitbosch
cfa5d95340
Merge m-c to ux
2013-09-13 09:42:13 +02:00
Gijs Kruitbosch
70de40c148
Merge m-c to UX
...
--HG--
rename : browser/base/content/test/browser_tabopen_reflows.js => browser/base/content/test/browser_windowopen_reflows.js
2013-09-12 18:05:07 +02:00
Matthew Noorenberghe
c9e329be81
Merge mozilla-central to UX
2013-09-12 01:39:29 -07:00
Gijs Kruitbosch
9030c8e31a
Merge mozilla-central and ux
2013-09-10 16:46:22 +02:00
Gijs Kruitbosch
e3552ae5f3
Merge mozilla-central and ux-central
2013-09-09 17:00:49 +02:00
Matthew Noorenberghe
186f9be72f
Merge mozilla-central to UX
2013-09-06 17:54:20 -07:00
Matthew Noorenberghe
a60bb60a2e
Merge mozilla-central to UX
2013-09-06 00:10:05 -07:00
Mike Conley
cb9e730fc8
Automated merge with https://hg.mozilla.org/mozilla-central
2013-09-05 09:59:00 -04:00
Matthew Noorenberghe
3d7d1a0ddb
Merge mozilla-central to UX
2013-09-04 23:31:53 -07:00
Matthew Noorenberghe
e0b7383ee9
Merge mozilla-central to UX
2013-09-03 23:17:06 -07:00
Gijs Kruitbosch
8893d1b1c4
Merge mozilla-central and ux
2013-08-29 23:55:09 +02:00
Gijs Kruitbosch
eec8448e00
Merge mozilla-central and ux
2013-08-29 15:30:00 +02:00
Gijs Kruitbosch
fa4efe6d73
Merge m-c to UX.
2013-08-28 09:48:19 +02:00
Gijs Kruitbosch
f85d1877a9
Merge m-c to UX
...
--HG--
rename : browser/base/content/test/browser_tabopen_reflows.js => browser/base/content/test/browser_windowopen_reflows.js
2013-08-21 13:13:32 +02:00
Mike de Boer
b4e57aae97
Bug 865916: create a Character Encoding widget and subview. r=gkruitbosch,dao
2013-08-20 14:52:29 +02:00
Matthew Noorenberghe
ea27f0dcbb
Merge mozilla-central to UX
...
--HG--
rename : browser/base/content/test/browser_tabopen_reflows.js => browser/base/content/test/browser_windowopen_reflows.js
2013-08-19 01:00:34 -07:00
Matthew Noorenberghe
2c18d0c5dd
Merge mozilla-central to UX
2013-08-14 03:18:44 -07:00
Mike Conley
0434689bfa
Automated merge with https://hg.mozilla.org/mozilla-central
2013-08-13 10:12:56 -04:00
Matthew Noorenberghe
bae49d6e2c
Merge mozilla-central to UX
2013-08-06 23:06:26 -07:00
Marco Bonardo
1662ae2fa8
Bug 901516 - Remove UX-only unused appMenuBookmarks.label string from browser.dtd. r=mikedeboer
2013-08-05 22:01:34 +02:00
Gijs Kruitbosch
1ac39936f0
Merge m-c to UX
2013-08-05 11:57:12 +02:00
Marco Bonardo
2c9f65dd10
Bug 895938 - Australis: Dragging the bookmarks toolbar item to the menupanel makes it disappear
...
r=mikedeboer
2013-08-02 22:31:20 +02:00
Gijs Kruitbosch
e5220a0c68
Merge m-c to ux
2013-08-02 17:21:19 +02:00
Mike Conley
f607b24bc9
Automated merge with https://hg.mozilla.org/mozilla-central
2013-08-01 14:45:26 -04:00
Matthew Noorenberghe
3999b2695d
Merge mozilla-central to UX
2013-07-31 17:48:12 -07:00
Nick Fitzgerald
81d36c49a9
Bug 895543 - part 2: show a "this source is black boxed" message and big "un black box" button instead of the source editor for black boxed sources; r=robcee
2013-07-30 20:36:13 -07:00
Gijs Kruitbosch
2e265e0df0
Merge m-c to UX.
2013-07-28 11:50:05 +02:00
Nick Fitzgerald
22b9456d34
Bug 892605 - part 2: add 'dbg blackbox' and 'dbg unblackbox' gcli commands; r=vporof
2013-07-27 10:50:57 -07:00
Gijs Kruitbosch
adb8115534
Merge m-c to UX
2013-07-25 12:10:08 +02:00
Tanvi Vyas
bbd83899cf
Bug 890963 - Update site identity message for pages where Mixed Active Content has loaded. r=dolske?
2013-07-31 10:43:38 -07:00
Marco Bonardo
a4beaa4a33
Bug 855805 - Create the Bookmarks widget with subview - Functional part.
...
r=mconley
2013-07-25 12:02:05 +02:00
Ryan VanderMeulen
abe5f8d26d
Merge m-c to inbound.
2013-07-24 18:22:45 -04:00
Gijs Kruitbosch
0455d3d5d9
Bug 872544 - update private browsing label to match menu, r=jaws
2013-07-23 23:47:25 +02:00
Dão Gottwald
3528027a50
Bug 519937 - Remove "Back", "Forward" and "Home" from History menu. r=mak
...
--HG--
extra : rebase_source : ff2b79b3c46a3c3be612bef3af48f01a36495268
2013-07-24 18:37:08 +02:00
Matthew Noorenberghe
de1150b579
Merge mozilla-central to UX
2013-07-23 23:40:52 -07:00
Francesco Lodolo [:flod]
2cc61dd47b
Bug 896161 - Australis: restore backForwardItem.title in browser.dtd, r=dao
2013-07-22 09:32:38 +02:00
Gijs Kruitbosch
03e1680427
Merge m-c to ux
2013-07-22 09:26:50 +02:00
Matthew Noorenberghe
2ded965d7c
Merge mozilla-central to UX
2013-07-18 19:53:03 -07:00
Francesco Lodolo
c3838ea961
Bug 889500 - Australis: restore unused strings in browser.dtd. r=dolske
2013-07-18 19:00:48 -07:00
Mike de Boer
bf6232e65b
Bug 755598: Merge Back/ Forward/ URLBar/ Stop/ Reload/ Go buttons into 1 toolbaritem. r=dao
2013-07-18 18:46:28 +02:00
Nick Fitzgerald
2c317e4266
Fix bug 892286 - Cmd+L / Ctrl+L should be go to line. r=robcee
2013-08-01 10:55:39 +02:00
Gijs Kruitbosch
7ee9ecdd8c
Merging m-c to UX
2013-07-17 21:02:17 +02:00
Anton Kovalyov
2cde89a45f
Bug 828046 - Save/load profiles to/from disk; r=robcee
2013-07-16 16:03:33 -07:00
Gijs Kruitbosch
b6d2c03de3
Bug 881937 - Add shortcut to toggle the menupanel, r=mdeboer
2013-07-16 16:26:49 +02:00
Matthew Noorenberghe
131a8cc6d6
Merge mozilla-central to UX
2013-07-12 22:14:28 -07:00
Anton Kovalyov
62a9d6673b
Bug 888881 - Use single unicode character … instead of '...' in label profilerStarted; r=robcee
2013-07-11 16:27:56 -07:00
Jared Wein
2a8bd534c8
Automated merge with https://hg.mozilla.org/mozilla-central
2013-07-11 21:19:16 -04:00
Minarto Margoliono
6bdccd0f52
Bug 887605 - Add "Copy URL" context menu item to Netmonitor; r=harth
2013-07-10 18:50:16 -07:00
Ryan VanderMeulen
ec6b3d53b5
Merge m-c to inbound.
2013-07-10 09:45:16 -04:00
Anton Kovalyov
48b7e17954
Bug 833495 - Add an option to show Gecko platform data in the Profiler; r=robcee
2013-07-09 13:58:53 -07:00
Gijs Kruitbosch
67f692e20d
Merge mozilla-central and ux
2013-07-10 23:53:05 +02:00
Gijs Kruitbosch
7a7f7e31ae
Merge mozilla-central and ux
2013-07-05 00:49:58 +02:00
Jared Wein
cadb3274f1
Automated merge with https://hg.mozilla.org/mozilla-central
2013-07-03 12:40:14 -04:00
Tanvi Vyas
be4316f4f1
Bug 838402 - Add new identity mode for mixed active content. Change messages for following modes: encrypted, mixed content, mixed active content, and mixed active content blocked with display content. r=dolske
2013-07-03 15:14:12 -07:00
Gijs Kruitbosch
42cb395974
Merge mozilla-central and ux
2013-06-30 22:44:57 +02:00
Phil Ringnalda
8cd97ffc27
Merge fx-team to m-c
2013-06-30 08:35:45 -07:00
Gijs Kruitbosch
8edc822c01
Merge m-c to ux
...
--HG--
rename : browser/themes/windows/browser.css => browser/themes/shared/identity-block.inc.css
2013-06-29 11:18:15 -04:00
Gijs Kruitbosch
48df1d813f
Merge mozilla-central and ux
2013-06-28 17:03:38 -04:00
Francesco Lodolo [:flod]
027beedc0f
Bug 887911 - Improve localization comment for zoom-reset-button.label (customizableWidgets.properties), r=gijs, DONTBUILD
2013-06-27 15:09:27 -04:00
Gijs Kruitbosch
fe3e9fce5e
Merge mozilla-central and ux
2013-06-27 14:24:43 -04:00
Jared Wein
462cb25d44
Bug 750106 - Use a chrome icon for chrome URLs in the location bar. r=mconley
...
--HG--
rename : browser/themes/windows/browser.css => browser/themes/shared/identity-block.inc.css
2013-06-28 23:22:41 -04:00
Max Li
2a756fed26
Bug 877453 - Expose longdesc in image context menus. r=gavin ui-r=boriss
2013-06-23 09:37:21 -04:00
Michael Kohler
85eba09377
Bug 513165 - remove "Web Search" item from Tools menu. r=dao
2013-07-23 12:49:59 +02:00
Dão Gottwald
bfed20773e
Bug 896918 - Add "Keyboard Shortcuts" item to the Help menu. r=mdeboer
2013-07-23 12:43:54 +02:00
Ed Morley
86bc191b22
Merge mozilla-central and fx-team
2013-06-28 14:37:15 +01:00
Anton Kovalyov
f181dfc10e
Bug 828038 - Change profile recording UI and behavior; r=dcamp
2013-06-27 17:31:52 -07:00
Girish Sharma
b91bacd9ca
Bug 892244 - Ctrl+[ / Ctrl+] to switch devtools tabs, r=harth
2013-07-20 19:06:43 +05:30
Francesco Lodolo [:flod]
8293129ca1
Bug 871697 - GCLI: review strings and l10n comment, fix wrong strings disconnectDesc and disconnectManual; r=jwalker
2013-07-20 05:18:43 +01:00
Joe Walker
e7d00b9c69
Bug 767587 - GCLI should have a type for files; r=mratcliffe
2013-07-20 05:17:24 +01:00
Sumedh Shekhar
ea92bea020
Bug 873298 - Change "Filter scripts" string to "Search scripts" in debugger; r=harth
2013-07-19 13:47:23 -07:00
Nick Fitzgerald
3e782ca6c0
backout bug 877686 b/c of unknown spidermonkey bug causing permaorange
2013-07-19 13:13:35 -07:00
Ryan VanderMeulen
839fedb61a
Merge m-c to fx-team on a CLOSED TREE.
2013-07-19 13:44:28 -04:00
Ryan VanderMeulen
ac01cf97ee
Merge m-c to fx-team.
2013-07-18 20:37:32 -04:00
Justin Dolske
8c5c2d0445
Bug 889500 - rearrange some strings in browser.dtd which Australis will later remove. r=gijs
2013-07-18 18:57:34 -07:00
Nick Fitzgerald
2f3ef31459
Bug 877686 - Add UI to toggle the blackboxing of specific sources; r=vporof
2013-07-18 01:40:43 -07:00
Nick Fitzgerald
e567f9e5f0
Backed out changeset 960aa3700c37
2013-07-18 00:52:54 -07:00
Nick Fitzgerald
c64ec717be
Bug 877686 - Add UI to toggle the blackboxing of specific sources; r=vporof
2013-07-17 23:04:13 -07:00
Brandon Benvie
346b1b7b37
bug 825039 - Make Scratchpad execute in context of current debugger; r=rcampbell,msucan,past
2013-07-23 09:58:27 -07:00
Ryan VanderMeulen
43c111099a
Merge m-c to fx-team.
2013-07-23 20:53:32 -04:00
Nick Fitzgerald
038880eee6
Bug 877686 - Add UI to toggle the blackboxing of specific sources; r=vporof
2013-07-23 10:15:10 -07:00
Ryan VanderMeulen
183be64998
Merge m-c to inbound.
2013-09-12 22:30:22 -04:00
Tom Schuster
edac489884
Bug 913155 - Electrolysis: Add a submit crashreport box on the tab crashed page. r=felipe,smaug
2013-09-12 15:24:10 -04:00
Dão Gottwald
148d74ea25
Bug 885366 - Show granted and refused site permissions in site identity panel. r=jaws
2013-07-02 02:42:48 +02:00
Phil Ringnalda
be9a7fe9ad
Backed out changeset add063e3ff2b (bug 885366) for making two things with id="identity-popup-permissions"
...
CLOSED TREE
2013-07-01 19:13:23 -07:00
Dão Gottwald
cee6ec947f
Bug 885366 - Show granted and refused site permissions in site identity panel. r=jaws
2013-07-02 02:42:48 +02:00
Gijs Kruitbosch
4ef39cc656
Bug 749804 - part 0: remove the add-on bar, r=jaws
2013-05-09 12:08:07 +02:00
Gijs Kruitbosch
c246a46f08
Merge from m-c to ux
2013-06-26 10:44:39 -04:00
Benjamin Smedberg
b4bef0087f
Bug 886403 - Spelling errors from bug 880735, r=spelling
2013-06-25 11:57:36 -04:00
Jared Wein
698d87c899
Automated merge with https://hg.mozilla.org/mozilla-central
2013-06-23 02:58:41 -04:00
Jared Wein
20e28337a5
Automated merge with https://hg.mozilla.org/mozilla-central
2013-06-21 19:22:56 -04:00
Mike Conley
8ea91adc93
Automated merge with https://hg.mozilla.org/mozilla-central
2013-06-19 19:17:41 -04:00
Anton Kovalyov
916ce4824c
Bug 863653 - Add hints to profiler [start|stop|show] commands; r=jwalker
2013-06-20 10:48:25 -07:00
Brian R. Bondy
04f1990523
Bug 882598 - Rename updateAuto.label to reflect string change. r=rstrong
2013-06-19 23:19:17 -04:00
Anton Kovalyov
78e492a2a4
Bug 881006 - Change Profile panel tooltip to say JavaScript Profiler; r=harth
2013-06-18 17:24:36 -07:00
Anton Kovalyov
2d58087657
Bug 850145 - Use SideMenuWidget in the Profiler; r=vporof
2013-06-18 14:42:36 -07:00
Benjamin Smedberg
dd1efc4d69
Bug 880735 part D followup: flod pointed out that I changed these strings without changing the key, and since changing the key is hard I'm just going to revert them for now and do something better in a followup.
2013-06-24 10:16:30 -04:00
Benjamin Smedberg
f6df2c3cd7
Bug 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws
2013-06-24 08:51:07 -04:00
Benjamin Smedberg
1ba75d1044
Bug 880735 part D - New doorhanger frontend code. Removes all logic which shows the plugin doorhanger automatically, including on scripting. Always show the doorhanger when there is a plugin present on the page, even if that plugin is currently enabled. Make the "always" choices clear to the user. r=jaws
2013-06-24 08:51:07 -04:00
Jared Wein
7ab8c9f95e
Automated merge with https://hg.mozilla.org/mozilla-central
2013-06-13 10:04:45 -04:00
Jared Wein
a6efdbc5ef
Automated merge with https://hg.mozilla.org/mozilla-central
2013-06-12 23:12:42 -04:00
Ryan VanderMeulen
373947830a
Merge fx-team to m-c.
2013-06-12 12:22:36 -04:00
Brian R. Bondy
cd714ae0bc
Bug 866229 - Change - Add a preference for not doing updates in Metro. r=jimm
2013-06-12 10:31:09 -04:00
Michael Ratcliffe
bcdc5bc992
Bug 881057 - Improve wording in the appcache command r=jwalker
2013-06-11 13:28:45 +01:00
Gijs Kruitbosch
df09b2fb41
Merge mozilla-central and ux-central
2013-06-11 22:00:25 +02:00
Gijs Kruitbosch
3da55a9a57
Bug 870452 - Migrate feed button to new API, r=mconley
2013-06-03 20:59:31 +02:00
Jared Wein
ffd8852eb6
Automated merge with https://hg.mozilla.org/mozilla-central
2013-06-05 11:43:23 -04:00
Gijs Kruitbosch
93b8daad09
Bug 870471 - context menu for customization panel, r=bmcbride,dao
2013-06-05 11:31:37 +02:00
Jared Wein
d0b82153d9
Bug 755593 - Remove tabs-on-bottom mode. r=dao
2013-06-04 18:08:55 -04:00
Mihai Sucan
3ed002f734
Bug 705921 - Option to clear web console messages on page reload; r=robcee,jwalker
2013-06-03 20:57:13 +03:00
Mike de Boer
f926ba5a73
Bug 868433: make widgets use localization strings. r=mconley
2013-06-04 12:44:03 +02:00
Mike de Boer
3ea0056123
Bug 870901: Re-add edit controls and make them customizable. r=mconley
2013-06-04 12:33:13 +02:00
Mike de Boer
72dbb63b57
Bug 870897: make the zoom controls customizable. r=mconley, sr=Unfocused
2013-06-04 12:33:11 +02:00
Michael Ratcliffe
78afee66a6
Bug 864249 - Add option to toggle JavaScript to Toolbox Options panel r=jwalker
2013-05-31 16:52:06 +01:00
Mike Conley
6b3f18f085
Backed out changeset c986b5090517 due to possibly introducing leaks.
2013-06-03 14:21:16 -04:00
Mike Conley
3ed0bc1432
Backed out changeset ea38f867cc07 due to possibly introducing leaks.
2013-06-03 14:20:02 -04:00
Mike de Boer
a0815cd636
Bug 870901: Re-add edit controls and make them customizable, r=mconley
2013-06-03 13:17:55 +02:00
Mike de Boer
7607f90bbf
Bug 870897: make the zoom controls customizable, r=mconley
2013-06-03 13:17:52 +02:00
Gijs Kruitbosch
c214b08a5a
Merge m-c to ux
2013-06-02 21:35:55 +02:00
Matthew Noorenberghe
87139eb2a8
Merge mozilla-central to UX
2013-06-01 02:45:51 -07:00
Mike Conley
dbd6b94bef
Bug 868135 - Remove the History sidebar control as a toolbar customization item. r=jaws.
2013-05-29 17:41:44 -04:00
Mike Conley
77dd7811df
Mostly automated merge with https://hg.mozilla.org/mozilla-central
2013-05-29 17:41:40 -04:00
Gijs Kruitbosch
3266379735
Bug 873518 - Remove throbber button from customization palette, r=jaws
...
--HG--
extra : rebase_source : 0692e06311053ec0c016a7aee8e802f99cc813fb
2013-05-28 16:30:47 +02:00
Mike Conley
7617561a54
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-27 11:19:45 -04:00
Mike Conley
44f7e3e021
Bug 867368 - Remove Bookmarks sidebar control as a toolbar customization item. r=jaws.
2013-05-27 10:28:27 -04:00
Matthew Noorenberghe
df676cbcee
Merge mozilla-central to UX on a CLOSED TREE
2013-05-25 18:33:51 -07:00
Victor Porof
1bcfae93c8
Bug 859046 - Implement filtering out certain types of requests, r=rcampbell
...
* * *
Bug 873761 - Several "XUL box for hbox element contained an inline #text child, forcing all its children to be wrapped in a block." warnings for netmonitor.xul, r=rcampbell
2013-05-24 20:53:10 +03:00
Jared Wein
ecc51d5a16
Bug 865926 - Allow the nav-bar to overflow toolbaritems into an overflow panel. r=mconley.
2013-05-23 09:40:55 -04:00
Mike Conley
2a59bbb0d2
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-23 09:39:09 -04:00
Victor Porof
4fb38db98d
Bug 884498 - Netmonitor's greeting message may be confusing, r=rcampbell
2013-06-21 17:33:57 +03:00
Victor Porof
af32953f8c
Bug 823577 - Cleanup debugger frontend code, strings, etc., r=rcampbell
...
--HG--
rename : browser/devtools/debugger/DebuggerUI.jsm => browser/devtools/debugger/DebuggerProcess.jsm
2013-06-21 17:33:56 +03:00
Brandon Benvie
39f9a243d8
Bug 869984 - Add sorting and searching to Scratchpad VariablesView, r=vporof
2013-06-17 14:55:25 -07:00
Michael Ratcliffe
4a8861cd01
Bug 882337 - Typo in "asteriskInWrongSection2" in browser/devtools/appcacheutils.properties r=jwalker
2013-06-13 10:57:39 +01:00
Francesco Lodolo [:flod]
2141724864
Bug 874785 - Web Console: rewrite localization comments and use ordered arguments for multiple parameters, r=mratcliffe
2013-05-22 01:35:00 -07:00
Joe Walker
93920d3fe2
Bug 874821 - Enable better remote gcli testing; r=mratcliffe
2013-05-25 09:51:31 +01:00
Francesco Lodolo [:flod]
79dc9592d5
Bug 878025 - Fix l10n comment for networkMenu.summary; r=rcampbell
2013-05-31 11:00:00 +03:00
Gijs Kruitbosch
a3d06d7922
Bug 870461 - Improve l10n identifiers for new history subview buttons, r=dao
2013-05-22 12:07:54 +02:00
Jared Wein
bf50b047f7
Backed out changeset e8aa19ecf54d (bug 865926) for leaking
2013-05-21 18:12:35 -04:00
Jared Wein
af6371258f
Bug 865926 - Allow the nav-bar to overflow toolbaritems into an overflow panel. r=mconley
2013-05-21 16:18:33 -04:00
Mike Conley
228be11537
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-21 14:49:59 -04:00
Jared Wein
177d959aa3
Bug 870461 - Add 'Clear Recent History', 'Restore Previous Session', and tweak some of the text. r=gijs
...
--HG--
extra : rebase_source : bf880c3a7f75c43d32b63c190af8e79495ad2c9b
2013-05-21 10:27:16 -04:00
Mike Conley
7bd0d6c524
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-20 22:56:50 -04:00
Mihai Sucan
2ff555392e
Bug 602006 - Remove Error Console Menu Items; r=Mossop,dao
2013-05-17 21:29:31 +03:00
Ryan VanderMeulen
2ab7421818
Bug 871530 - Update pdf.js to version 0.8.169. r=dtownsend
2013-05-17 16:46:26 -04:00
Francesco Lodolo [:flod]
f143be2a4b
Bug 872993 - Rewrite localization comments and use ordered arguments for multiple parameters. r=Pike
2013-05-21 08:29:33 -04:00
Ryan VanderMeulen
0231e934ad
Merge m-c to inbound.
2013-05-21 08:17:04 -04:00
Joe Walker
3095239dd6
Bug 832717 - Help synopsis for GCLI commands should include the -- prefix needed to pass parameters; r=mratcliffe
2013-05-21 10:18:56 +01:00
Joe Walker
1052a1d86a
Bug 769687 - eagerHelperDesc should be easier to comprehend and localize; r=mratcliffe
2013-05-21 10:18:55 +01:00
Quentin Pradet
467af11b78
Bug 773271 - GCLI needs a date type; r=jwalker,harth
2013-05-21 10:18:55 +01:00
Joe Walker
ba712dc342
Bug 834230 - break del command suffers from an off by 1 error; r=vporof
2013-05-21 10:18:55 +01:00
Mike Conley
7f9d2174a6
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-15 17:14:08 -04:00
Mike de Boer
798dcf1e1d
Bug 869933: adjust zoom reset button label whilst zooming in/out. r=jaws
2013-05-14 18:55:21 +02:00
Gijs Kruitbosch
ddb823b205
Bug 870545 - Prevent hiding the nav-bar from the menu, r=jaws
...
--HG--
extra : rebase_source : 8f4ba205d78a89ba8700585a4793920848829a32
2013-05-14 18:15:36 +02:00
Mike Conley
277b86a80a
Mostly automated merge with https://hg.mozilla.org/mozilla-central
2013-05-13 13:04:32 -04:00
L. David Baron
244d007fec
Merge mozilla-inbound and mozilla-central.
...
(The mozilla-central side of the merge is entirely a merge from fx-team into mozilla-central.)
2013-05-11 22:00:23 -07:00
Heather Arthur
09d7c846ac
Bug 870131 - Rename 'Web Console' to 'Console' in toolbox; r=mratcliffe
2013-05-10 15:27:16 -07:00
Ryan VanderMeulen
30578632b7
Merge m-c to fx-team.
2013-05-10 15:00:46 -04:00
Jared Wein
521db889a9
Bug 869101 - Update in-content customization to remove the Appearance section and clean up the styling. r=mconley
2013-05-09 18:28:02 -04:00
Blake Winton
5fa89f481e
Bug 858660 - Remove done button from customize mode. r,ui-r=mconley
2013-05-09 16:31:15 -04:00
Joe Walker
cf09fcba29
Bug 839862 - The developer toolbar / GCLI should be able to execute commands remotely; r=dcamp
...
--HG--
rename : browser/devtools/shared/Templater.jsm => toolkit/devtools/gcli/Templater.jsm
rename : browser/devtools/commandline/gcli.jsm => toolkit/devtools/gcli/gcli.jsm
2013-05-09 15:15:22 +01:00
Michael Ratcliffe
97daa9f1b3
Bug 870308 - GCLI appcache list command exception when cache disabled r=jwalker
2013-05-10 14:41:27 +01:00
Mark Hammond
8270fbbdfe
Bug 566746 - various fixes to sanitize(). r=mak
2013-05-09 09:08:07 +10:00
Gijs Kruitbosch
2ad38190f5
Bug 833943, part 3: implement migrator changes, r=MattN, sr=gavin
...
--HG--
extra : rebase_source : d94c1d1c84f9b996d92317a26cbd227c0cb97a44
2013-06-28 17:45:05 -04:00
Gijs Kruitbosch
ac1ecfb962
Bug 833943, part 2: implement about:welcomeback, r=gavin
...
* * *
Bug 833943 - Part 5: add about:welcomeback to gInitialPages
--HG--
rename : browser/components/sessionstore/content/aboutSessionRestore.xhtml => browser/components/migration/content/aboutWelcomeBack.xhtml
extra : rebase_source : fc58ab8f648c4e0298959429cbf52de40135bb3d
2013-06-28 17:44:29 -04:00
Mike Conley
bcaa451a1b
Mostly automated merge with https://hg.mozilla.org/mozilla-central
2013-05-06 16:55:59 -04:00
Mike Conley
c4fe47ff08
Bug 863753 - Retire the Firefox appmenu button. r=MattN.
2013-05-06 11:36:17 -04:00
Jared Wein
b8479c19c3
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-03 09:08:52 -04:00
Shane Caraveo
68a8db25b0
bug 853151 rework recommend into social marks, r=felipe
...
--HG--
rename : browser/base/content/test/social/social_share_image.png => browser/base/content/test/social/social_mark_image.png
2013-05-02 11:49:11 -07:00
Mike Conley
dd58d909f1
Mostly automated merge with https://hg.mozilla.org/mozilla-central
2013-05-02 12:41:21 -04:00