wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
174,904 Commits 1 Branch 165 Tags 1.2 GiB
51bdac3e31
Commit Graph

8035 Commits

Author SHA1 Message Date
Mike de Boer
592478a9e8 Bug 326743: update tests to know about the Find Clipboard on OSX. r=Unfocused 2014-02-14 11:38:28 +01:00
Mike de Boer
4615d6a5e7 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
Chris Peterson
069fc4f91d Bug 972700 - Change "New OOP Window" menu item to "New e10s Window". r=billm 2014-02-13 18:27:25 -08:00
Wes Kocher
ee5da0ab00 Merge m-c to inbound on a CLOSED TREE 2014-02-13 18:50:08 -08:00
Wes Kocher
6b9cee2347 Merge fx-team to m-c 2014-02-13 17:28:56 -08:00
Ryan VanderMeulen
5f1c68be91 Bug 967013, bug 926729 - Skip browser_contextSearchTabPosition.js on OSX for intermittent timeouts. 2014-02-13 12:43:27 -05:00
Ryan VanderMeulen
34028d41cb Bug 857427 - Skip browser_save_link-perwindowpb.js due to frequent timeouts. 2014-02-13 12:39:48 -05:00
Tim Taubert
549556014b Bug 971685 - Remove workaround from bug 880101 now that the initial tab's docShell isn't created lazily anymore r=gavin 2014-02-12 14:52:20 +01:00
Tim Taubert
7093e4bf7f Bug 969656 - "Sign in again" menu panel UI should link directly to the sign-in page, rather than preferences r=gavin 2014-02-11 15:38:48 +01:00
Gijs Kruitbosch
40026e71d5 Backed out changeset 113b3bb5ba8c (bug 969376) for m-bc orange on a CLOSED TREE 2014-02-12 21:53:29 +00:00
Wes Kocher
78c6a2150a Merge m-c to fx-team 2014-02-13 18:13:31 -08:00
Jared Wein
83d0a2c23e Bug 968828 - [Australis] Sync Icon for the horizontal menu. r=Gijs 2014-02-13 18:44:05 -05:00
Gijs Kruitbosch
6ef383e540 Bug 969376 - correctly size Australis' menu button, make it hug right border on Windows and Linux, r=jaws 
--HG--
rename : browser/base/content/test/general/browser_backButtonFitts.js => browser/base/content/test/general/browser_menuButtonFitts.js
 2014-02-11 19:31:43 +00:00
Mark Hammond
2d34a74781 Bug 968435 - prevent sync panels from appearing on top of other applications. r=ttaubert 2014-02-14 09:18:47 +11:00
Mark Hammond
27603312de Bug 965472 - about:accounts should open a new tab to display legacy sync info. r=ttaubert 2014-02-14 09:08:37 +11:00
Mark Hammond
4ae70c0b14 Bug 972144 - don't show error notification for LOGIN_FAILED_NOT_READY. r=ttaubert 2014-02-14 09:06:33 +11:00
Gijs Kruitbosch
c33979d114 Bug 969376 - correctly size Australis' menu button, make it hug right border on Windows and Linux, r=jaws 
--HG--
rename : browser/base/content/test/general/browser_backButtonFitts.js => browser/base/content/test/general/browser_menuButtonFitts.js
extra : rebase_source : 598279d26ffe3d95f62e458e39ef41b5ec1a505a
 2014-02-11 19:31:43 +00:00
Ryan VanderMeulen
e9998941e7 Merge inbound to m-c. 2014-02-12 08:37:35 -05:00
Gijs Kruitbosch
5e324e2b29 Backed out changeset 9b5f75a2463d (bug 969376) for mochitest-bc orange 2014-02-12 01:05:26 +00:00
John Schoenick
bf4f7f7755 Bug 967694 - Fix tests that expect old behavior. r=bsmedberg 2014-02-11 12:14:42 -08:00
Ryan VanderMeulen
7a1c0e3e51 Merge m-c to inbound. 2014-02-13 10:31:44 -05:00
Ted Mielczarek
23e1ddca5b Bug 968837 - Move more Mochitests into manifests. r=jmaher 
--HG--
rename : toolkit/components/places/tests/browser/bug_399606/399606-history.go-0.html => toolkit/components/places/tests/browser/399606-history.go-0.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-httprefresh.html => toolkit/components/places/tests/browser/399606-httprefresh.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-location.reload.html => toolkit/components/places/tests/browser/399606-location.reload.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-location.replace.html => toolkit/components/places/tests/browser/399606-location.replace.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-window.location.href.html => toolkit/components/places/tests/browser/399606-window.location.href.html
rename : toolkit/components/places/tests/browser/bug_399606/399606-window.location.html => toolkit/components/places/tests/browser/399606-window.location.html
rename : toolkit/components/places/tests/browser/visituri/begin.html => toolkit/components/places/tests/browser/begin.html
rename : toolkit/components/places/tests/browser/visituri/final.html => toolkit/components/places/tests/browser/final.html
rename : toolkit/components/places/tests/browser/visituri/redirect_once.sjs => toolkit/components/places/tests/browser/redirect_once.sjs
rename : toolkit/components/places/tests/browser/visituri/redirect_twice.sjs => toolkit/components/places/tests/browser/redirect_twice.sjs
rename : toolkit/components/places/tests/browser/settitle/title1.html => toolkit/components/places/tests/browser/title1.html
rename : toolkit/components/places/tests/browser/settitle/title2.html => toolkit/components/places/tests/browser/title2.html
rename : toolkit/components/places/tests/mochitest/bug94514-postpage.html => toolkit/components/places/tests/bug94514-postpage.html
rename : toolkit/components/places/tests/mochitest/test_bug_411966.html => toolkit/components/places/tests/test_bug_411966.html
rename : toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html => toolkit/components/places/tests/test_bug_461710_perwindowpb.html
rename : toolkit/components/places/tests/mochitest/test_bug_94514.html => toolkit/components/places/tests/test_bug_94514.html
 2014-02-06 15:37:30 -05:00
