Commit Graph

6986 Commits

Author SHA1 Message Date
Jared Wein
36207a238c Bug 894048 - RemoveAllTabsBut should use {animate: true} when closing tabs. r=ttaubert
--HG--
extra : rebase_source : 35d7438eb53d6cdf9a40be6f5ec1a880748b81a2
2013-08-23 13:49:05 -04:00
Felipe Gomes
87814bc58a Bug 907342 - Make navigation from about:newtab load in the remote process. r=ttaubert 2013-08-22 20:52:18 -03:00
Ryan VanderMeulen
1ef4f3befe Merge inbound to m-c. 2013-08-22 15:42:18 -04:00
Tim Taubert
0e9416cb6d Backed out changeset 42be7b929812 (bug 355063) 2013-08-22 09:22:18 +02:00
Christoph Kerschbaumer
4516e966ff Bug 902156 - Persist 'disable protection' option for Mixed Content Blocker - patch requires update for testcase from bug 822367. r=smaug, tanvi 2013-08-16 23:37:15 -07:00
Christoph Kerschbaumer
93a0fb8b22 Bug 902156 - Mochitest for Persist 'disable protection' option for Mixed Content Blocker. r=smaug, tanvi 2013-08-16 22:15:02 -07:00
Ryan VanderMeulen
908be1856b Merge inbound to m-c. 2013-08-21 17:14:32 -04:00
Shane Caraveo
9a243a50e9 bug 891221 add tests for chat from multiple providers, r=markh 2013-08-21 11:38:33 -07:00
Shane Caraveo
553ff52128 bug 891216 multiple workers enabled, r=markh 2013-08-21 11:32:46 -07:00
Stephen Pohl
137e8534cd Revert 366e6a39d71a from bug 673875 for causing bug 907275. r=smichaud 2013-08-21 12:22:03 -04:00
Andrew Wang
231bde23d4 Bug 901126 - Split browser_newtab_drag_drop.js into two tests. r=ttaubert 2013-08-21 08:32:47 -04:00
Ed Morley
496f4fe21d Merge mozilla-central and fx-team 2013-08-21 13:10:14 +01:00
Neil Deakin
c2de5fb794 Bug 847863 - Part 6 of 8 - Convert tests for clearing recent history. r=paolo 2013-08-21 09:36:07 +02:00
Ed Morley
212173e25a Merge mozilla-central and fx-team 2013-08-20 12:12:43 +01:00
Ed Morley
85c4f8fb8c Backed out changeset 7e8ff4c464f9 (bug 847863) on suspicion of causing failures in browser_sanitize-timespans.js 2013-08-20 11:52:34 +01:00
Tim Taubert
3ca2709087 Bug 879375 - Adapt reflow exclusion list entry for tabPreviews.capture() to recent changes; r=me/test-only 2013-08-20 11:19:42 +02:00
Ed Morley
aeada22cce Merge latest green fx-team changeset and mozilla-central 2013-08-20 09:51:41 +01:00
Neil Deakin
a6ae2e139b Bug 847863 - Part 6 of 8 - Convert tests for clearing recent history. r=paolo 2013-08-19 23:39:14 +02:00
Sebastian Hengst
070c210aec Bug 906465 - gatherTextUnder in utilityOverlay.js returns only alt text for image (img) if found. r=dao 2013-08-18 21:40:47 +02:00
Ekanan Ketunuti
38a487b238 Bug 896211 - Mixed content help link should be an app.support.baseURL-relative link rather than in its own pref. r=mconley 2013-08-19 08:49:11 -04:00
Wes Kocher
c45cb0703c Backed out changeset 20e064f3e8e0 (bug 905084) for adding a new intermittently failing test on a CLOSED TREE. 2013-08-20 17:20:21 -07:00
Ryan VanderMeulen
c8880fc5aa Merge m-c to inbound. 2013-08-20 16:32:33 -04:00
Georg Fritzsche
63f746aa26 Bug 905084 - Fix "Activate this plugin" action in context menu. r=jaws 2013-08-20 22:25:12 +02:00
Tanvi Vyas
9b2ecb62d7 Bug 865352 - Add new icon for HTTPS pages with Mixed Display Content loaded. 2013-08-20 13:09:23 -07:00
Phil Ringnalda
dca3d35d2b Merge m-c to fx-team 2013-08-17 08:42:11 -07:00
Neil Deakin
9e0280d28f Bug 899125 - Part 1 of 2 - Allow using the JavaScript API instead of nsIDownloadManager when clearing recent history. r=paolo 2013-08-17 15:19:55 +02:00
Tim Taubert
6ac8011db5 Bug 879375 - Adapt reflow exclusion list entry for SessionStore.getWindowDimensions() to recent changes; r=me/test-only 2013-08-17 13:24:30 +02:00
Jared Wein
8c9fdff438 Bug 897160 - Set a minimum width for the Firefox window. r=mconley 2013-08-16 14:03:43 -04:00
Jared Wein
de36443ce3 Backed out changeset 707307cc53a6 (bug 897160) 2013-08-16 16:31:35 -04:00
Ryan VanderMeulen
9806a7d7f1 Merge m-c to fx-team. 2013-08-16 15:34:58 -04:00
Jared Wein
6c38e5a18e Bug 897160 - Set a minimum width for the Firefox window. r=mconley 2013-08-16 14:03:43 -04:00
Honza Bambas
5c7819fda9 Bug 892488 - Get rid of the offline application cache prompt, r=ehsan+jonas 2013-08-16 11:34:21 +02:00
Dão Gottwald
58a80e0209 Bug 684016 - Add call stack to gBrowser.addProgressListener's wrong-argument-count error message. r=gavin 2013-08-17 03:12:47 +02:00
Carsten "Tomcat" Book
59ec523b5e merge fx-team to mozilla-central 2013-08-16 10:29:59 +02:00
Shane Caraveo
77c35eddd4 bug 904521 fix the close of chat windows when new windows are opened, r=markh 2013-08-15 15:34:37 -07:00
Shane Caraveo
53eac15f3c bug 840870 remove login restriction on chat, r=markh 2013-08-15 15:30:02 -07:00
Ehsan Akhgari
2e2a703c27 Bug 905176 - Don't show the Check Spelling menu item for spellcheck=false contenteditable elements; r=mconley 2013-08-15 15:06:54 -04:00
Ryan VanderMeulen
c292f445e7 Merge m-c to inbound. 2013-08-14 17:11:30 -04:00
Markus Stange
c3dfe63783 Bug 903586 - Use position:relative to provide a reference element for absolutely positioned highlighter elements. r=dao 2013-08-14 15:31:44 +02:00
Florian Quèze
de15ab0475 Bug 898161 - Detached chat windows should not have a menu bar, r=mixedpuppy. 2013-08-13 21:31:35 +02:00
Drew Willcoxon
c3122be44a Bug 904256 - Rename the browser-fullZoom:locationChange notification to make it clear it should only be used by tests. r=gavin 2013-08-12 16:41:43 -07:00
Gavin Sharp
317cd4f05a Bug 896986: Recent closed tab history middle click only opens top entry, r=jaws, f=dao
--HG--
extra : rebase_source : 94052c4c1aa1567ad3f3b361795a9683baabb6fa
2013-08-15 09:43:09 -07:00
Mark Hammond
62cd6b7999 Bug 907821 - Fix intermittent orange in browser_chat_tearoff.js. r=mixedpuppy
--HG--
extra : rebase_source : 93f508349faea2e1d22ab91060f7a8d97a58b301
2013-08-22 09:45:14 +10:00
Justin Dolske
5bb3221d40 Bug 355063 - Password manager does not work on script-generated forms, should use new DOMFormHasPassword event instead. r=mattn 2013-08-21 17:25:03 -07:00
Shane Caraveo
8972bd135d bug 899671 avoid execution in socialapi during startup if not enabled, r=jaws 2013-08-12 12:06:22 -07:00
Ryan VanderMeulen
13be9bc4d0 Merge inbound to m-c. 2013-08-09 19:08:45 -04:00
Tim Taubert
793e5c1645 Bug 880101 - part 2 - Wait until the initial tab's content document has been created before adding the progress listener; r=gavin 2013-08-09 04:56:48 +02:00
Tim Taubert
9289817900 Bug 880101 - part 1 - Add test that forces the gBrowser constructor a little too early; r=gavin 2013-08-09 04:51:27 +02:00
Ryan VanderMeulen
03b55bc71f Backed out changeset e91392042137 (bug 892488) for mochitest-3 failures.
CLOSED TREE
2013-08-14 13:29:10 -04:00
Trevor Saunders
ca11ae6bae bug 846185 - don't call into js when creating accessibles r=surkov, smaug 2013-07-19 00:13:35 -04:00
Carsten "Tomcat" Book
f0bfac3d0e merge mozilla-inbound to mozilla-central 2013-08-08 13:13:05 +02:00
David Keeler
9f7b825989 Bug 516753 - Forward content context menu events to the parent. r=felipc 2013-08-06 15:00:07 -07:00
Tim Taubert
7579551ffa Bug 902175 - [New Tab Page] Fix drag/drop tests on Retina displays r=jaws 2013-08-08 01:47:29 +02:00
Mark Hammond
f45a45d737 Bug 897811 - remove browser.pageThumbs.enabled preference. r=gavin 2013-08-07 11:10:58 +10:00
Mark Hammond
a4e0e4a736 Bug 897408 - remove erroneous style.removeProperty call in Site.prototype.refreshThumbnail. r=ttaubert 2013-08-07 11:10:57 +10:00
Honza Bambas
06d7ec69db Bug 892488 - Get rid of the offline application cache prompt, r=ehsan+jonas 2013-08-14 17:17:00 +02:00
Mounir Lamouri
08bc7bfb93 Bug 622284 - Write tests for input context menus. r=bbondy 2013-08-14 15:39:27 +01:00
Georg Fritzsche
c6c8f81e2e Bug 905084 - Fix "Activate this plugin" action in context menu. r=jaws 2013-08-26 16:48:41 +02:00
Bill McCloskey
7535ca5ecb Bug 899222 - Make about:home work via message passing (r=felipe)
--HG--
rename : browser/modules/AboutHomeUtils.jsm => browser/modules/AboutHome.jsm
2013-07-05 13:55:00 -07:00
Bill McCloskey
6b72d99118 Bug 899222 - Make about:home work via message passing (r=felipe).
--HG--
rename : browser/modules/AboutHomeUtils.jsm => browser/modules/AboutHome.jsm
2013-07-05 13:55:00 -07:00
Ivan Alagenchev
696edb62f1 Bug 762593 TOOLKIT patch. Adds logic for validating if password input fields are insecure. r=dolske 2013-08-06 10:14:40 -04:00
Ryan VanderMeulen
bed2e900e1 Merge m-c to fx-team. 2013-08-05 23:22:11 -04:00
Adam Dane [:hobophobe]
db2c2f6823 Bug 893349 - Dispatch event when find bar is initialized. r=dao 2013-08-04 16:06:19 -05:00
Ryan VanderMeulen
03f1e9ee4f Merge m-c to inbound. 2013-08-05 20:00:43 -04:00
Ryan VanderMeulen
86ae8ca1a0 Backed out changesets fbba341b5faf, 4b2c9adef1e4, and bde98e3a7194 (bug 762593) for mochitest-bc failures. 2013-08-05 16:58:37 -04:00
Gavin Sharp
0be0db67a8 Bug 897066 followup: fix mismerge of two patches 2013-08-05 10:36:46 -07:00
Carsten "Tomcat" Book
c7c707deba Merge m-i to m-c 2013-08-05 11:18:59 +02:00
Georg Fritzsche
43d3c4b358 Bug 896965 - Trigger "PluginBindingAttached" before running plugin notification tests. r=keeler 2013-08-05 14:58:02 +02:00
Ivan Alagenchev
fdb4e7588b Bug 762593 TOOLKIT patch. Adds logic for validating if password input fields are insecure. r=dolske 2013-08-05 11:22:59 -07:00
Bill McCloskey
13c5f652ba Bug 899338 - Work around backspace problem in e10s builds by disabling XUL command (r=felipe) 2013-08-05 11:14:17 -07: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
Nick Fitzgerald
a0e6ec559a Backout revision 141246:8780f778bc45 for style editor failures 2013-08-03 11:29:37 -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
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
Paolo Amadini
3b313b16d7 Bug 899107 - Allow using the JavaScript API as the back-end for the Downloads Panel. r=mak 2013-08-03 13:04:44 +02:00
Mihai Sucan
f0c3ce2c9b Bug 877262 - Part 2: move the Web Console files over to the new jetpack-based loader; r=dcamp
--HG--
rename : browser/devtools/shared/AutocompletePopup.jsm => browser/devtools/shared/autocomplete-popup.js
rename : browser/devtools/webconsole/HUDService.jsm => browser/devtools/webconsole/hudservice.js
rename : browser/devtools/webconsole/NetworkPanel.jsm => browser/devtools/webconsole/network-panel.js
rename : browser/devtools/webconsole/WebConsolePanel.jsm => browser/devtools/webconsole/panel.js
rename : toolkit/devtools/webconsole/WebConsoleClient.jsm => toolkit/devtools/webconsole/client.js
rename : toolkit/devtools/webconsole/NetworkHelper.jsm => toolkit/devtools/webconsole/network-helper.js
rename : toolkit/devtools/webconsole/WebConsoleUtils.jsm => toolkit/devtools/webconsole/utils.js
2013-08-03 13:29:48 +03:00
Mihai Sucan
f2ab2589a3 Bug 877262 - Part 1: merge HUDConsoleUI into HUDService and prepare for the jetpack loader; r=robcee 2013-08-02 20:11:57 +03: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
Gavin Sharp
53a7f4d31d Back out bug 896711 for potentially causing metro test timeouts, CLOSED TREE 2013-08-02 13:02:22 -07: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
Bill McCloskey
2cf60b81f5 Bug 897066 - Underline tab titles if the tab is remote (r=gavin) 2013-08-03 12:52:42 -07:00
Bill McCloskey
1828807e99 Bug 897066 - In e10s builds, some pages should be loaded in the chrome process (r=gavin) 2013-08-02 16:30:19 -07: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
Ryan VanderMeulen
2a93f2cff1 Merge m-c to inbound. 2013-07-30 15:41:57 -04:00
Ryan VanderMeulen
6054b3a67b Merge m-c to fx-team. 2013-07-30 13:12:26 -04:00
Tim Taubert
5f1ae9526b Bug 899532 - Use whenDelayedStartupFinished() in browser_tab_dragdrop.js; r=gavin 2013-07-30 09:38:12 -07:00
Shane Caraveo
45b7f6e770 bug 899192 fix toolbar button test, r=markh 2013-07-30 08:53:31 -07:00
Ryan VanderMeulen
2ef7a9892a Merge m-c to inbound. 2013-07-29 18:42:45 -04:00
Tim Taubert
1f880434bc Bug 897943 - Fix focus issues and wait for delayed startup in browser_locationBarCommand.js; f=margaret r=gavin 2013-07-29 12:55:09 -07:00
Tim Taubert
4d643986d1 Bug 857427 - Wait for delayed startup to be finished before starting tests in a window; r=ehsan 2013-07-29 11:06:24 -07:00
Shane Caraveo
268ccdee4e bug 891545 fix context menu for share panel, r=markh 2013-07-29 10:53:00 -07:00
Shane Caraveo
6977a96548 bug 896314 fix permission icon when swapping social providers, r=felipe 2013-07-29 09:35:41 -07:00
Shane Caraveo
25917e751e bug 886227 fix intermittent orange 2013-07-29 09:03:19 -07:00
Ehsan Akhgari
0844f71948 Bug 898881 - Enable OpenSearch auto discovery for private windows; r=jdm 2013-07-30 13:12:16 -04:00
Tom Schuster
d02522a3b1 Bug 691610 - e10s support for useDefaultIcon. r=felipe sr=smaug 2013-07-29 11:03:41 -04:00
Bill McCloskey
d9ba4ddbe7 Backout bug 899222 (forgot to apply review comments)
--HG--
rename : browser/modules/AboutHome.jsm => browser/modules/AboutHomeUtils.jsm
2013-08-19 15:26:39 -07:00
Bill McCloskey
e8e05670ce Bug 899222 - Make about:home work via message passing (r=felipe).
--HG--
rename : browser/modules/AboutHomeUtils.jsm => browser/modules/AboutHome.jsm
2013-07-05 13:55:00 -07:00
Bill McCloskey
9b152f8a1f Bug 905454 - Fix delete key in e10s (r=felipe) 2013-08-19 15:20:59 -07:00
Bill McCloskey
f640ccbfa2 Bug 902541 - Remove unnecessary flipping of remote attribute at startup (r=gavin) 2013-08-07 11:24:14 -07:00
Bill McCloskey
4d1d95b56c Bug 902105 - loadURI should rethrow inside its catch clause (r=gavin) 2013-08-07 10:52:06 -07:00
Bill McCloskey
e4f5e8e6d0 Bug 902041 - Don't use the remote-browser.xml binding for remote thumbnail generation (r=gavin) 2013-08-07 10:51:56 -07:00
Christian Holler
344469fcbd Bug 899492 - Disable plugin crash test when crashreporter not available. r=ted
--HG--
extra : rebase_source : abfb42265477940a373891241f6fa5d68e441e03
2013-07-30 16:01:45 +02:00
Matthew Noorenberghe
c987bd1037 Bug 898192 - Skip SocialMark and SocialShare code in onLocationChange when SocialUI is disabled. f=mhammond,r=jaws
--HG--
extra : rebase_source : f19d53a330e8f81ce6779bd1e786a1c256a5b921
2013-07-25 03:38:05 -07:00
Ryan VanderMeulen
2ecb03cb41 Merge fx-team to m-c. 2013-07-27 21:51:16 -04:00
Tim Taubert
5558d8edd0 Bug 898308 - Clean up SessionStore initialization; f=smacleod, r=dao 2013-07-27 07:40:07 +02:00
Bill McCloskey
4424755620 Bug 898170 - Avoid swapping docshells in e10s mode (r=felipe) 2013-07-26 14:26:28 -07:00
Bill McCloskey
02595844db Bug 898170 - Skip login manager event handlers in e10s mode (r=felipe) 2013-07-26 14:26:22 -07:00
Ryan VanderMeulen
506a9c9921 Merge m-c to inbound. 2013-07-26 12:09:20 -04:00
Ryan VanderMeulen
e1ed6aef6e Merge m-c to fx-team. 2013-07-26 10:49:26 -04:00
Tim Taubert
0148c7188e Bug 893061 - Prevent the default homepage from loading if we're going to restore a session; r=dao 2013-07-26 13:16:29 +02:00
Gavin Sharp
46b79d75ff Bug 890690 followup: simplify test 2013-07-25 17:48:17 -07:00
Mike de Boer
bc0f73b563 Bug 890690: added unit test for POST search engines in about:home, r=gavin
--HG--
extra : transplant_source : %B0%16%95/%08%1B5%A4%BC%B9U%F4x%D5%92%BED%B3%CC%AF
2013-07-25 02:15:54 +02:00
Mike de Boer
3ff4e5bb34 Bug 890690 - Support POST searches in about:home. r=gavin
--HG--
extra : transplant_source : %A5%23%F7%EC%87%DC%ED%D3V%00%C1%D7K%90%D4%009Pp%24
2013-07-25 02:43:19 +02:00
Steven MacLeod
f685628485 Bug 881049 - Switch SessionStore to Promise.jsm; r=ttaubert
X-Git-Commit-ID: 39b42be125f8b40a52350ed7cf9c39082356118f
2013-07-25 21:50:15 +02:00
Tim Taubert
585483c735 Bug 894876 - part 2 - Let about:newtab d&d test actually initiate and complete a drag session; r=jaws 2013-07-24 09:58:50 +02:00
Ryan VanderMeulen
abe5f8d26d Merge m-c to inbound. 2013-07-24 18:22:45 -04:00
Tim Taubert
11324dcbd9 Bug 766546 - Ignore the iframe's load event and continue when the whole page has loaded. r=avih 2013-07-24 17:58:05 +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
Dão Gottwald
c13c64d838 Bug 513168 - Remove "Stop" and "Reload" from View menu. r=mak
--HG--
extra : rebase_source : fcc5b38cb6ca4d1cd8da1d84945f098e78332300
2013-07-24 18:36:04 +02:00
Ryan VanderMeulen
20fabd9691 Merge m-c to inbound. 2013-07-25 21:59:02 -04:00
James Kitchener
5b157af303 Bug 885289 - Improve context menu behaviour for srcdoc iframes. r=mconley, r=bz 2013-07-25 09:32:50 -04:00
Ed Morley
d69071fb43 Backed out changeset 3448b7a9d7a5 (bug 890690) 2013-07-25 17:40:40 +01:00
Ed Morley
cebbf2612b Backed out changeset 658e5f8a8daf (bug 890690) 2013-07-25 17:40:37 +01:00
Ed Morley
4d9077a6b0 Merge mozilla-central and inbound 2013-07-25 17:05:47 +01:00
Ryan VanderMeulen
63993f347c Backed out changeset ed851bbfe997 (bug 885289) for mochitest-bc orange. 2013-07-25 11:26:21 -04:00
Mike de Boer
8cff96de7a Bug 890690 - Add unit test for POST search engines in about:home. r=gavin 2013-07-25 02:15:54 +02:00
Mike de Boer
42a52013bc Bug 890690 - Support POST searches in about:home. r=gavin 2013-07-25 02:43:19 +02:00
James Kitchener
f425c1e52e Bug 885289 - Improve context menu behaviour for srcdoc iframes. r=mconley, r=bz 2013-07-25 09:32:50 -04:00
Benjamin Smedberg
4780e40920 Bug 888510 - In-content theming fixup for the new plugin click-to-activate. Remove the "lightweight" transparent click-to-play theming and make the normal styling plain grey. Switch from a CSS gradient to an image gradient because of performance issues. Highlight the "check for updates" button for outdated plugins. Icons by shorlander and lco, ui-review=lco r=jaws
--HG--
rename : toolkit/themes/osx/mozapps/plugins/contentPluginCrashed.png => toolkit/themes/shared/plugins/contentPluginCrashed.png
rename : toolkit/themes/osx/mozapps/plugins/contentPluginDownload.png => toolkit/themes/shared/plugins/contentPluginDownload.png
rename : toolkit/themes/osx/mozapps/plugins/contentPluginMissing.png => toolkit/themes/shared/plugins/contentPluginMissing.png
rename : toolkit/themes/windows/mozapps/plugins/pluginProblem.css => toolkit/themes/shared/plugins/pluginProblem.css
2013-07-26 09:30:27 -04:00
Tim Taubert
f8b884172b Backed out changeset c089c7694bb4 (bug 894876) 2013-07-24 16:50:55 +02:00
Tim Taubert
eb1647e0b5 Backed out changeset 105e1f064e67 (bug 895359) 2013-07-24 16:50:55 +02:00
Tim Taubert
5a834565bf Bug 895359 - [New Tab Page] Switch to Promise.jsm and remove remaining callbacks; r=jaws 2013-07-24 09:58:50 +02:00
Tim Taubert
0b00114d06 Bug 894876 - part 2 - Let about:newtab d&d test actually initiate and complete a drag session; r=jaws 2013-07-24 09:58:50 +02:00
Tim Taubert
421efbb97d Bug 894345 - [New Tab Page] Fix drag/drop behavior when rearranging sites; r=jaws 2013-07-24 09:58:50 +02:00
Michael Harrison
e40a13da10 Bug 890367 - Correctly handle non-ASCII text in browser.newtab.url. r=ttaubert 2013-07-23 10:52:20 -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
Mark Hammond
7d413299c4 Bug 870100 (part 2) - about:newtab observes notifications for new page thumbnails. r=ttaubert 2013-07-23 17:41:12 +10:00
Gavin Sharp
68214b0668 Bug 896711: remove BrowserChromeTests.runWhenReady because it's being abused, r=dao/ttaubert
--HG--
extra : transplant_source : %9D%F5%0D/%105%29%20%BCW%EC%BEs%BB%22vgO%9B%87
2013-07-27 17:32:40 -07:00
Georg Fritzsche
37576d425e Bug 906703 - Trigger "PluginBindingAttached" before tests that use the missing plugin notification. r=jaws 2013-08-19 21:19:03 +02:00
Georg Fritzsche
91a0ee2853 Bug 902530 - Fix contentDocument usage from test wrapper function. r=jaws 2013-08-12 22:51:09 +02:00
Georg Fritzsche
37d6680e19 Bug 887773 - Test coverage for plugin doorhanger for data URLs. r=jaws 2013-07-04 20:01:10 +02:00
Georg Fritzsche
fa93068bcf Bug 887773 - Make plugin doorhanger work for data URLs & fixup permission usage. r=gavin 2013-07-03 15:01:06 +02:00
Dão Gottwald
226c42acf1 Bug 894877 - permissions.js onRadioClick tries to pass a host string to SitePermissions.remove, needs to be an nsIURI instead. r=jaws 2013-07-19 23:15:35 +02:00
Robert Strong
11c04bdaa0 Wallpaper fix - Bug 895473 - [Mac and Linux] Custom distribution settings for yahoo de and es distributions are not being set. r=mconnor 2013-07-19 13:17:29 -07:00
Benjamin Smedberg
27f7f96417 Bug 888292 - De-emphasize the plugin icon in the address bar when it doesn't need to catch the user's attention. With this change, the only time the icon will be "alert blue" is when a plugin is click-to-activate and it's too small to show the overlay inline in the page. Icons provided by shorlander. ui-review=lco r=jaws
--HG--
extra : rebase_source : 29f8c8ad4fd0234f1d2bf14451416ac7f744c6fb
2013-07-19 10:02:48 -04:00
Benjamin Smedberg
dd57b47a65 Bug 889788 - Plugin doorhanger breaks when plugins are dynamically removed from a page. This implements the short-term solution of hiding the plugin doorhanger when no more plugins are on the page (the better long-term solution will keep showing the UI and track all the plugins a page ever uses). This also implements a short-term solution when a user enables a plugin. Also bug 887088 - Short-term UI solution: when a user loads multiple tabs from a site and enables a plugin on one of them, the plugins are not enabled on other tabs but the "continue allowing" button does nothing. This patch makes the "Continue Allowing" button enable existing plugins of that type. r=jaws r=jschoenick
--HG--
extra : rebase_source : a60ae3259579ea63d51921dc3c70836da2d7ab3a
2013-07-19 10:02:48 -04:00
Benjamin Smedberg
67d9f93f74 Bug 888908 - When the location bar is missing, don't auto-popup the plugin notification (ever). It will still pop up when clicking the in-page UI. And Australis will make this code moot anyway, r=jaws
--HG--
extra : rebase_source : 71a035bf35cd8bb7910d54c34df073c3daf654e7
2013-07-19 10:02:47 -04:00
Adam Dane [:hobophobe]
8388fc5f15 Bug 894381 - FindBar buttons should be enabled when moving tab between windows. r=dao 2013-07-18 15:00:46 -05:00
Marco Bonardo
ce228a3c10 Bug 895288 - Stop loading earlier in browser_aboutHome.js to avoid console spam of Google css warnings
r=ttaubert
2013-07-19 15:51:37 +02:00
Daniel Holbert
72a9f5a162 Bug 895137 - Declare updateSearchEngine with "let" instead of "function", to fix strict JS warning. r=mak 2013-07-18 17:13:32 -04:00
Erik Vold
f887d05a95 Bug 885054 - Sidebars should not migrate across private / non-private window. r=gavin 2013-07-09 13:21:23 -07:00
Tom Schuster
c3a3b8fa79 Bug 868859 - Make chromeWindow.content work in e10s. r=bz 2013-05-08 23:16:46 +02:00
Avi Halachmi
9f7a23fefe Bug 766546 - Add debug print before intermittent failure line. 2013-07-24 15:26:58 +03:00
Jared Wein
a05c3a6714 Bug 887515 - Replace multiple tab closing prompt with a menuitem to restore multiple tabs. r=ttaubert
--HG--
extra : rebase_source : 743b8bb459802675e38ef2ab8e8cee2c41b90f90
2013-07-17 18:48:39 -04:00
Ryan VanderMeulen
97083e557a Backed out 4 changesets (bug 893858, bug 868859, bug 886903) for Linux debug mochitest-other crashes on a CLOSED TREE.
Backed out changeset 0ded4854067b (bug 886903)
Backed out changeset ca8afb897e13 (bug 893858)
Backed out changeset c15f503a96cc (bug 868859)
Backed out changeset 6a788f399a7f (bug 868859)
2013-07-17 12:43:59 -04:00
Ryan VanderMeulen
c11458053c Backed out 3 changesets (bug 889480, bug 889788, bug 888908) for mochitest-bc orange.
Backed out changeset d1c616745325 (bug 889788)
Backed out changeset 6fe281a19554 (bug 888908)
Backed out changeset 9b855bab8073 (bug 889480)
2013-07-17 11:34:25 -04:00
Tom Schuster
46fe724e6d Bug 868859 - Make chromeWindow.content work in e10s. r=bz 2013-05-08 23:16:46 +02:00
Benjamin Smedberg
c5b25497ec Bug 889788 - Plugin doorhanger breaks when plugins are dynamically removed from a page. This implements the short-term solution of hiding the plugin doorhanger when no more plugins are on the page (the better long-term solution will keep showing the UI and track all the plugins a page ever uses). This also implements a short-term solution when a user enables a plugin. Also bug 887088 - Short-term UI solution: when a user loads multiple tabs from a site and enables a plugin on one of them, the plugins are not enabled on other tabs but the "continue allowing" button does nothing. This patch makes the "Continue Allowing" button enable existing plugins of that type. r=jaws r=jschoenick
--HG--
extra : rebase_source : 4b24a6d5bf3b5c33b1e19702eca676b340b5d8b1
2013-07-17 09:21:02 -04:00
Benjamin Smedberg
d87022fde3 Bug 888908 - When the location bar is missing, don't auto-popup the plugin notification (ever). It will still pop up when clicking the in-page UI. And Australis will make this code moot anyway, r=jaws
--HG--
extra : rebase_source : 69b7a078b7202a9806eaa33829d6107062e5a589
2013-07-17 09:21:02 -04:00
Drew Willcoxon
69e6040fcb Bug 897428 - Fix JS error "markupDocumentViewer is undefined" in browser-fullZoom.js. r=gavin 2013-08-08 20:36:15 -07:00
Bill McCloskey
7fa594f564 Back out bug 899222 because of bug 903208.
--HG--
rename : browser/modules/AboutHome.jsm => browser/modules/AboutHomeUtils.jsm
2013-08-08 18:26:37 -07:00
Tom Schuster
b47a41208b Bug 897062 - Handle special clicks in e10s. r=felipe,smaug 2013-08-08 20:16:47 -04:00
Bill McCloskey
ee955cbed2 Bug 903184 - Disable more fullZoom code in electrolysis (r=felipe) 2013-08-08 17:01:08 -07:00
Bill McCloskey
d4fca31a8d Bug 902695 - Implement openURIInFrame in nsBrowserAccess (r=felipe) 2013-08-08 14:01:45 -07:00
Georg Fritzsche
2b53d9b2ea Bug 920927 - Fix plugin overlay handling. r=neil 2013-10-15 10:35:49 +02:00
Marco Bonardo
61632cbb93 Bug 890409 - Re-enable browser_aboutHome.js but ignoring uncaught exceptions.
r=ttaubert
2013-07-13 11:35:49 +02:00
Dão Gottwald
61a77b682a Bug 892378 - Let SitePermissions.jsm handle indexedDB's special use of UNKNOWN_ACTION and ALLOW_ACTION. r=jaws 2013-07-16 09:59:34 +02:00
Mark Hammond
f52961066d Bug 893683 - checkSocialUI is too verbose when running social tests. r=mixedpuppy
--HG--
extra : rebase_source : 04bf69f16ab42f873f7e6cf7361a6735484748e3
2013-07-16 13:32:19 +10:00
Matthew Noorenberghe
9e0093f0ee Bug 894188 - "resetSupported is not defined" in safe mode dialog. r=jaws 2013-07-15 21:09:00 -07:00
Jared Wein
32bfdc4d99 Backed out changeset 6d739868bd90 (bug 887515) for leaking windows on a CLOSED TREE. 2013-07-15 21:39:32 -04:00
Jared Wein
ed0f7b1b32 Bug 887515 - Replace multiple tab closing prompt with a menuitem to restore multiple tabs. r=ttaubert 2013-07-15 17:13:22 -04:00
David Keeler
88627f23d7 bug 886995 - wait for the popup to be populated in browser_CTP_drag_drop.js r=bsmedberg 2013-07-10 16:26:30 -07:00
Dão Gottwald
769324fbeb Bug 893424 - Replace XULBrowserWindow's broken _hostChanged logic. r=jaws
--HG--
extra : rebase_source : b91d7affbca2e7f8df688c158ab75665abe43c14
2013-07-15 17:58:09 +02:00
Shane Caraveo
b099b84d1d bug 872605 add ability to update provider manifest, r=markh 2013-07-03 10:24:16 -07:00
Ryan VanderMeulen
c8d12c6d14 Merge m-c to fx-team. 2013-07-12 13:34:44 -04:00
Tim Taubert
437ad6d1d8 Bug 890409 - Disable browser_aboutHome.js for intermittent failures; rs=mak 2013-07-12 14:59:18 +02:00
Tim Taubert
46d108806e Bug 867550 - Make browser_aboutHome.js not fail if it starts before but runs past midnight; r=mak 2013-07-12 11:03:00 +02:00
Ryan VanderMeulen
f6c978d15f Merge m-c to inbound. 2013-07-11 10:59:21 -04:00
Tim Taubert
a90c2e6537 Bug 879375 - Add SessionStore.getWindowDimensions() and tabPreviews.capture() to the reflow exclusion list; r=dao 2013-07-11 12:40:23 +02:00
Ed Morley
bbef1fe93c Merge latest green fx-team changeset and mozilla-central 2013-07-11 10:12:37 +01:00
Tim Taubert
cb56fa3dc0 Bug 891806 - part 1 - replace 'yield;' with 'yield undefined;' in browser/; r=jaws 2013-07-10 23:52:04 +02:00
Jared Wein
eb9a2230f8 Bug 882977 - Identity state of IDENTITY_MODE_UNKNOWN is set for about:home when a new window is created. r=dao
--HG--
extra : rebase_source : 9c5e5f06645018333515dba89d4fc84cf9445338
2013-07-09 15:23:51 -04:00
Jared Wein
b77c2cf7c2 Bug 885965 - Change browser_typeAheadFind.js to use load event instead of pageshow event. r=ttaubert
--HG--
extra : rebase_source : 4a5debbc10c50f41c7bbd5c45191daa152189997
2013-07-10 14:38:04 -04:00
Jared Wein
d7a6e76996 Bug 891721 - Add some sanity to the ordering of the tests in browser/base/content/test. r=ttaubert
--HG--
extra : rebase_source : 82e076e20b15d6a1518caba5d4f5e3b8618f9050
2013-07-10 14:15:35 -04:00
Mike de Boer
66757c1a9a Bug 869543: move findbar to the top. r=dao 2013-07-11 12:44:34 +02:00
Ed Morley
20148ab4c5 Merge mozilla-central and inbound 2013-07-11 10:59:11 +01:00
Adam Dane [:hobophobe]
69e0ae9e86 Bug 891638 - "Highlight All" button does not persist when switching tabs. r=dao 2013-07-10 16:53:34 -05:00
Tom Schuster
b8f2deb604 Bug 666809 - Support SecurityUI in e10s mode. r=felipe f=gavin 2013-07-09 22:45:07 -04:00
Ryan VanderMeulen
04c5cd4cb2 Backed out changeset f900daf35771 (bug 785487) for suspicion of causing OSX mochitest-1 leaks. 2013-07-09 17:25:06 -04:00
Drew Willcoxon
5af410f320 Bug 880226 - Fix intermittent browser_bug386835.js by improving browser-fullZoom.js's async handling. r=mak 2013-07-09 14:12:43 -07:00
Adam Dane [:hobophobe]
ca547efa98 Bug 892384 - When switching to a tab with an open find bar, focus it. r=dao
--HG--
extra : rebase_source : b55d5a749c8349552fdcebd531da893bebe18007
2013-07-11 18:42:34 -05:00
Gavin Sharp
511250c5ce Bug 785487: have AboutHomeUtils use the asynchronous search API, r=mikedeboer
--HG--
extra : transplant_source : o%00%28%00%0A%F1%B4%97L%EA%82%D9%0E%1An%B9m%8B%2C%40
2012-11-29 21:51:17 -08:00
Dão Gottwald
7967122e9c Bug 889835 - Use SitePermissions.jsm as the backend for Page Info's Permissions tab. r=jaws 2013-07-09 14:44:41 +02:00
Adam Dane [:hobophobe]
ebe2053c43 Bug 537013 - Make the find bar exist on a per-tab basis. r=dao 2013-07-06 02:56:36 +02:00
Shane Caraveo
64fe484a43 bug 860421 fix intermittent failure in chat tests, r=markh 2013-07-04 19:21:27 -07:00
Dão Gottwald
a2eaa727fc Bug 889770 - permissions.js onRadioClick tries to pass an nsIURI to nsIPermissionManager::remove, needs to be the host string instead. r=bsmedberg 2013-07-04 23:22:50 +02:00
Florian Quèze
42c0bf7a13 Bug 888336 - chat title not displayed after tearing off and reattaching a chat window, r=mixedpuppy. 2013-07-04 12:12:24 +02:00
Tanvi Vyas
789d2aec6e Bug 838402 - update a test case with the new identity mode for mixed display content. r=dolske 2013-07-03 15:14:17 -07: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
Gavin Sharp
845a41e24f Bug 880101: attempt #2 at fixing an intermittent orange, wait a bit longer before trying to check the location bar in a new window 2013-07-03 11:36:45 -07:00
Ivan Alagenchev
3ef3be62a6 Bug 838396 - Don't set hasMixedDisplayContentLoaded and hasMixedDisplayContentBlocked flag in nsMixedContentBlocker.cpp. r=smaug, r=bz 2013-08-29 16:46:25 -04:00
Marco Bonardo
0d71f246d1 Bug 789348 - Convert about:home storage to indexedDB.
r=adw
2013-07-03 03:01:29 +02: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
Jared Wein
c4589c18b9 Bug 889154 - Move the addition of the MozApplicationManifest event listener to delayedStartup. r=mixedpuppy
--HG--
extra : rebase_source : d23902fed526ec6f8afd5989aad448365fa5bf3d
2013-07-01 20:33:19 -04: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
Raymond Lee
09d5621e94 Bug 846635 - Use asynchronous getCharsetForURI in getShortcutOrURI. r=mano 2013-06-25 09:26:22 +08:00
Steven MacLeod
a6a563980d Bug 570266 - Use the forms baseURI instead of the document URI. r=gavin 2013-07-01 09:24:32 -04:00
Gijs Kruitbosch
e7a8433373 Bug 888746 - browser_bug422590.js should enable location bar, r=dao 2013-07-01 13:55:08 +02:00
Dão Gottwald
69dc25e5a0 Backed out changeset 7965d384123c 2013-07-01 11:33:28 +02:00
Gijs Kruitbosch
6c31704cd7 Bug 888746 - Fix JS error on toolbarless windows, r=MattN 2013-06-30 22:41:54 +02: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
James Kitchener
95c4981499 Bug 802895 - hide frame menu options for srcdoc iframes r=gavin 2013-06-28 23:13:23 -04:00
Blake Kaplan
89a72a5347 Bug 872317 - Make the download indicator toolbar button work with the changes in bug 653881. r=mak77
--HG--
extra : rebase_source : 10c15e0779da5e645584543ef4a642ae341a00be
2013-05-14 16:41:24 -07:00
Benjamin Smedberg
b40155b348 Bug 886940 - single outdated plugin UI uses the wrong string, r=captainobvious 2013-06-28 15:42:04 -07: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
Dão Gottwald
f66a27a210 Bug 888180 - move identity-popup back from popup-notifications.inc to browser.xul, as it's not a popup notification. r=jaws 2013-06-28 16:22:57 +02:00
Marco Bonardo
9e94719e9b Bug 888031 - Remove about:home from tests not explicitly requiring it.
r=ttaubert
2013-06-28 09:02:19 -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
Marco Bonardo
378896a757 Bug 791776 - Convert inline autocomplete host query to async.
r=mano
2013-06-27 12:43:11 -04:00
Florian Quèze
8878fab468 Bug 887314 - The camera icon is distorted on a retina screen, r=mixedpuppy. 2013-06-27 15:20:18 +02:00
Dão Gottwald
be21e03297 Bug 887171 - browser-fullZoom.js puts MOUSE_SCROLL_ZOOM into the global scope, should be private instead. r=mak 2013-06-26 18:07:14 +02:00
Dão Gottwald
844b028584 Bug 887167 - Undo global-scope pollution from browser-plugins.js. r=jaws
--HG--
extra : rebase_source : 45aa63c4fa5ae7ed65211ad294882f33cad449d5
2013-06-26 15:56:29 +02:00
Dão Gottwald
ce4dab6a7e Bug 887165 - Remove the unused primary-button class. r=bsmedberg
--HG--
extra : rebase_source : cf476ec6c232f9f754201356ea8dab413752730f
2013-06-26 15:56:12 +02:00
Shane Caraveo
b749138852 bug 869278 fix intermittent mozSocial test failure, r=felipe 2013-06-25 13:04:30 -04:00
Shane Caraveo
02f4f0c46c bug 886086 fix intermittent test failure in chat window tests, r=felipe 2013-06-25 14:31:28 -04:00
Shane Caraveo
e40687f872 bug 886072 fix intermittent test failure in chat window tests, r=felipe 2013-06-25 12:32:33 -04:00
Marco Bonardo
bf97a56518 Bug 877748 - Make it possible to open the Library with a given hierarchy
r=mano
2013-06-25 13:59:25 -04:00
Shane Caraveo
cc5f6c7d4f bug 886300 fix intermittent orange in blocklist test, r=markh 2013-06-25 10:04:31 -04:00
Benjamin Smedberg
5bd3e02512 Bug 880735 part S - Basic styling so that this can land - add classes to the binding for styling hooks and fix space handling. Make the buttons fill the space, limit the doorhanger size, and add whitespace/separators for the multi-plugin UI, r=jaws 2013-06-24 08:51:08 -04:00
Benjamin Smedberg
82eede8f1b Bug 880735 test fixups:
* Add a test-only setter to the center-item XBL binding
* add a head.js function to remove plugin permissions for use in cleanup functions
* browser_pluginnotification.js - lots of fixes for the core feature tests
* Alter test_bug751809 not to assume that clicking the page overlay will directly activate the plugin
* Alter browser_CTP_plugins.js because disabled plugins now do show up in the plugin doorhanger
* remove browser_CTPScriptPlugin.js and supporting files because we no longer auto-pop based on scripting
* fix browser_CTP_drag_drop.js so that active plugins still show the doorhanger icon, and other fixup
* fix browser_bug743421.js to expect the doorhanger all the time and activate it correctly
* fix browser_bug752516.js to check for doorhanger activation instead of plugin activation
* remove browser_bug818009.js and supporting files because they are testing something that no longer exists
* alter browser_bug820497.js so that it shows the popup notification before checking .centerActions, since we populate that data lazily now
* browser_plugins_added_dynamically.js: remove the "activate all" tests which are no longer relevant and fix the rest to match the new doorhanger structure.
2013-06-24 08:51:07 -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
Phil Ringnalda
1888baab70 Back out 9661a68f0bff (bug 872605) for browser-chrome failures 2013-06-23 23:41:33 -07:00
Shane Caraveo
8c07c6d156 bug 872605 add ability to update provider manifest, r=markh 2013-06-23 16:02:07 -04:00
Shane Caraveo
c59b1b73c6 bug 883346 permissions support for standalone chat window, r=felipe 2013-06-21 19:17:34 -07:00
Phil Ringnalda
7f542efd72 Merge m-i to m-c 2013-06-23 15:10:04 -07:00
Victor Porof
4ee9d109a8 Merge fx-team to m-c 2013-06-23 19:00:17 +03:00
Ms2ger
2f319776c1 Merge m-c to m-i. 2013-06-23 13:44:01 +02:00
Ms2ger
2c937acc56 Bug 882848 - Use MOCHITEST_BROWSER_FILES more; r=gps 2013-06-23 09:16:19 +02:00
Ms2ger
3ac11adced Bug 766546 - Undisable test on non-mac platforms; r=edmorley 2013-06-23 09:16:10 +02:00
Robert Strong
839d0ab269 2. browser patch - Bug 843497 - Update check says 'up to date' for out of date versions on unsupported OS versions. r=bbondy 2013-06-22 13:37:12 -07:00
Girish Sharma
28cc1aee31 Bug 873848 - Make the developer toolbar consistent with Toolbox design, r=jwalker, paul, jaws 2013-06-21 19:24:35 +03:00
Tim Taubert
34c3e0a545 Bug 881590 - Don't cancel loads when preloading in the hiddenWindow; r=jaws 2013-06-17 19:46:55 +02:00
Ed Morley
72d802aad2 Merge mozilla-central and fx-team 2013-06-21 15:46:24 +01: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
Wes Kocher
95577b488c Merge m-c with inbound 2013-06-19 16:46:01 -07:00
Wes Kocher
7b638627c9 Merge inbound to central 2013-06-19 16:37:58 -07:00