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
175,368 Commits 1 Branch 166 Tags 1.2 GiB
c8629b9398
Commit Graph

22111 Commits

Author SHA1 Message Date
Matthew Noorenberghe
d1e08f3b75 Bug 984170 - Inherit the text colour and font-weight of OS X bookmarks on a toolbar. r=Gijs ui-r=shorlander 
--HG--
extra : rebase_source : 70a7d566902b31764b0e037cb740b5f25b21e9e5
 2014-03-17 17:33:11 -07:00
Ehsan Akhgari
3c0feb2faf Bug 866528 - Make nsIDOMActivityOptions a dictionary; r=bzbarsky 2014-03-18 00:38:36 -04:00
Ryan VanderMeulen
aa1c106fad Merge m-c to fx-team. 2014-03-17 17:35:16 -04:00
Mozilla Release Engineering
198567e0a0 Merging in version bump NO BUG CLOSED TREE DONTBUILD 2014-03-17 13:48:08 -07:00
Ryan VanderMeulen
bfd07a820b Bug 983927 - Update pdf.js to version 0.8.1181. r=bdahl, r=Mossop 2014-03-17 12:09:54 -04:00
Hubert B Manilla
4f5fb7e1f5 Bug 962857 - Fix for debugger mistakenly detecting .jsm files are minified. r=fitzgen 2014-03-17 10:43:19 -04:00
Phil Ringnalda
b84fbf248a Merge m-c to m-i 2014-03-16 21:54:29 -07:00
Phil Ringnalda
edf75b30ea Merge f-t to m-c 2014-03-16 21:48:47 -07:00
Seth Fowler
0c3309cf98 Bug 981867 - Make the tooltip for the web console CSS category more general. r=msucan 
--HG--
extra : rebase_source : 04a3b8aa1795f4c49a188e27e9f2d084d59195cd
 2014-03-17 11:26:40 +08:00
Seth Fowler
8985faa373 Bug 981241 - Make the CSS category in the web console more flexible. r=msucan 
--HG--
extra : rebase_source : b16bc990f1e8077ea0363626a63874c13fca4aff
 2014-03-17 11:26:37 +08:00
Gijs Kruitbosch
9fb52edecc Bug 980534 - [australis] Make Australis' standalone subview panels wider. r=Unfocused 2014-03-16 23:38:49 +00:00
Ehsan Akhgari
df6168ba99 Bug 983955 - Increase the timeout in browser_inspector_markup_add_attributes.js; r=robcee 2014-03-16 19:26:10 -04:00
Gavin Sharp
aca226afa7 Backed out changeset 15516aebd58d (bug 477948) 2014-03-16 16:02:43 -07:00
Matthew Noorenberghe
e3d9039f8d Bug 885139 - Don't tile LightweightTheme images on the selected tab. r=dao,Gijs 
[Australis]
 2014-03-15 22:37:55 -07:00
Philipp Sackl
aa85ad6377 Bug 979938 - Delay the display of the tab close button to avoid visual noise. r=Dao 2014-03-06 08:31:00 -05:00
Gijs Kruitbosch
7e5be4f476 Bug 983997 - move pulse animation into animation container, too, r=mak 2014-03-04 08:27:15 -05:00
Gregory Szorc
f1038e1bf9 Bug 973997 - Define and document Experiments Manifests; r=bsmedberg 
--HG--
extra : rebase_source : c26d6dc90b921c8b29a89e1c9a7b1bffa5d5adfb
extra : amend_source : ea14cba512352bac72b67c7abb1194e8ed9946e7
 2014-02-26 16:46:26 -08:00
Dave Townsend
28c176c081 Backing out bug 850336 due to test timeouts. r=backout 2014-03-19 14:11:36 -07:00
Gijs Kruitbosch
3098ccdba5 Bug 985267 - don't use captiontext when we have menubar fog (in compositor), r=dao 2014-03-20 17:22:10 +00:00
Shane Caraveo
417ff259d3 Bug 984630 fix social button styling on linux, r=Gijs 2014-03-19 13:42:18 -07:00
Mike Conley
ef42739e3e Bug 941309 - Prevent underflow events from being eaten by toggled pseudoelements when coming out of Panorama. r=Gijs. 2014-03-18 16:29:00 -04:00
Mike Conley
c4f0d51c86 Bug 940509 - Polish the private browsing indicators for Windows. r=jaws. 2014-03-12 19:02:00 -04:00
Mike Conley
8326e440d1 Bug 979987 - center-align the footers of panel menus. r=jaws. 2014-03-19 10:41:00 -04:00
Dave Townsend
12dba36497 Bug 850336: Devtools box model should be editable. r=pbrosset 2014-03-19 10:38:05 -07:00
J. Ryan Stinnett
c2f9d9a154 Bug 984969 - Only connect from Browser Toolbox after load. r=past 2014-03-18 11:30:23 -05:00
Girish Sharma
5dd410a56f Bug 984141 - Style editor should suggest valid CSS values without need of typing an initial character. r=harth 2014-03-17 01:58:47 +05:30
Blake Winton
046f3c5b68 Bug 940038 - Show shortcuts in toolbar buttons in menu panel subviews. r=jaws, ui-r=shorlander 2014-03-19 13:09:32 -04:00
Carsten "Tomcat" Book
da0a57d7d9 Merge mozilla-central to fx-team 2014-03-19 16:27:57 +01:00
Patrick Brosset
167625321c Bug 983614 - Clean-up empty spaces when displaying concise DOMNodes in the webconsole output; r=msucan 2014-03-19 15:02:11 +01:00
Patrick Brosset
c14e98b58e Bug 966424 - Intermittent browser_bug765105_background_image_tooltip.js; r=jwalker 2014-03-19 10:11:34 +01:00
Gijs Kruitbosch
9fdc7217f5 Bug 984804 - highlight footer more strongly, make it work for keyboard nav in the menu, r=mikedeboer,ui-r=shorlander 
--HG--
extra : rebase_source : 51bf284a2a3ee0556a2c6f56749ff5c6d6c0bd8d
 2014-03-19 00:04:56 +00:00
Gijs Kruitbosch
b9deb22ae4 Bug 985172 - toggle bookmark label when in overflow panel, r=mak 
--HG--
extra : rebase_source : 2308bd8676a1578597cca97ed5b3b6502247ee9b
 2014-03-19 09:51:38 +00:00