Darren Kalck
10a5bdf991 Bug 808540 - Revert bug 724346. r=Dao 2014-02-11 17:40:34 -05:00
Gijs Kruitbosch
d7e9d728cc Bug 969376 - correctly size Australis' menu button, make it hug right border on Windows and Linux, r=jaws 
--HG--
rename : browser/base/content/test/general/browser_backButtonFitts.js => browser/base/content/test/general/browser_menuButtonFitts.js
extra : rebase_source : 340dcab974bf49f1e3abfc18e0e7217bb5803411
 2014-02-11 19:31:43 +00:00
Willian Gustavo Veiga
76ce0d32d7 Bug 644186 - Open a new window when shift-clicking the "Open a new tab" button. r=Dao 2014-02-11 13:21:58 -05:00
Sami Jaktholm
3f725b1d02 Bug 736574 - PageInfo: Fix an if-condition causing a failure to sort the media by count. r=Dao 2014-02-11 09:24:03 -05:00
Ryan VanderMeulen
2459f12ae2 Merge inbound to m-c. 2014-02-11 08:39:31 -05:00
Florian Quèze
1582bc8d1e Bug 965265 - Opening a new private window shows social provider buttons which don't do anything, r=mixedpuppy. 
--HG--
extra : rebase_source : 74d3f5fd7eea7c4c146f0eba843e7d39837c406f
 2014-02-11 08:28:25 +01:00
Bill McCloskey
0d06ea5ab8 Bug 970276 - Don't respect <link rel=""> elements from subframes (r=felipe) 2014-02-10 16:42:18 -08:00
Ms2ger
5111aca8f0 Merge m-i to m-c. 2014-02-09 10:31:55 +01:00
Jared Wein
3059b78980 Bug 966905 - [Australis] Headers and footers of subviews should be outside scrollable bits of those panels/subviews. r=Gijs 2014-02-08 18:27:56 -05:00
Gijs Kruitbosch
b8d2676580 Bug 967220 - Australis - include the tabstoolbar in things animating (with a margin), r=mconley 2014-02-08 00:27:59 +00:00
Gavin Sharp
409532397d Bug 959061 followup: remove else after return 2014-02-08 12:35:04 -08:00
Phil Ringnalda
ccc12a1098 Merge m-c to m-i 2014-02-08 19:32:35 -08:00
Bill McCloskey
fcc7cca536 Bug 961529 - Run DOMLinkHandler in a content script (r=felipe) 2014-02-08 17:41:34 -08:00
Bill McCloskey
6fe4fadbc0 Bug 961529 - Add Feeds module (r=felipe) 2014-02-08 17:41:30 -08:00
Dão Gottwald
8f44f12987 Bug 445461 - restore MRU tab order when restoring a session. r=ttaubert 2014-02-07 22:48:49 +01:00
Gijs Kruitbosch
cabeea4140 Bug 967115 - fix styling of SDK toolbar buttons in Australis, r=jaws 2014-02-07 21:36:16 +00:00
Gijs Kruitbosch
78c7330cf2 Bug 879981 - make non-removable items fade out and non-draggable and adjust their cursor for Australis, r=mikedeboer 
--HG--
extra : rebase_source : 710421b85304f29a7a01f63d72f3963a5522f9bc
 2014-02-07 18:11:55 +00:00
Carsten "Tomcat" Book
87668576b7 merge fx-team to mozilla-central 2014-02-07 09:52:32 +01:00
Blair McBride
01d398c421 Bug 952568 - [australis-measuring] Determine if Australis Update experience tab is/was active. r=mconley,MattN 2014-02-07 16:19:12 +13:00
Mark Hammond
9121a1f1c7 Bug 850721 - fix social blocklist oranges by not enabling the default update server. r=mixedpuppy 2014-02-07 12:07:04 +11:00
Dão Gottwald
f2c0ef20b1 Bug 747338 - Set last-accessed timestamp when deselecting tabs rather than when selecting them. r=ttaubert 2014-02-06 17:28:54 +01:00
Gijs Kruitbosch
634e3c6f40 Bug 899530, update comment style per review request, DONTBUILD because just comments. 2014-02-06 15:27:31 +00:00
Gijs Kruitbosch
01fd469474 Bug 899530 - adjust bookmarks drag code to not close the menu when over the menu button, r=mak 2014-02-05 17:56:04 +00:00
Carsten "Tomcat" Book
bf2725f713 Backed out changeset 8c4807bfdd2a (bug 965265) for browser-chrome bustage on a CLOSED TREE 2014-02-06 14:55:46 +01:00
Florian Quèze
6d0e07de2f Bug 965264 - Opening a new window shows original provider buttons, not updated ones, r=mixedpuppy. 2014-02-06 13:04:56 +01:00
Florian Quèze
460eb5df8e Bug 965265 - Opening a new private window shows social provider buttons which don't do anything, r=mixedpuppy. 2014-02-06 13:03:05 +01:00
Ryan VanderMeulen
84cac0677c Merge m-c to fx-team. 2014-02-05 16:14:03 -05:00
Ryan VanderMeulen
8a68d16b9a Merge fx-team to m-c. 2014-02-05 15:31:20 -05:00
Gijs Kruitbosch
cb6c14d79c Bug 968384 - make the bookmarks item not say 'undefined' in the overflow menu, r=mconley 2014-02-05 20:30:03 +00:00
Masayuki Nakano
6c4b21dba7 Bug 966612 part.2 Add tests on printpreview UI r=enndeakin 2014-02-06 00:14:36 +09:00
Carsten "Tomcat" Book
a6ae27b8f3 merge fx-team to mozilla-central 2014-02-05 13:28:00 +01:00
Carsten "Tomcat" Book
7ba25aaf1f merge b2g-inbound to mozilla-central 2014-02-05 13:23:25 +01:00
Gregor Wagner
07ac8d510a [Bug 967342] Server not found pages have '&f=regular' appended to url. r=bz 2014-02-05 07:57:16 +01:00
Mike Conley
8ecdc81f92 Bug 930094 - [Australis] Browser windows sometimes have the nav-bar drawn in the titlebar. r=dao, Gijs. 
* * *
Fix for 930094
* * *
Fix because WTF
 2014-02-04 16:17:00 -05:00
Mike Conley
59f0e1b473 [Australis] Backout cbe26a93c79b (bug 930094) for test failures. 2014-02-04 18:46:38 -05:00
Ryan VanderMeulen
4fb42adba3 Merge m-c to inbound on a CLOSED TREE. 2014-02-06 16:29:41 -05:00
Alex Henrie
3e11665fc2 Bug 968029 - Use unprefixed box-sizing in browser/ and toolkit/. r=dao 2014-02-04 21:36:29 -07:00
Carsten "Tomcat" Book
23a4962c96 Merge mozilla-central to fx-team on a CLOSED TREE 2014-02-05 14:54:11 +01:00
Mark Hammond
688b772266 Bug 967313 - ensure Sync is initialized before we set the fxAccounts user. r=ttaubert. 2014-02-05 16:09:54 +11:00
Mark Hammond
90f8c0084e Bug 967350 - openSignInAgainPage() now opens about:accounts?action=reauth. r=ttaubert 2014-02-05 09:11:20 +11:00
Mike Conley
0d1b2a95ae Bug 930094 - [Australis] Browser windows sometimes have the nav-bar drawn in the titlebar. r=dao, Gijs. 2014-02-04 16:56:07 -05:00
Darrin Henein
89fc15c00b Bug 931343: Australis - Implement bookmarking animation. r=mak 2014-02-03 08:42:00 +00:00
Gijs Kruitbosch
b06e5d1dec Bug 966572 - Australis: always initialize itemIds and continue nullchecking this.star, r=mak 
--HG--
extra : rebase_source : 4a962cafe58bdc9d0578df35920009c89a5a86fd
 2014-02-03 14:36:00 +00:00
Gijs Kruitbosch
744c324239 Bug 964217 - fix search item insertion in Australis customization mode, r=Unfocused 2014-02-03 10:48:21 +00:00
Phil Ringnalda
e4780f4d1d Merge m-i to m-c 2014-02-02 17:43:48 -08:00
Mark Hammond
1f90f9e85c Bug 966823 - ensure checking if there is a login error doesn't initialize sync too early. r=ttaubert 2014-02-03 10:47:35 +11:00
Phil Ringnalda
c5dc604bcf Bug 958026 - Skip browser_aboutAccounts.js on Linux where it times out and takes out hundreds of other tests 
--HG--
extra : rebase_source : 4bbef7e2920ca68bfc5f74baff3fc0df92ff1234
 2014-02-02 11:56:34 -08:00
Gijs Kruitbosch
eb7968ef84 Bug 940116 - fix tabview button tooltip for Australis, r=jaws 2014-02-01 23:27:54 +00:00
Ryan VanderMeulen
29be9956f3 Merge b2g-inbound to m-c. 2014-02-01 17:22:20 -05:00
Michael Henretty
f13afb7990 Bug 959800 - [Offline] mozbrowser iframes don't display correct offline content. r=fabrice, bz 2014-01-30 15:06:34 -08:00
Shane Caraveo
1e8dd4410e bug 963961 fix intermittent blocklist failure, r=felipe 2014-01-31 11:46:04 -08:00
Tim Taubert
8204a4c5b7 Bug 964922 - Enable FxA Sync on Nightly r=markh 2014-01-30 12:09:12 -08:00
Zachary Carter
920a69f870 Bug 965117 - Custom fonts on about:accounts and other visual/string tweaks. r=ttaubert 2014-01-31 16:50:55 -08:00
Gavin Sharp
334366f5e6 [Australis] portion of bug 966511: rename gFxAccount.toggle to gFxAccount.onMenuPanelCommand, r=ttaubert 
--HG--
extra : rebase_source : 999ac3977c3c6f1d397689489b8d9fe8d740c822
 2014-01-31 17:27:51 -08:00
Gavin Sharp
970320af84 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
Mark Hammond
bf712b98a7 Bug 966520 - have sync prefs pane open the new "force sign in" page. r=gavin 2014-01-31 17:27:59 -08:00
Tim Taubert
4f99e7ab63 Bug 966546 - [Australis] Doorhanger should slide and have the right anchor position r=gavin 2014-01-31 16:09:22 -08:00
Gijs Kruitbosch
d10d2aeff4 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
Mike Conley
c3a2be57cc Bug 962677 - [Australis] Use content-deck and toolbar margins for the customize mode transition. r=jaws, Gijs (for test fix). 2014-01-31 11:28:35 -05:00
Neil Deakin
6c8876f120 Bug 943759, [Australis], support mousethrough on panels to allow mouse events to pass through to the content behind, implemented on Windows, Mac and Linux, use this for the UI tour highlight, r=neil,jmathies,karlt 2014-01-31 08:27:43 -05:00
Gavin Sharp
c95eab1028 Bug 966134: merge warning dialog should mention new email, not old email, and we should avoid storing the plaintext of signed-in users forever, r=markh 
--HG--
extra : rebase_source : cee71c3201ee6fffc477d2cced50e0df567a0976
 2014-01-30 19:05:24 -08:00