J. Ryan Stinnett
89d8430f25 Bug 971177 - Clean up Style Editor's debuggee. r=harth 2014-03-18 17:52:33 -05:00
Phil Ringnalda
85d6114084 Merge m-c to m-i 2014-03-16 08:38:30 -07:00
Ehsan Akhgari
dc91091fd5 Bug 857427 - Perform the same cleanups done on browser_save_link-perwindowpb.js on browser_save_private_link_perwindowpb.js too 2014-03-16 10:18:01 -04:00
Ehsan Akhgari
0849790483 Bug 857427 - Re-enable browser_save_private_link_perwindowpb.js on Linux 2014-03-16 10:17:48 -04:00
Phil Ringnalda
df7c82a42d Merge m-c to f-t 2014-03-15 18:21:41 -07:00
Ryan VanderMeulen
0096b112e2 Backed out changeset a1d95da23e97 (bug 976002) for Android xpcshell failures. 2014-03-15 19:50:09 -04:00
Mike de Boer
ca7c378339 [Australis] Bug 983732: Put sync promo footer back in the right place. r=MattN 2014-03-15 15:45:23 +01:00
Asaf Romano
2ed4b8f9e2 Bug 983623 - Async transactions: Add a preference for turning it, implement undo & redo commands. r=mak 2014-03-15 23:49:07 +02:00
Marco Castelluccio
97ab2c87f2 Bug 898647 - Backend for app updates. r=myk,fabrice 
--HG--
rename : browser/modules/webappsUI.jsm => browser/modules/WebappManager.jsm
rename : toolkit/webapps/WebappsInstaller.jsm => toolkit/webapps/NativeApp.jsm
rename : webapprt/WebappsHandler.jsm => webapprt/WebappManager.jsm
 2014-03-15 14:37:37 -07:00
Ehsan Akhgari
f0a6f44ed8 Bug 983916 - Remove the classinfo on WebContentConverterRegistrar; r=gavin 2014-03-15 15:57:37 -04:00
Wes Kocher
b031e3117f Merge m-c to fx-team 2014-03-14 23:19:44 -07:00
Wes Kocher
aa89f0292c Merge inbound to m-c 2014-03-14 22:20:25 -07:00
Wes Kocher
b6db2af290 Merge fx-team to m-c 2014-03-14 19:20:46 -07:00
Phil Ringnalda
8127109275 Merge m-c to f-t 2014-03-14 19:09:29 -07:00
Phil Ringnalda
b15799f95e Merge m-c to a CLOSED TREE m-i 2014-03-14 19:05:32 -07:00
Chris Karlof
93e8711424 Bug 976633 - Clicking Cancel on merge warning should not initiate Firefox Account creation. r=markh 2014-03-14 17:59:26 -07:00
Matthew Noorenberghe
09c93a2784 Bug 983761 - Add support for CSSGroupingRules in LightweightThemeListener. r=Gijs 2014-03-14 16:24:57 -07:00
Matthew Noorenberghe
03bef0428a Bug 983761 - Use tab-active-middle@2x.png with lightweight themes for HiDPI. r=Gijs 2014-03-14 16:24:56 -07:00
Nick Fitzgerald
378300a8de Bug 981258 - Replace 'waitForSourceShown' with 'ensureSourceIs' to fix intermittent browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js; r=past 2014-03-14 10:15:43 -07:00
Ed Morley
e24190b758 Bug 918507 - Disable browser_dbg_chrome-create.js on the remaining platforms, since it doesn't clean up after itself; CLOSED TREE 2014-03-14 16:54:20 +00:00
Jared Wein
23d63d2dc2 Bug 983632 - [Australis, Windows HiDPI] button icons can be completely hidden but still be on toolbar and not in overflow menu if window resized/width decreased. r=Gijs 
--HG--
extra : rebase_source : 370fde95f8d07e1fe535da4eaee65a5300d7f4ac
 2014-03-14 11:13:41 -04:00
Carsten "Tomcat" Book
3c43258d50 merge fx-team to mozilla-central 2014-03-14 12:35:23 +01:00
Fernando Jiménez
4a5bf12922 Bug 976002 - Build time flag to enable/disable FxA. r=markh 2014-03-13 22:00:48 -07:00
Sebastian Hengst
3274ababce Bug 983724 - Remove unused customizeMode.menuAndToolbars.label from browser.dtd. rs=mconley over irc 
--HG--
extra : rebase_source : d9179d9bbc7258fa219d400af56af3871909ef2d
 2014-03-15 14:21:50 -07:00
Matthew Noorenberghe
1bef6091ac Bug 971108 - UITour: Update the doorhanger menu style with a footer background and primary button style. r=Unfocused 
--HG--
extra : rebase_source : fbbfc8c7a6c08f224aea0a8e786bc96f120da67b
 2014-03-15 14:21:20 -07:00
Ratnadeep Debnath
37b815be46 Bug 912900 - Show open tabs in connected device's Firefox in AppManager. r=jryans 2014-03-15 17:17:45 -04:00
Bill McCloskey
aa5f40a77e Bug 982828 - [e10s] Disable mochitest-plain tests that don't pass in e10s (r=ted) 2014-03-13 21:38:19 -07:00
Wes Kocher
c71cbaa650 Backed out changeset 4ce831d82c1f (bug 898647) for gaia-ui bustage on an already CLOSED TREE 
--HG--
rename : browser/modules/WebappManager.jsm => browser/modules/webappsUI.jsm
rename : toolkit/webapps/NativeApp.jsm => toolkit/webapps/WebappsInstaller.jsm
rename : webapprt/WebappManager.jsm => webapprt/WebappsHandler.jsm
 2014-03-14 14:13:25 -07:00