Tim Taubert
271d1a3311 Bug 965641 - [Australis] prompt user to sign-in again UI in the menu panel r=markh 2014-01-29 19:06:50 -08:00
Tim Taubert
ed5b41b5a4 Bug 964349 - Follow-up: use gCrashReporter instead of Services.appinfo r=bustage 2014-01-30 18:53:35 -08:00
Blair McBride
c59b88a52f Bug 958673 - [Australis] UITour: Style doorhanger menu for Australis Update Tour. r=MattN 2014-01-31 15:25:45 +13:00
Tim Taubert
8ea100c83c Bug 965607 - [Australis] Show FxA doorhangers only for the most recent non-popup browser window r=markh 2014-01-30 11:15:46 -08:00
Tim Taubert
d6169d2f35 Backed out [Australis] changeset 7560f1dfaa97 (bug 965641) 2014-01-30 17:44:58 -08:00
Tim Taubert
728d3be342 Backed out [Australis] changeset 1471e8762222 (bug 965607) 2014-01-30 17:44:56 -08:00
Tim Taubert
107799a35a Bug 964349 - Move CrashReporter.annotateCrashReport() calls out of sessionstore r=gavin 2014-01-27 08:45:28 -08:00
Wes Kocher
8d1cf2aa7f Backed out changeset 066920d21e0e (bug 964349) for breaking browser-chrome tests 2014-01-30 17:35:36 -08:00
Gijs Kruitbosch
eff80ac96f 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
d2d47fe5ab Bug 964349 - Move CrashReporter.annotateCrashReport() calls out of sessionstore r=gavin 2014-01-27 08:45:28 -08:00
Tim Taubert
ce2eec58a6 Bug 965607 - [Australis] Show FxA doorhangers only for the most recent non-popup browser window r=markh 2014-01-30 11:15:46 -08:00
Tim Taubert
f6444f91a7 Bug 965641 - [Australis] prompt user to sign-in again UI in the menu panel r=markh 2014-01-29 19:06:50 -08:00
Ryan VanderMeulen
646caf3be2 Merge m-c to fx-team. 2014-01-30 16:40:31 -05:00
Ryan VanderMeulen
51a0bb8010 Merge fx-team to m-c. 2014-01-30 16:23:01 -05:00
Ryan VanderMeulen
e9242b922c [Australis] Backed out changeset da8776bc458e (bug 962677) for mochitest-bc failures. 2014-01-30 14:22:17 -05:00
Gavin Sharp
8023cb3723 Bug 965703: bump string names after string change, r=markh 
--HG--
extra : rebase_source : 967d49f86494a94542b55563cd1440ac25980d29
 2014-01-30 10:22:14 -08:00
Tim Taubert
867f7f9e57 Bug 965544 - Show "now syncing" doorhanger when sync actually starts, once per login r=markh 2014-01-29 12:41:07 -08:00
Francesco Lodolo (:flod)
5a7b1b2664 Bug 947353 - Use proper plural form for tabs.closeWarningMultipleTabs. r=dao 2014-01-30 13:07:15 -05:00
Drew Willcoxon
7a78d7b217 Bug 856595 - Fix intermittent failure in test_wheel_default_action.html. r=mikedeboer 2014-01-30 09:20:37 -08:00
Mike Conley
3752acb6e8 Bug 962677 - [Australis] Use content-deck and toolbar margins for the customize mode transition. r=jaws. 2014-01-30 12:16:19 -05:00
Henri Sivonen
750178f54e Bug 959061 - Have only one "Chinese, Simplified" item in the Character Encoding menu. r=Unfocused. 2014-01-30 14:39:25 +02:00
Tim Taubert
af9fd88910 Bug 958026 - Fix intermittent browser_aboutAccounts.js timeouts r=zaach 2014-01-29 06:57:42 -08:00
Zachary Carter
d0056eabbb 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
0f268638e2 Bug 936442 - part 1: refactor CharsetMenu to allow Australis code to use it, r=Unfocused 2014-01-27 11:56:04 +00:00
Mark Hammond
e595dddc14 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
b9974ecc39 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
750a66cd18 [Australis] Bug 963095: adjust toolbar widget panel styling. r=Gijs 2014-01-29 12:20:40 +01:00
Tim Taubert
37e4e5c3f2 Bug 964929 - [Australis] Implement doorhanger for sync errors r=gavin 2014-01-28 17:54:36 -08:00
Tim Taubert
2fd6d7c401 Bug 963384 - Implement modal "Choose What To Sync" dialog r=markh 2014-01-28 18:57:19 -08:00
Tim Taubert
02440deee8 Bug 963384 - [Australis] Don't show doorhanger when sync customization dialog will be shown r=markh 2014-01-28 18:54:01 -08:00
Zachary Carter
ff42bd5929 Bug 965024 - Fix legacy Sync URL on about:accounts intro screen. r=markh 2014-01-28 18:19:31 -08:00
Mark Hammond
bce353b88e Bug 959990 - Add Firefox Accounts specific TOS and PP prefs and have utils functions open them if appropriate. r=rnewman. 2014-01-28 17:51:08 -08:00
Bill McCloskey
e079e637f1 Bug 967876 - [e10s] Don't access docshell from WindowIsClosing (r=dao) 2014-02-04 18:17:16 -08:00
Paolo Amadini
469a445e55 Bug 942620 - The "quit-application-requested" notification is sent twice when closing the last tab. r=Dao 2014-02-10 15:54:10 -05:00
Bill McCloskey
043f3727d4 Bug 947908 - [e10s] Middle clicking in about:newtab should open a new tab (r=felipe) 2014-02-13 16:04:01 -08:00
Tim Taubert
6571b57f2e Bug 957460 - [Australis] Add Firefox Accounts widget for customization panel r=gijs,markh 2014-01-10 19:32:11 +01:00
Tim Taubert
98bf23dbea Bug 957229 - Don't show about:accounts with FxA disabled r=markh 2014-01-28 14:36:00 -08:00
Neil Deakin
95de2e33ba Bug 941409, add support for an anchor attribute to menus so that the popup can be anchored to a different element than the menu itself, this is used to avoid repositioning the bookmarks toolbar button menu, also changes popups to default to vertical orientation [Australis] r=neil,mconley 2014-01-28 11:28:45 -05:00
Ed Morley
b77998a5e9 Backed out changeset a4f31914bb0c (bug 957229) for browser_aboutAccounts.js timeouts; CLOSED TREE 2014-01-28 16:09:22 +00:00
Dão Gottwald
a93159e584 Bug 962844 - [Australis] urlbar with EV SSL overlaps searchbar in narrow window. r=jaws 
--HG--
extra : rebase_source : 019f32dd55acd325104296c77148b13e1ead5e43
 2014-01-27 17:33:27 +01:00
Tim Taubert
e0ec07d3cd Bug 957229 - Don't show about:accounts with FxA disabled r=markh 2014-01-27 15:17:29 -08:00
Manish Goregaokar
618f5324fe 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
de35290a3a Backed out changeset 39fd448f1994 for bad commit message. 2014-01-27 18:22:37 -05:00
Manish Goregaokar
29ed3368d2 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
Bhagya
b827c5367b Bug 957922 - aBrowser is null in _setPluginNotificationIcon. r=jaws 2014-01-27 15:34:35 -05:00
Mike Conley
d23cb54489 Bug 924050 - [Australis] Make the Downloads button have a correct icon post-indicator-load in the menu panel. r=mikedeboer. 2014-01-27 10:38:34 -05:00
Tim Taubert
0550ac1081 Bug 957436 - [Australis] Follow-up to fix leaks caused by calling uninit() without calling init() before r=bustage 2014-01-25 22:02:18 +01:00
Malintha Fernando
f88c0b9dfc Bug 953124 - [Australis] Remove the "Open Location" dialog (openLocation.xul). r=dao 2014-01-25 17:12:20 +01:00
Tim Taubert
4bb5f8260b Bug 957436 - [Australis] Show doorhanger for first fxa-based sync r=markh 2014-01-25 16:19:07 +01:00
Tim Taubert
c1192b9f46 Bug 962729 - Follow-up fix to fix undefined fxAccounts symbol r=me 2014-01-25 16:36:04 +01:00
Tim Taubert
9ad8b47715 Bug 960903 - Fix browser_bug817947.js test failure on a CLOSED TREE 
From b68e6edbb3836e79f7dcd6635b0a9327df76c89f Mon Sep 17 00:00:00 2001
 2014-01-24 21:09:47 +01:00
Ryan VanderMeulen
917a319f58 Merge m-c to inbound. 2014-02-25 15:28:35 -05:00
Anup
c9a4b4b471 Bug 921730 - "The plugin is disabled" placeholder cannot be closed. r=jaws 2014-02-25 13:57:42 -05:00
Wes Kocher
8539cd2209 Backed out 5 changesets (bug 326743) for m-oth failures 
Backed out changeset d498b3fa8908 (bug 326743)
Backed out changeset 820d24250606 (bug 326743)
Backed out changeset 334ddf5ad1fb (bug 326743)
Backed out changeset becbe15a0b5d (bug 326743)
Backed out changeset dbc693bc48c5 (bug 326743)
 2014-02-20 16:30:26 -08:00
Mike de Boer
a829ba4860 Bug 326743: update tests to know about the Find Clipboard on OSX. r=Unfocused 2014-02-20 20:49:50 +01:00
Mike de Boer
507cee41f5 Bug 326743: use cmd-e to set find-in-page search term to currently selected text. r=Unfocused 2014-02-20 20:49:45 +01:00
Gijs Kruitbosch
666a1bd1d8 Bug 970321 - Australis' UITour: make menu panel not break if tour tab is opened in new window, r=Unfocused 2014-02-20 22:42:33 +00:00
Dão Gottwald
66571e65c7 Bug 965772 - [Australis] search text box changes size when opening a new tab. r=enn 2014-01-30 17:33:39 +01:00
Dão Gottwald
31853b6be3 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
e5fba21e71 Bug 957425 - make landing pages for sync on about:accounts. r=markh 2014-01-25 00:33:39 +11:00
Tim Taubert
d1a1ef5f92 Bug 962729 - Sync toolbar button and menu item need to open the prefs dialog when logged in r=markh 2014-01-22 20:53:58 +01:00
Cameron McCormack
71af330624 Bug 981370 - Make MousePosTracker use a Set rather than manage an array itself. r=dao 2014-03-11 10:05:29 +11:00
Boris Zbarsky
ad635be417 Bug 980965. Stop using DOM constructors as functions in chrome code. r=bholley 2014-03-10 17:38:14 -04:00
Bill McCloskey
27dda89b58 Bug 933462 - [e10s] Pop-up blocking notifications (r=felipe) 2014-03-20 16:31:20 -07:00
Bill McCloskey
91c22489aa Bug 862519 - [e10s] Better handling of key commands also handled by content (r=smaug) 2014-03-18 08:16:47 -07:00
Wes Kocher
caa21cdbe2 Merge m-c to inbound 2014-03-18 19:48:29 -07:00
Wes Kocher
1a23eae58f Merge fx-team to m-c 2014-03-18 19:44:07 -07:00
Joel Maher
4a434e6758 Bug 933680 - browser_pluginCrashCommentAndURL.js hangs ubuntu ec2 slaves in conjunction with browser_bug410900.js. r=felipec 2014-03-18 03:41:00 -07:00
Ryan VanderMeulen
b00bcceebe Merge m-c to inbound. 2014-02-11 14:58:40 -05:00
Bill McCloskey
ad8c727e10 Bug 960783 - Support "new out-of-process window" menu item in nightly (r=felipe,bsmedberg,trevor,ted) 2014-02-11 09:01:08 -08:00
Tom Schuster
7ae0a3c889 Bug 947895 - [e10s] Null check browser.docShell in context-menu Open in new tab. r=gavin 2014-02-24 23:10:18 +01:00
Tom Schuster
96ef43273a Bug 973195 - [e10s] Change Copy Link in context-menu to use JS instead of cmd_copyLink. r=felipe 2014-02-24 23:10:12 +01:00
Mike de Boer
22fba76b1f [Australis] Bug 963085: add header to Subscribe menu. r=Gijs 2014-01-23 17:04:27 +01:00
Matthew Noorenberghe
b43fada4d4 Bug 956162 - Implement @flip="none" for popups to allow them to appear off-screen without flipping or resizing. r=Enn 
[Australis]
 2014-01-22 20:09:03 +00:00