Jared Wein
5aeea262ce Bug 971948 - [Australis] Bookmark toolbar items icon is broken in the palette. r=Gijs 2014-03-13 20:34:19 -04:00
Shane Caraveo
4cd6492547 Bug 915835 fix leak in socialmarks event listeners, r=markh 2014-03-13 17:23:34 -07:00
John Gruen
81d9f58148 Bug 983414 - fix sync success copy and formatting. r=markh 2014-03-13 17:01:23 -07:00
David Rajchenbach-Teller
f239dd5dfa Bug 961665 - Native implementation of OS.File.read, native bits. r=froydnj, r=bz, r=paolo 2014-03-14 10:13:26 -04:00
Victor Porof
76345c5744 Bug 982359 - Increase timeout for browser_net_filter-03.js to avoid it failing on Ubuntu. r=me 2014-03-14 09:30:54 -04:00
Ehsan Akhgari
3d045de806 Bug 857427 - Fix even more problems spotted by ttaubert 2014-03-14 15:17:20 -04:00
Ehsan Akhgari
943f13337f Bug 857427 - Fix more problems spotted by ttaubert 2014-03-14 15:03:15 -04:00
Bill McCloskey
4745f6462b Bug 917681 - [e10s] Make context menu work for selected text (r=felipe) 2014-03-14 11:47:46 -07:00
Bill McCloskey
0a973e879b Bug 938359 - [e10s] Support middle-click scroll (r=felipe) 2014-03-14 11:45:53 -07:00
Ehsan Akhgari
3853772bbf Bug 857427 - Wait for focus before initiating a right click on the test page 
--HG--
extra : rebase_source : 7f55838ed7cf08fdd2350886d852c7a507e8f5f5
 2014-03-14 14:00:43 -04:00
Ehsan Akhgari
52139bdf6d Debugging patch for bug 857427 
--HG--
extra : rebase_source : 74ceaa5d816577b1f995fb18f88e5e465a66d337
 2014-03-14 14:00:29 -04:00
Marco Castelluccio
2a551f3b08 Bug 898647 - Backend for app updates. r=myk,fabrice 
--HG--
rename : browser/modules/webappsUI.jsm => browser/modules/WebappManager.jsm
rename : toolkit/webapps/WebappsInstaller.jsm => toolkit/webapps/NativeApp.jsm
rename : webapprt/WebappsHandler.jsm => webapprt/WebappManager.jsm
extra : rebase_source : d009be9de28cb917062d567592f773e9ece4266e
 2014-03-14 10:30:53 -07:00
Stephen Horlander
34b4374e18 Bug 969584 - Patch 3: Consolidate typography and sizing of panel subview items for Australis, r=mikedeboer 
--HG--
extra : rebase_source : c9fcac25fedf0521fdcca7bccb7052587b4c1594
 2014-03-06 08:57:00 -05:00
Gijs Kruitbosch
eb0cf086d3 Bug 963143 - Australis - fix nits for download finish notification patch, rs=mak 
--HG--
extra : rebase_source : dec8b20839abdfccb9429d949b2e20709495ad9d
 2014-03-15 19:21:36 +01:00
Matthew Noorenberghe
c6e34cfc3e Bug 982620 - UITour: Test that the menu panel is closed after tearing down. r=Gijs 
[Australis]
 2014-03-15 11:21:43 -07:00
Gijs Kruitbosch
31179fb0ab Bug 982620 - Australis' UITour doesn't hide the menu panel on teardown, causing recreatePopup to break later hideMenu calls, r=MattN 2014-03-15 00:52:15 +01:00
Heather Arthur
aaec4f8425 Bug 983892 - Inspector Box model tab's background should be light to match light theme; r=vporof 2014-03-15 10:31:30 -07:00
Mihaela Velimiroviciu
89d43b0e5b Bug 977033 - Add test for bug 963639 - checking customizing attribute on non customizable toolbar. r=Gijs 2014-02-26 15:58:58 +02:00
Jared Wein
268a93fc9f Bug 934075 - Followup to fix the path and remove the preprocessor flag from jar.mn on OSX. r=me 2014-03-14 08:53:40 -04:00
Jared Wein
dbc0e8a5d3 Bug 934075 - [Australis] Show the Whimsycorn on the menu panel when it is empty. r=Unfocused 
--HG--
extra : rebase_source : 8c9914d0bb761daa6c5146573406a71fa05aca82
 2014-03-14 08:22:09 -04:00
Carsten "Tomcat" Book
d2a7e2bf02 Merge mozilla-central to fx-team 2014-03-14 12:56:25 +01:00
Gijs Kruitbosch
b43545d192 Bug 983583 - define missing PREF_SELECTED_LOCALE for Australis menu panel, f=aryx, rs=me 2014-03-14 11:35:42 +01:00
Carsten "Tomcat" Book
547d6ddd12 Merge mozilla-central to mozilla-inbound 2014-03-25 13:40:56 +01:00
"J. Ryan Stinnett"
2de747a346 Bug 982322 - Part 5: Delay node registrations. r=ochameau 2014-03-17 12:06:00 +01:00
"J. Ryan Stinnett"
8ccc9f5e7c Bug 982322 - Part 4: Save paths on each node. r=ochameau 2014-03-17 12:02:00 +01:00
"J. Ryan Stinnett"
c1ba262c38 Bug 982322 - Part 3: Process tree without for ... of. r=ochameau 2014-03-17 11:55:00 +01:00
"J. Ryan Stinnett"
6bee09397a Bug 982322 - Part 2: Resolver iterates faster without for ... of. r=ochameau 2014-03-17 11:52:00 +01:00
"J. Ryan Stinnett"
e9e8df3ffd Bug 982322 - Part 1: Use a resolver object to only descend once. r=ochameau 2014-03-17 11:39:00 +01:00
Monica Chew
380a642bcc Bug 985720: Rename urlclassifier.download_block_table and urlclassifier.download_allow_table (r=gcp) 2014-03-24 10:49:05 -07:00
Nick Fitzgerald
9cdf2a2c0f Bug 981258 - Set the breakpoints in browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js before executng the IIFE so that the IIFE's Debugger.Script can't be GC'd before the breakpoints are set; r=past 2014-03-15 18:48:55 -07:00
Blake Winton
e8d5a62a48 Bug 983653 - UITour: Make the highlight effect a circle on the bookmarks combo button. ui-r=shorlander, r=MattN 2014-03-15 18:29:38 -07:00
Mike de Boer
061e3fb79a [Australis] Bug 983655: fix combined and menu-button buttons styling in the overflow panel. r=Gijs 2014-03-18 12:49:56 +01:00
Brandon Benvie
e5e2242f22 Bug 943510 - Convert to Promise.jsm in the devtools framework. r=pbrosset, r=rcampbell 2014-03-17 11:11:00 -07:00
Zachary Carter
28a3f66800 Bug 972061 - Update style of Sync intro and manage pages r=ttaubert 
From ff216e4d7d2c5957c09ba03028b0fec76303ab30 Mon Sep 17 00:00:00 2001
---
 .../base/content/aboutaccounts/aboutaccounts.css   |  36 --
 .../base/content/aboutaccounts/aboutaccounts.xhtml |   8 +-
 .../aboutaccounts/images/graphic_sync_intro.png    | Bin 5566 -> 9304 bytes
 .../aboutaccounts/images/graphic_sync_intro@2x.png | Bin 10764 -> 19655 bytes
 browser/base/content/aboutaccounts/main.css        | 380 ++++-----------------
 5 files changed, 76 insertions(+), 348 deletions(-)
 2014-02-12 18:36:07 -08:00
Gijs Kruitbosch
ea4857dfc4 Bug 983699 - fix widgets in Australis overflow panel to show view on the right anchor, r=jaws 
--HG--
extra : rebase_source : 99656dbcbda90cdb19b85c2e48795f7656fca697
 2014-03-14 23:30:14 +01:00
Gavin Sharp
34d1362a62 Bug 982167: adjust layout of Sync pref pane so that checkboxes don't span the entire width of the prefpane, r=smacleod 
--HG--
extra : rebase_source : c05e5568d4e6f693033e83c9b4afe13077826401
 2014-03-11 18:20:36 -07:00
Gijs Kruitbosch
5eda5fad09 Bug 963143 - downloads animation no longer showing when button is in Australis' menu or overflow panel, r=mak 
--HG--
extra : rebase_source : 2e74cb17e9a080a2dd5bd27b501b4fe1719bd310
 2014-03-14 17:01:34 +01:00
Stephen Horlander
1e23ac4796 Bug 978752 - fix Windows Classic gradient for Australis, r=mconley 
--HG--
extra : rebase_source : 9653aec995257946f65c826f439539c848da6d63
 2014-03-14 16:59:44 +01:00
Heather Arthur
2bf161bee6 Bug 976738 - Devtools Themes - use light theme as default theme; r=robcee 2014-03-14 15:04:09 -07:00
Heather Arthur
361f46e829 Bug 711401 - prettyify CSS source even if it has spaces or newlines at the end of file; r=jwalker 2014-03-14 15:03:37 -07:00
Brandon Benvie
6ca6258cd1 Bug 970172 - Prevent VariablesView Variables from handling clicks while editing. r=vporof 2014-02-12 15:33:59 -08:00
Terrence Cole
61b57a399b Bug 619558 - Enable generational GC on desktop; sr=naveed 2014-02-05 10:04:16 -08:00
Michael Ratcliffe
dabaac4db5 Bug 663778 - Use flag instead of pref for mozafterpaint switch and highlighter noautohide r=jwalker 2014-03-13 21:27:10 +00:00
Michael Ratcliffe
43388cd236 Bug 663778 - Changes to tests for box model highlighter r=jwalker 2014-03-12 14:01:31 +00:00
Michael Ratcliffe
64701bba07 Bug 663778 - Tests: Charsets to utf-8 r=jwalker 2014-03-12 14:00:13 +00:00
Michael Ratcliffe
d3a9fcdf6b Bug 663778 - Box Model Highlighter r=jwalker 2014-03-13 21:36:48 +00:00
Michael Ratcliffe
f07e0a7b5b Bug 663778 - Misc fixes r=pbrosset 2014-03-09 17:03:00 +00:00
Michael Ratcliffe
f972f9add8 Bug 663778 - Changes to layout view for box model highlighter r=pbrosset 2014-03-08 18:10:44 +00:00
Ryan VanderMeulen
f40898828c Merge m-c to fx-team. 2014-03-13 15:37:02 -04:00
Ryan VanderMeulen
991e5c8bc3 Backed out 6 changesets (bug 663778) for browser_dbg_listtabs-02.js leaks on a CLOSED TREE. 
Backed out changeset cbd200206f9b (bug 663778)
Backed out changeset b0b74401e614 (bug 663778)
Backed out changeset df5255cffbfa (bug 663778)
Backed out changeset e6d0dd124356 (bug 663778)
Backed out changeset 134f77474941 (bug 663778)
Backed out changeset 456609873c5f (bug 663778)
 2014-03-13 13:56:22 -04:00
Florian Quèze
9a2f1aeeb4 Bug 971047 - Import the CLD language detection library, r=felipe,azakai,gps. 2014-03-13 18:28:53 +01:00
Florian Quèze
15f38c2d6b Bug 976544 - Intermittent | browser_get_user_media.js | Unexpected Exception: TypeError: PopupNotifications.panel.firstChild is null - fourth attempt, r=Gijs. 
--HG--
rename : browser/base/content/test/general/browser_get_user_media.js => browser/base/content/test/general/browser_devices_get_user_media.js
 2014-03-13 13:45:34 +01:00
Girish Sharma
f1aea88da3 Bug 944499 - Make the css autocompletion faster, r=harth 2014-03-13 22:49:54 +05:30
Gavin Sharp
b5e2dc3fda Bug 982241: make the UI observe weave:service:setup-complete so that it gets updated correctly when re-signing in after an auth error, r=ttaubert 
Changes:
 * start observing weave:service:setup-complete to update the UI after all logins (re-auth, initial sign-in)
 * stop observing FxAccountsCommon.ONLOGIN_NOTIFICATION, since the state we depend on to update the UI never changes interestingly as a result of it firing

--HG--
extra : rebase_source : 8632d597557b7a25ebc31dd53ad5680ac5a72583
 2014-03-12 18:53:35 -07:00
Gavin Sharp
bfae06dcda Bug 982893: give up on not trying to initialize Weave.Status on window open, since we were failing at it anyways, r=markh 
Changes:
 * don't try to avoid loading Weave.Status modules on window open
 * access the authManager via Weave.Status instead of Weave.Service, since Weave.Status will already be initialized in almost all cases.

--HG--
extra : rebase_source : a328609e5c5c461fb92b050b8d34816f08f01d8a
 2014-03-13 09:52:52 -07:00