Mike de Boer
5410117758 [Australis] Bug 878546: refresh the styling of sub-views. r=Gijs 2014-01-23 14:06:17 +01:00
Tim Taubert
7c1a224b2f Bug 957421 - Keep FxA pref names consistent r=markh,rnewman,nalexander 2014-01-21 14:13:45 +01:00
Florian Quèze
1260c52839 Bug 958071 - PopupNotification consumers should have a way to replace the "Not Now" item, r=dolske. 2014-01-23 11:48:33 +01:00
Carsten "Tomcat" Book
f88e37b02e merge fx-team to mozilla-central 2014-01-23 10:19:26 +01:00
Wes Kocher
ace9292218 Backed out 2 changesets (bug 956162) for m-oth failures on a CLOSED TREE 
Backed out changeset 026dc3ee0654 (bug 956162)
Backed out changeset 0a7e5eeafed6 (bug 956162)
 2014-01-22 14:23:57 -08:00
Blake Winton
7f19882753 Bug 925681 - Show identity block and reload icon in awesomebar in Australis' customization mode. ui-r=shorlander, r=Gijs 
--HG--
extra : rebase_source : 10b62db55227e317a1bd5c45914619e2f75c94b6
 2014-01-22 20:12:22 +00:00
Matthew Noorenberghe
0186970959 Bug 956162 - Implement @flip="none" for popups to allow them to appear off-screen without flipping or resizing. r=Enn 
--HG--
extra : rebase_source : f5ddca505eb8a3b234718df1ae01c9a49a02a361
 2014-01-22 20:09:03 +00:00
Ryan VanderMeulen
d63a7cfdda Merge m-c to inbound. 2014-01-22 15:55:49 -05:00
Bill McCloskey
aed56c33e5 Bug 938904 - [e10s] Make tooltips work (r=smaug,enn) 2014-01-22 12:27:23 -08:00
Mike de Boer
b4a58ca885 [Australis] Bug 916953: Bookmarks star button caption in overflow panel follow-up no. 2. r=Gijs 2014-01-22 17:50:45 +01:00
Matteo Ferretti
08d1859702 Bug 882910 - "Australis - toolbarbutton's icon doesn't have a max height", r=gijs 
--HG--
extra : rebase_source : 225827f1288780e1db00c2c16b4e0f0490e844ec
 2014-01-22 07:40:00 +00:00