Mike de Boer (mdeboer@mozilla.com)
062f26ebae [Australis] Bug 982993: restore additional padding for notification panels on Windows. r=mconley 2014-03-13 16:25:18 +01:00
Michael Ratcliffe
39a70a90a5 Bug 663778 - Use flag instead of pref for mozafterpaint switch and highlighter noautohide r=jwalker 2014-03-13 15:38:37 +00:00
Michael Ratcliffe
eb6c7c9e1d Bug 663778 - Changes to tests for box model highlighter r=jwalker 2014-03-12 14:01:31 +00:00
Michael Ratcliffe
ba611f6bd4 Bug 663778 - Tests: Charsets to utf-8 r=jwalker 2014-03-12 14:00:13 +00:00
Michael Ratcliffe
508e2702a6 Bug 663778 - Box Model Highlighter r=jwalker 2014-03-13 13:54:02 +00:00
Michael Ratcliffe
cb5ca97c1a Bug 663778 - Misc fixes r=pbrosset 2014-03-13 15:46:37 +00:00
Vaibhav Agarwal
74d0d984a3 Bug 971132 - B2G mochitests should use the new manifest format for runtests; r=jmaher 2014-03-13 10:40:10 -04:00
Carsten "Tomcat" Book
0b804927d7 merge fx-team to mozilla-central 2014-03-13 12:52:51 +01:00
Wes Kocher
93661497bd Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Phil Ringnalda
3e10f96fa0 Bug 982988 - Fix browser_bug415846.js to load the new location of its-a-trap.html and re-enable it 2014-03-12 20:40:58 -07:00
Wes Kocher
c317000cea Merge fx-team to m-c 2014-03-12 20:01:45 -07:00
Wes Kocher
e8d6845a05 Merge inbound to m-c 2014-03-12 19:36:50 -07:00
Wes Kocher
2214eabf9e Bug 982988 - Disable browser_bug415846.js for failing without changing Firefox code 2014-03-12 18:54:37 -07:00
Ryan VanderMeulen
207bbe9c63 Backed out changeset 20e22a0b38f6 (bug 966424) for mochitest-bc failures. 2014-03-12 15:23:21 -04:00
Wes Kocher
a15b6e2f00 Merge m-c to m-i 2014-03-12 21:21:07 -07:00
Wes Kocher
a4de6958ad Merge m-c to inbound 2014-03-12 18:59:54 -07:00
Ehsan Akhgari
d4fb7f54df Bug 931904 - Ignore selections coming from the autocomplete code in urlbarBindings; r=gavin 2014-03-12 21:44:05 -04:00
Patrick Brosset
f320ac7628 Bug 966424 - Fix intermittent failures in browser_bug765105_background_image_tooltip.js. r=jwalker 2014-03-12 13:14:18 -04:00
Panos Astithas
1b3001842f Increase the timeout for browser_dbg_chrome-create.js test to avoid test failures on Win 8.1 (bug 918507). r=me 2014-03-12 18:34:38 +02:00
Marco Bonardo
31d61f5db9 Bug 981592 - Ensure the Library selected left pane container is open before selecting one of its descendants. r=mano 2014-03-12 16:24:28 +01:00
Marco Bonardo
edaa060572 Bug 969318 - Mute "A promise chain failed to handle a rejection" error from the livemarks service. r=mano 2014-03-12 16:24:23 +01:00
Jared Wein
2062cd5070 Bug 979871 - [Australis] type=menu-button buttons in the menu panel need to be moved up a few pixels. r=Gijs 
--HG--
extra : rebase_source : 914fc2692fea457e5a7ee0a95cf17b8f16df8b36
 2014-03-12 10:36:21 -04:00
Wes Kocher
926e5adef5 Merge m-c to fx-team 2014-03-12 19:01:29 -07:00
Tim Taubert
6463f93f80 Bug 970769 - MenuBar flickers when I click History/Tools menu in the first time r=markh 2014-03-12 18:14:05 -07:00
Mike de Boer
6d7273e398 [Australis] Bug 978309: Introduce a checked state for toolbar buttons with type=checkbox. r=Gijs 2014-03-13 00:42:36 +01:00
Matteo Ferretti
6387e1e919 Bug 959640 - "Have a default icon for add-on SDK widgets in Australis' customization view" r=gijs 
--HG--
extra : rebase_source : f435e4b8901fd8100fc78c39d74d0e8b250a0fa5
 2014-03-12 08:36:00 +01:00
Drew Willcoxon
8ff494069b Bug 975528 - Add search component tests for Bing searches. r=MattN,gavin 2014-03-12 16:56:00 -07:00
Shane Caraveo
8f98b0f308 Bug 978483 [Australis] add sidebar button image for winXP, r=Gijs 2014-03-12 16:48:30 -07:00
Tim Taubert
7192454e4a Backed out changeset 92f37b7106a4 (bug 970769) on a CLOSED TREE r=bustage 2014-03-12 16:33:59 -07:00
Tim Taubert
b04a0d5bc5 Bug 970769 - MenuBar flickers when I click History/Tools menu in the first time r=markh 2014-03-12 15:35:46 -07:00
Mike de Boer
1357b1b13a [Australis] Bug 980445: adjust Bookmarks button border state on hover and panel open. r=mconley 2014-03-12 23:37:12 +01:00
Gijs Kruitbosch
5c6c687def Bug 981418 - add onBeforeCreated handler for Australis widgets so add-ons have warning when their widget is created, and fix a race condition in the panelmultiview code that showed up in the automated test, r=jaws 2014-03-11 23:50:57 +00:00
Michael Ratcliffe
7a91b21d8b Bug 663778 - Changes to layout view for box model highlighter r=pbrosset 2014-03-08 18:10:44 +00:00
Mike de Boer
0c917e2c74 [Australis] Bug 477948: Keyhole back/ forward button for Linux. r=jaws 2014-03-13 16:33:51 +01:00
Darrin Henein
02b14507fd Bug 969592 - Restyle Australis' Bookmarks Menu Popups, r=mak 2014-03-07 13:31:00 +00:00
Mike de Boer
d0857fe3a9 [Australis] Bug 980374: update browser_toolbarbutton_menu_context.js test. r=MattN 2014-03-12 23:29:55 +01:00
Mike de Boer
5bab10b8ea [Australis] Bug 980374: adjust OSX toolbar buttons height to match urlbar and search bar. r=mconley 2014-03-12 23:29:52 +01:00
Marco Bonardo
fe8c6fd660 Bug 960047 - Reset Sync promobox count for bookmark/add-on/passwords panels. r=gavin 2014-03-12 23:30:41 +01:00
Blair McBride
4d66a02f18 Bug 976792 - [australis] CustomizableUI's insertNodeInWindow should go through placements and try followup next nodes. r=Gijs r=jaws 
--HG--
extra : rebase_source : 47cb1183f584fe453be6b3c461c0eff7cdcbf203
 2014-03-07 04:59:00 -05:00