Mike de Boer
38a69f0bbf [Australis] Bug 916953: Bookmarks star button caption in overflow panel follow-up. r=Gijs 2014-01-22 15:22:07 +01:00
Gijs Kruitbosch
2215de3342 Bug 944947 - update bookmarks toolbar button styling some more for Australis, r=jaws 2014-01-18 01:43:21 +01:00
Mike de Boer
5287051379 [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
Marco Bonardo
a95664a355 Bug 958413 - [Australis] Bookmarks menu button dropdown icon has the wrong aspect ratio when placed in the Bookmarks Toolbar. r=Gijs 2014-01-22 10:42:51 +01:00
Wes Kocher
2546e3f69f Merge fx-team to m-c 2014-01-21 17:27:53 -08:00
Bill McCloskey
87bb420b41 Bug 961868 - [e10s] Fix pinned tabs (r=felipe) 2014-01-21 09:53:37 -08:00
Bill McCloskey
81ca0a6473 Bug 961863 - [e10s] Update browser remoteness attribute when restoring a tab (r=ttaubert,felipe) 2014-01-21 09:53:33 -08:00
Gijs Kruitbosch
96f79840a6 Bug 941109 - use closemenu instead of noautoclose attribute in Australis menupanel, r=mconley 
--HG--
extra : rebase_source : 89c32805249cebe4c29e135b1d27b7679eb1fbd8
 2014-01-21 19:01:16 +00:00
Bill McCloskey
0372a045dc Bug 959531 - More about:home testing (r=felipe) 2014-01-20 15:13:35 -08:00
Mike de Boer
6a58b4476b [Australis] Bug 956285: update zoom controls percentage label upon navigation. r=Gijs 2014-01-20 11:25:00 +01:00
AK
51681ea1af Bug 960997 - Change the DOMWebNotificationClicked handler to use window.focus() instead of focusManager.activeWindow = window. r=dao 2014-01-18 14:30:56 +01:00
Gijs Kruitbosch
b7a193bccb Bug 889120 - Australis' customize tab gets mixed up with other tab, r=jaws 2014-01-10 15:54:48 +00:00
Tim Taubert
c328b3d5fc Bug 961016 - Fix icon and label for pending tabs with async restore r=billm,dao 
From 6028548aa44e6d289c0fb5e756a4004451ea882b Mon Sep 17 00:00:00 2001
 2014-01-17 17:17:14 +01:00
Tom Schuster
48e551318f Bug 691614 - Make content zooming work with e10s Firefox. r=felipe 2014-01-13 18:36:26 +01:00
Ryan VanderMeulen
bd586e23cf [Australis] Backed out changesets 7c74e99d80c1 and 14e817fe25e1 (bug 956285) for mochitest-bc failures. 2014-01-17 10:30:28 -05:00
Drew Willcoxon
11352de2ad Bug 960941 - Base gBrowserThumbnails's expiration filter on top sites, not open pages. r=markh 2014-01-17 14:57:04 +01:00
Mike de Boer
8e82d894d3 [Australis] Bug 956285: update zoom controls percentage label upon navigation. r=Gijs 2014-01-17 14:04:15 +01:00
Jared Wein
e209f21f3f Bug 960045 - [Australis] Bottom-left corner on the customize button in the menu panel should have a rounded corner. r=gijs DONTBUILD 2014-01-17 13:38:09 +01:00
Jared Wein
7d59b50e63 Backed out changeset a2da63ec58c7 (bug 960045) for bad commit message. 2014-01-17 14:05:51 +01:00
Jared Wein
7c17898dd2 Bug 960045 - Bottom-left corner on the customize button in the menu panel should have a rounded corner. r=gijs 2014-01-17 13:38:09 +01:00
Gijs Kruitbosch
e4a51dad5d 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
Jared Wein
e5be7ca582 Bug 853972 - Clicking on a notification should select the originating tab. r=felipe,wchen 
--HG--
extra : rebase_source : e8f794ff0e474d669489eff7e82b3b0eccf4db0e
 2014-01-13 13:56:28 +01:00
Carsten "Tomcat" Book
53381349d5 Backed out changeset d614fa6b53b2 (bug 889120) [australis] for suspicion of pgo perma-orange 2014-01-16 09:44:49 +01:00
Ryan VanderMeulen
4d272a44a3 Merge inbound to m-c. 2014-01-15 14:34:05 -05:00
Gijs Kruitbosch
5405fe732f Bug 889120 - Australis' customize tab gets mixed up with other tab, r=jaws 
--HG--
extra : rebase_source : 12ef7ad03ece347dccd1e193a24e4e74b7b20b82
 2014-01-10 15:54:48 +00:00
Dão Gottwald
4791efe97c Bug 827084 - A tab being moved to a different window shouldn't prevent the page from opening dialogs. r=enndeakin 2014-01-15 15:53:20 +01:00
Blair McBride
fc6326b8d8 Bug 935815 - [Australis] UITour: Allow adding a button with an action to the info panel. r=MattN 2014-01-06 12:27:25 +13:00
Wes Kocher
64a15a08ff Merge m-c to fx-team 2014-01-14 16:15:24 -08:00
Wes Kocher
7d76112767 Merge b2g-inbound to m-c 2014-01-14 15:44:06 -08:00
Wes Kocher
2b6b5c7c0f Merge inbound to m-c 2014-01-14 15:24:45 -08:00
Ed Morley
7995285858 Backed out changeset 194dc8f8f9fe (bug 947535) since the socialapi tests appear to rely on each other :-/ 
CLOSED TREE
 2014-01-14 19:18:14 +00:00
Ed Morley
e7b8a38330 Bug 951680 - Disable browser_alltabslistener.js on Linux for intermittent failures 2014-01-14 16:39:04 +00:00
Ed Morley
62dde33267 Bug 947535 - Disable social/browser_blocklist.js for intermittent failures 2014-01-14 16:39:03 +00:00
Ed Morley
314afa46c5 Bug 925225 - Disable browser_bug676619.js on OS X for intermittent failures 2014-01-14 16:39:03 +00:00
Ed Morley
1f6a99dce5 Bug 917535 - Disable browser_locationBarCommand.js on Linux for intermittent failures 2014-01-14 16:38:26 +00:00
Ed Morley
3c608374b6 Bug 898317 - Disable browser_newtab_bug735987.js on OS X for intermittent failures 2014-01-14 16:38:26 +00:00
Florian Quèze
753b9b56b5 Bug 911981 - Chat panels are lost while detaching/attaching, r=mixedpuppy. 2014-01-14 23:08:20 +01:00
Gijs Kruitbosch
0c2b65bd2a Bug 941211 - use px sizes for Australis' panel/palette icons, and incorporate into height, r=jaws 2014-01-09 16:22:10 +00:00
Sachin Hosmani
069b0b1b39 Bug 897735 - Support regular expression filters for name and creator in extension blocks. r=Unfocused 
CLOSED TREE
 2014-01-06 14:16:32 +05:30
Ryan VanderMeulen
bde0b0ec9d Backed out changeset 933bf791b773 (bug 897735) for Windows test bustage. 
CLOSED TREE
 2014-01-14 11:10:33 -05:00
Sachin Hosmani
300046eb15 Bug 897735 - Support regular expression filters for name and creator in extension blocks. r=Unfocused 2014-01-06 14:16:32 +05:30
Dão Gottwald
f911310d9a Bug 951928 - [Australis] Reduce the browser window's minimum size. r=jaws 2014-01-14 09:12:49 +01:00
Ryan VanderMeulen
930c28ef10 Backed out changesets e8b0b4daa733 and d89066cb6f59 (bug 853972) for mochitest-bc timeouts. 2014-01-13 11:37:19 -05:00
Matthew Noorenberghe
c6714f9944 Bug 937415 - UITour: Add ability to highlight the selected tab's icon in Australis. r=Unfocused 2014-01-13 16:28:18 +01:00
Jared Wein
4544c5d6db Bug 853972 - Followup, add a return in the case that alertWindow is null. r=me 
--HG--
extra : rebase_source : bc17b22e1764e72904df6bc4c482b6d238d7f589
 2014-01-13 15:46:23 +01:00
Jared Wein
5d15cb981b Bug 853972 - Clicking on a notification should select the originating tab. r=felipe,wchen 
--HG--
extra : rebase_source : bfbf92b91d7562404b54b87f25f879881be7643a
 2014-01-13 13:56:28 +01:00
Fernando Jiménez
aee07b46ab Bug 958546 - s/isVerified/verified in all FxAccounts related code. r=markh 2014-01-14 17:00:36 +01:00
Carsten "Tomcat" Book
d9e117f526 Merge mozilla-central to mozilla-inbound 2014-01-14 16:11:37 +01:00
Ehsan Akhgari
bc994ea200 Bug 958985 - Fix the variable names (pushed the wrong patch) 2014-01-14 08:44:11 -05:00
Ehsan Akhgari
a41493e4ec Bug 958985 - Make isBidiEnabled check the intl.uidirection.<locale> pref; r=smontagu 2014-01-14 08:41:41 -05:00
Christian Legnitto
aeb2c9d4da Bug 935377 - Firefox should fix common scheme typos, r=dolske 2014-01-12 12:02:27 -08:00
Francois Marier
07c10fd181 Bug 948881 - Remove inline JavaScript in body events. r=ttaubert 2014-01-15 09:50:04 -05:00
Majda Nafissa Rahal
2a82fe03b8 Bug 884355 - Warn about closing multiple tabs when "Never remember history" is enabled" r=gavin 2013-06-23 05:03:00 -04:00
Trevor Saunders
9478cae48b bug 331376 - merge nsIDocShellTreeNode into nsIDocShellTreeItem r=smaug 2014-01-06 17:34:15 -05:00
Ryan VanderMeulen
00c6315595 Merge inbound to m-c. 2014-01-10 14:46:40 -05:00
Shane Caraveo
1d0ea6a5d4 bug 935773 Australis fix mark icon on windows, r=gijs 2014-01-09 15:49:08 -08:00
Gijs Kruitbosch
9736ba253f Backed out Australis changeset 5e2752c9cf2b (bug 941211) which totally shouldn't have made it into the tree, rs=stupid-me 2014-01-09 22:15:37 +00:00
Gijs Kruitbosch
35f6185ea1 Bug 941211 - use px sizes for Australis' panel/palette icons, and incorporate into height, r?jaws 
--HG--
extra : rebase_source : 5b2253ada8f70032bc31f5416a8f94d45b07416c
 2014-01-09 16:22:10 +00:00
Drew Willcoxon
48a297014c Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh 2014-01-07 12:59:18 -08:00
Patrick Brosset
cb863d2cfe Bug 916443 - part 1 - Toolbox level remote highlighter [Australis], r=paul 2014-01-09 12:36:01 +01:00
Wes Kocher
d779fe495a Backed out changeset f552ce04bc36 (bug 809056) for m-bc orange 2014-01-08 22:02:28 -08:00
Drew Willcoxon
6b99010477 Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh 2014-01-07 12:59:18 -08:00
Steven MacLeod
7f4bea3af5 Bug 945667 - Disable failing portion of browser_aboutHome.js and enable the dependent tests. r=gavin 2014-01-08 15:58:47 -05:00
Olli Pettay
e1ab582f7b Bug 857427 - Try to load the page again if not yet loaded. r=ehsan 2014-01-10 10:20:09 -05:00
Carsten "Tomcat" Book
4479de3838 Merge mozilla-central to mozilla-inbound 2014-01-08 13:25:28 +01:00
Shane Caraveo
14600a386f bug 956910 Australis fix gear icon in social sidebar for win/lin, r=markh 2014-01-07 16:06:56 -08:00
Shane Caraveo
16fb4fff2a bug 956956 fix permissions anchor for social sidebar, r=markh 2014-01-07 15:40:46 -08:00
Wes Kocher
d8d0ddae62 Backed out changeset 194f941f2064 (bug 809056) for mochitest-bc bustage 2014-01-07 14:53:04 -08:00
Ryan VanderMeulen
d8aefe0eec Merge m-c to fx-team. 2014-01-07 16:31:30 -05:00
Drew Willcoxon
61eed5b600 Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh 2014-01-07 12:59:18 -08:00
Tomer Cohen
53121d0a1f Bug 744659 - [about:home][rtl] Use dir=auto in search box to change direction if query is RTL, r=ehsan 2014-01-07 23:36:39 -08:00
Carsten "Tomcat" Book
0d49d8e152 Backed out australis changeset 5a8d6a009942 (bug 935815) for frequent oranges on a CLOSED TREE 2014-01-07 09:35:50 +01:00
Ed Morley
f5ef92b540 Merge latest green inbound changeset and mozilla-central 2014-01-06 12:51:38 +00:00
Neil Rashbrook
78bfb85ad5 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
Mark Hammond
70cd5c2549 Bug 907689 - use example.org as the blocklist URL. r=mixedpuppy 2014-01-06 14:19:09 +11:00
Blair McBride
03ef9c82d3 Bug 935815 - [Australis] UITour: Allow adding a button with an action to the info panel. r=MattN 2014-01-06 12:27:25 +13:00
Jared Wein
ed86b484a7 Bug 946320 - [Australis] history widget missing a "Tabs From Other Devices" entry. r=Gijs 2014-01-03 14:57:19 -05:00
Francesco Lodolo (:flod)
7b04b53ae6 Bug 952742 - [Australis] "Move to menu" label is using the wrong entity for accesskey; r=dolske 2014-01-03 15:04:56 +01:00
Georg Fritzsche
e0a4b5b2cf Bug 950435 - Move click-to-play notification bar tests out of browser_pluginnotification.js. r=jaws 
--HG--
rename : browser/base/content/test/general/browser_CTP_hideBar.js => browser/base/content/test/general/browser_CTP_notificationBar.js
 2013-12-20 14:20:32 +01:00
Jared Wein
2c34fee1d4 Bug 940107 - [Australis] Home icon not shown when moved to Bookmarks toolbar, only text. r=mconley 
--HG--
extra : rebase_source : 0514eeda6abfc319d6316898a65bcb99c287ff6e
 2014-01-02 15:32:09 -05:00
Magnus Melin
af4ea6007e Bug 331772 - tooltiptext fails on XUL button in HTML page. r=enndeakin 2013-12-18 22:44:34 +02:00
Wes Kocher
aa763b2feb Merge m-c to inbound 2013-12-24 15:25:23 -08:00