Stephen Horlander
33b19519c8 [Australis] Bug 969904: Update Bookmark Star States. r=mikedeboer 2014-03-13 15:55:47 +01:00
Ryan VanderMeulen
a2a03608f4 Backed out changesets c6ca1aa3887a, d741e117a033, 1fd26e822e73, and 720962c9f993 (bug 961665) for build bustage and xpcshell failures. 2014-03-13 10:32:57 -04:00
Jan Keromnes
bcdc9a244b Bug 982707 - Move the "devtools.dump.emit" pref from firefox.js to all.js. r=ochameau 2014-03-13 09:53:04 -04:00
David Rajchenbach-Teller
b1566a0457 Bug 961665 - Native implementation of OS.File.read, native bits. r=froydnj, r=bz, r=paolo 2014-03-13 09:51:22 -04:00
Blake Winton
994a414863 Bug 971116 - Implement new Australis UITour highlight effect. ui-r=madhava, r=Unfocused 2014-03-13 09:29:24 -04:00
Gijs Kruitbosch
943d2a81df Bug 982835 - Australis bookmark subview hover color is wrong when in main menu panel, r=mikedeboer 
--HG--
extra : rebase_source : 19c106b2865a100d9a5d654bc42c1ec9e1194fd0
 2014-03-13 13:56:38 +01:00
Carsten "Tomcat" Book
ee823458f7 Merge mozilla-central to fx-team 2014-03-13 13:10:30 +01:00
Manish Goregaokar
70aa7b84b3 Bug 388287 - Focus the proxy port field if its value is 0 and the server name is specified. r=MattN 2014-03-13 01:07:28 -07:00
Carsten "Tomcat" Book
fc2f11e1f9 merge fx-team to mozilla-central 2014-03-12 12:19:49 +01:00
Shane Caraveo
4d0239801d bug 894806 [Australis] refactor and remove social.provider, r=markh 2014-03-11 19:25:45 -07:00
Bill McCloskey
7f8b73d76c Bug 666804 - [e10s] Support NetworkPrioritizer (r=felipe) 2014-03-11 20:13:48 -07:00
Bill McCloskey
308bb03144 Bug 652510 - [e10s] Make the Page Style menu work (r=ttaubert) 2014-03-11 20:13:45 -07:00
Bill McCloskey
a1cffdcdf6 Bug 980766 - [e10s] Send document content type to remote-browser.xml (r=felipe) 2014-03-11 20:13:41 -07:00
Gavin Sharp
660bcc0971 Bug 966342: Tools menu shows "Sync now" to unverified users in some cases, r=markh 
Changes include:
- have gSyncUI._needsSetup check Weave.Service.identity._signedInUser (if already set) and return true if the user is not verified
- make the menuitem hiding/showing code in gSyncUI.updateUI a bit easier to follow

--HG--
extra : rebase_source : b5a99354e13db798ea3d0380391db1993bf36408
 2014-03-10 17:24:07 -07:00
Gijs Kruitbosch
ffcb6f7d1d Bug 981548 - bookmark star animation disables click on bookmarks widget during transition, r=mak 
--HG--
extra : rebase_source : a4f5f1ba45da12269eae0ca05cc366b14cdec906
 2014-03-10 21:28:06 +00:00
Gijs Kruitbosch
d60f2425b4 Bug 978309 - add custom arrows for Australis bookmarks menu panel on Windows and Linux, r=mikedeboer 
--HG--
extra : rebase_source : 61e9c45b52714e41d74f2743863693af595a2d89
 2014-03-11 00:59:16 +00:00
Gijs Kruitbosch
815b1834cb Bug 982027 - moving item around in Australis' customize mode shouldn't remove custom context menu, r=jaws 
--HG--
extra : rebase_source : 5d756bcfe2a7906f15d69405b8b23070ac293ec9
 2014-03-11 12:29:25 +00:00
Wes Kocher
4666486723 Backed out changeset f8f0091f945c (bug 918507) for pushing win8debug m-bc logs over the limit 2014-03-11 17:15:44 -07:00
Mark Capella
ff024b59ab Bug 981310 - Displayed error tapping navbar under input element after URL TextSelection, r=jimm 2014-03-11 19:25:28 -04:00
Chris Karlof
9e95cbfb16 Bug 981140 - Make the FxA signup uri pref and path explicitly reference signup. r=markh 2014-03-11 15:58:27 -07:00
Wes Kocher
a3215a3aeb Backed out changeset 4f50ba79c6ff (bug 912900) for m-oth bustage 2014-03-11 15:32:15 -07:00
Girish Sharma
2556e27bde Bug 965872 - Storage Inspector - actor for cookies, local storage and session storage, r=jwalker 2014-03-12 03:36:43 +05:30
Ratnadeep Debnath
528f2c4c91 Bug 912900 - Show open tabs in connected device's Firefox in AppManager. r=jryans 2014-03-11 17:01:29 -04:00
Aleh Zasypkin
16dfddef1f Bug 858206 - Part 3: Add mochitests. r=jimm 2014-03-06 22:38:32 +01:00
Aleh Zasypkin
b7cfdf5d95 Bug 858206 - Part 2: Don't use selectAtPoint for inputs as we already have collapsed one (caret). r=jimm 2014-03-06 22:35:28 +01:00
Aleh Zasypkin
f04d85571c Bug 858206 - Part 1: Swap start and end monocles when they overlap. r=jimm 2014-03-05 12:41:14 +01:00
Ryan VanderMeulen
00f626009e Merge m-c to fx-team. 2014-03-11 13:23:55 -07:00
Gijs Kruitbosch
ca8270047a Backed out changeset f66e3ccb0c41 and fdebf60103c3 (bug 981418) 2014-03-11 19:56:55 +00:00
Ryan VanderMeulen
3ba438c548 Merge fx-team to m-c. 2014-03-08 01:12:53 -08:00
Mike Conley
c75bd8b58e Bug 980639 - [Australis] Only remove open state from menu button once customize transition is finished. r=Gijs. 2014-03-10 14:12:00 -04:00
Robin Ricard
5e2ecda10f Bug 965172 - Variables view hover popup appears while selecting text. r=fitzgen 
Prevent the popup from appearing while selecting text.
If the mouse button is released, the popup can get back.
Added a new test case for this new behavior.
 2014-03-11 08:07:11 -04:00
Blair McBride
c998e32ec7 Bug 980155 - [Australis] Initialization of overflowable toolbars breaks when adding them dynamically. r=Gijs r=jaws 2014-03-07 05:19:00 -05:00
Gijs Kruitbosch
fadcb07e78 Bug 981418 - followup: add a nullcheck for the height syncing methods in Australis' panelmultiview to avoid generating exceptions from setTimeout-generated calls, rs=jaws over IRC 2014-03-11 18:16:21 +00:00
Mike Conley
a43c9b13b1 Backing out bug 980639 (ba806a1ff84e) for not doing enough to fix CART regression. 2014-03-11 12:44:18 -04:00
Nick Fitzgerald
472c449ff9 Bug 981258 - Clean up breakpoints manually before finishing the browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js test; r=past 2014-03-11 09:42:49 -07:00
Panos Astithas
de5985045e Add more logging around browser toolbox process creation to diagnose an orange (bug 918507). r=vporof,rcampbell 2014-03-11 18:15:42 +02:00
Gijs Kruitbosch
97a3c94f26 Bug 981418 - add onBeforeCreated handler for Australis widget, r=jaws 2014-03-11 00:35:53 +00:00
Blake Winton
3a0888ff7f Bug 981419 - Make the new checkmarks for the Australis bookmarks widget have their own images. ui-r=shorlander, r=Gijs. 2014-03-11 08:21:00 +00:00
Gijs Kruitbosch
034c91b76d Bug 977862 - dragging items onto an empty toolbar shows no drag outline in Australis' Customize Mode, r=mconley 2014-03-09 17:57:13 +00:00
Mihai Sucan
95d4abe349 Bug 979628 - Fix for intermittent browser_webconsole_output_01.js | This test exceeded the timeout threshold; r=me 2014-03-11 13:32:33 +02:00
Mihai Sucan
de77c8314a Bug 917227 - Part 1: network monitor client changes; r=ochameau 2014-03-07 14:14:53 +02:00
Mihai Sucan
bf5b093258 Bug 980835 - Fix for intermittent | browser_webconsole_output_dom_elements_02.js | The current inspector selection is correct - Got [object HTMLParagraphElement], expected [object HTMLBodyElement]; r=me 2014-03-08 23:13:59 +02:00
Patrick Brosset
c2bf773173 Bug 757866 - Highlight and select DOM nodes in the web console output; r=msucan 2014-03-11 12:21:20 +02:00
Mike Conley
221ef27e0e Bug 981062 - [Australis] Revert chunk of bug 963999 causing CART regression on Win 8. r=jaws. 2014-03-10 12:56:00 -04:00
Mark Hammond
6e23f7e193 Bug 956605 - have about:accounts do the right thing based on user logged in states. r=ckarlof 2014-03-10 18:33:00 -07:00
Mark Hammond
cd08779e83 Bug 980182 - more about:accounts tests. r=ttaubert 2014-03-10 18:33:00 -07:00
Tim Taubert
325be3da9b Bug 980839 - Panel UI doesn't prompt for reauth when restarting after password change r=markh 2014-03-10 17:38:41 -07:00
Gijs Kruitbosch
552077f7ee Bug 978048 - remove the tabstoolbar and menubar dragarea indicators for Australis customize mode, r=jaws, ui-r=phlsa 2014-03-07 14:29:00 +00:00
Shane Caraveo
76096a4eb8 Bug 980115 [Australis] social buttons make other buttons squished, r=Gijs 2014-03-10 17:28:42 -07:00
Shane Caraveo
5c1e869058 Bug 960198 [Australis] make sidebars available from a customizable widget, r=Gijs 2014-03-10 17:22:00 -07:00
Shane Caraveo
75e62d9c79 Bug 960198 [Australis] images for sidebar button, r=Gijs 2014-03-07 16:44:00 +00:00
Mike de Boer
b95aa6e46d Bug 960517: [Australis] Windows 8 style toolbars. r=jaws 
--HG--
extra : rebase_source : f61096157953fa2d310facce3dce9f4cd1af5087
 2014-03-10 18:21:02 +01:00
Robert Strong
c7969b2372 Bug 982448 - some fxmetro pref's still being left behind with values without --enable-metro in the mozconfig. r=bbondy 2014-03-12 10:49:43 -07:00
Ryan VanderMeulen
481593de88 Merge fx-team to m-c. 2014-03-10 17:10:25 -04:00
Ryan VanderMeulen
e471f0a9a4 Backed out changeset da039c0c66bc (bug 971116) for mochitest-bc failures. 
CLOSED TREE
 2014-03-10 13:49:42 -04:00
Ed Morley
39a9d96921 Backed out changeset 74568436ab02 (bug 980374) for failures in browser_toolbarbutton_menu_context.js 2014-03-10 17:06:32 +00:00
Marina Samuel
2b53eb62d4 Bug 961587: Only create Windows 8 Touch smart bookmark once a user has intialized their Metro bookmark list. r=mbrubeck, r=mak77 2014-03-10 12:53:19 -04:00
Bill McCloskey
c20cde9d05 Bug 937172 - Change DebuggerProgressListener to use correct WebProgressListener (r=ochameau,past) 2014-03-10 09:34:41 -07:00
Jacek Caban
2eb048d02d Bug 960517 - Don't use DOS file encoding. 2014-03-10 14:31:48 +01:00
Robert O'Callahan
f87fd81842 Bug 975931. Part 11: Make nsDOMWindowUtils::SetDisplayPortForElement take a priority parameter, and set that parameter to 1 in reftests to override automatic displayport selection. r=kats 
--HG--
extra : rebase_source : 07dcbfb67cb2db0bbb26a959517bbbdebd84f10b
 2014-03-08 22:25:15 +13:00
Blake Winton
15339ff208 Bug 971116 - Implement new UITour highlight effect. ui-r=madhava, r=Unfocused 2014-03-10 11:35:03 -04:00
Mike de Boer
a6daac0435 [Australis] Bug 980374: adjust OSX toolbar buttons height to match urlbar and search bar. r=mconley 2014-03-10 15:28:11 +01:00
Mike de Boer
11c6d25b75 [Australis] Bug 960517: Windows 8 style downloads panel. r=jaws 2014-03-07 12:27:21 -05:00
Michael Ratcliffe
0ef4f577a8 Bug 702577 - Show font-family tooltip r=mratcliffe 2014-03-10 13:24:58 +00:00
Mark Goodwin
adbea41542 Bug 961165 - Remove inline scripts from scratchpad.xul. r=bbenvie 2014-03-10 09:00:31 -04:00
Jordan Santell
488eec2432 Bug 899052 - Implement Addon Thread Actor. r=fitzgen, r=shu 2014-03-07 00:09:14 -08:00
Phil Ringnalda
29c6781b1d Merge f-t to m-c 2014-03-08 17:41:33 -08:00
Phil Ringnalda
fd5237f32d Merge m-i to m-c 2014-03-08 17:39:51 -08:00
ffxbld
75d9bafb7b No bug, Automated blocklist update from host bld-linux64-spot-139 - a=blocklist-update 2014-03-08 04:26:39 -08:00
Wes Kocher
f5a2378a98 Merge fx-team to m-c 2014-03-07 17:04:34 -08:00
Justin Dolske
2dcfb7784a Bug 980879 - [Australis] Navigation buttons in urlbar overlapping search bar when resizing a window when on verified identity site. r=Gijs 2014-03-07 19:15:53 -05:00
Jared Wein
e0bf7474bc Bug 977217 - [Australis] Clicking API-widget borders in the menu panel does nothing. r=Gijs 2014-03-07 19:14:31 -05:00
Ryan VanderMeulen
d76583a0fc Merge inbound to m-c. 2014-03-07 15:38:19 -05:00
Nick Fitzgerald
ee055d552b Bug 978019 - Fix breakpoints after reload on immediately invoked function expressions; r=past 2014-03-07 11:06:28 -08:00
Gian-Carlo Pascutto
8958917a4e Bug 971240 - Move phishing/malware test pages to their own domain. r=mmc 2014-03-07 19:12:23 +01:00
Alice0775 White
30bff6ffc9 Bug 978291 - about:downloads can't handle drag events if downloads list is empty; r=mak77 2014-03-07 09:06:00 -05:00
Matthew Noorenberghe
d4df8e412c Bug 935823 - UITour: Add a close button to info panels. r=Unfocused 2014-03-07 13:00:18 -05:00
Florian Quèze
ae60174568 Bug 976544 - Intermittent | browser_get_user_media.js | Unexpected Exception: TypeError: PopupNotifications.panel.firstChild is null - third attempt, r=Gijs. 2014-03-07 18:31:30 +01:00
Dão Gottwald
7000d0a5fe Bug 969458 - Apply the SVG fade-out mask only to toolbarbuttons with long enough labels. r=jaws 2014-03-07 18:14:47 +01:00
Jared Wein
f38147ff08 Bug 979477 - [Australis] Move to only showing two lines of text in the menu panel. r=mconley 2014-03-07 16:24:20 -05:00
Ryan VanderMeulen
5fbfa861f5 Merge m-c to fx-team. 2014-03-07 15:45:17 -05:00
Wes Kocher
83398347ef Merge m-c to inbound 2014-03-07 17:39:52 -08:00
Bas Schouten
bde06b3dca Bug 963073 - Merge tiling branch. r=Bas,jrmuizel,BenWa 
http://hg.mozilla.org/users/bschouten_mozilla.com/tiling/summary

This work is mainly porting tiled layers to new textures, implementing
double-buffered tiles and implementing a texture client pool, to be used by
tiled content clients.

Any questions regarding this patch should go to:
Bas Schouten <bschouten@mozilla.com>
Chris Lord <clord@mozilla.com>
Nicolas Silva <nsilva@mozilla.com>

In their absence questions can be directed to:
Jeff Muizelaar <jmuizelaar@mozilla.com>
Benoit Girard <bgirard@mozilla.com>
 2014-03-07 22:34:04 +01:00
Ed Morley
bf7e2c6121 Merge mozilla-central and fx-team 2014-03-07 15:54:49 +00:00
Ed Morley
10aebf48c2 Backed out changeset dcec4c42cd18 (bug 757866) for bug 980835 2014-03-07 15:05:31 +00:00
Carsten "Tomcat" Book
756c257f98 merge fx-team to mozilla-central 2014-03-07 13:06:05 +01:00
Blake Winton
c4e5e6a262 Bug 979378 - Update the menu panel checkmark to a consistent item that fits with the panel style. ui-r=shorlander, r=gijs 2014-03-07 06:52:00 -05:00
Marco Bonardo
71d5bb404a Bug 967192 - Bookmarks restore and import should use OS.File. r=mano 2014-03-07 08:41:47 +01:00
Wes Kocher
8f82874c66 Merge m-c to inbound 2014-03-06 18:27:43 -08:00
Tim Taubert
cd1151140f Bug 976683 - Tools menu copy should match customize menu for reauth, and should direct user to FxA reauth page r=markh 2014-03-06 20:42:54 +01:00
Dão Gottwald
e645cbd933 Bug 978767 - Hovering over the zoom controls and cut/copy/paste in the menu makes the panel layout jump on Linux. r=mconley 2014-03-07 10:00:28 +01:00
Matthew Noorenberghe
fa51524955 Bug 970788 - UITour: Remove the incorrect size attributes on annotation panels on Linux to workaround Ubuntu glitches. r=Gijs 2014-03-06 18:59:00 +13:00
Mark Hammond
12eb0933da Bug 969528 - only show the 'login needed' UI state when in a LOGIN_FAILED_LOGIN_REJECTED state. r=ttaubert 2014-03-07 15:41:33 +11:00
Brian Grinstead
2b32d0a5b1 Bug 967033 - DevTools Themes - Active arrow for side menus is missing on windows. r=vporof 2014-03-05 10:32:30 -06:00
Jared Wein
051b67e346 Bug 928722 - Resample the system scrollbar width when the UI theme is changed or mouse plugged in. (pair programmed with mconley). r=mconley 2014-03-06 09:17:00 -05:00
Gijs Kruitbosch
5358bfd422 Bug 971956 - fix styling of items in widget overflow list, r=mconley 
--HG--
extra : rebase_source : 972f12d649e973b820b2bd679728c435bf1908ad
 2014-03-05 16:58:27 -05:00