Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-08 04:27:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
344,081 Commits 615 Branches 98 Tags 5.9 GiB
21d6e52454
Commit Graph

877 Commits

Author SHA1 Message Date
Matt Brubeck
14b0f3674d Bug 902505 - Set a no-op CSS viewport on Metro to prevent clipping subframes improperly. r=jimm 2013-11-08 14:04:13 -05:00
Kamil Jozwiak
953b8beb8d Bug 927038 - Using nsIUUIDGenerator rather than Date.now(). r=mbrubeck 2013-11-07 23:18:06 -05:00
Tim Abraldes
d8cbe657a0 bug 895581. Remove a mochitest-metro test that assumes double-tap should select; double-tap now causes a zoom instead. r=orange 2013-11-19 01:55:07 -08:00
Allison Naaktgeboren
659e5ac146 Bug 895581 Double tap should zoom content instead of selecting text.r=mbrubeck 2013-11-18 23:13:05 -08:00
Matt Brubeck
afb0b98b12 Bug 935554 - Don't show navbar when url changes in a background tab. r=rsilveira 2013-11-06 12:06:47 -08:00
Carsten "Tomcat" Book
8825880843 merge b2g-inbound to mozilla-central 2013-11-06 13:11:03 +01:00
Matt Brubeck
3fee3ee325 Bug 934744 - Support inspector and style editor in the chrome window [r=ally] 2013-11-05 15:29:41 -08:00
Alfredo Yang
af01190bbc Bug 853356 - Part1 Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-11-05 16:29:27 +08:00
Kan-Ru Chen (陳侃如)
3b2be7096b Backout 3903cb4b779f 2013-11-05 15:00:31 +08:00
Alfredo Yang
0d61f474ce Bug 853356 - Part1 Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-11-05 14:05:52 +08:00
Kamil Jozwiak
aebfe45a50 Bug 849564 - Added view page source under the app bar settings icon. r=mbrubeck 2013-11-04 14:18:21 -08:00
Matt Brubeck
10ce9b67d4 Bug 934496 - Don't update progress bar for events in background tabs [r=jimm] 2013-11-04 14:15:43 -08:00
Matt Brubeck
bf394296f5 Bug 928201 - Change Run to Open in Metro download bar [r=emtwo] 2013-11-01 16:10:49 -07:00
Reuben Morais
1d3b24a4d5 Backed out 4 changesets (bug 853356) for breaking permission prompts. 2013-11-06 01:32:42 -02:00
Gijs Kruitbosch
75143f25bb Backed out changeset c672c4cd6c7f (bug 928201) for mochitest-mc purply-bustage, rs=bustage on a CLOSED TREE 2013-11-02 14:07:23 +01:00
Matt Brubeck
ceb44bf23a Bug 933012 - Remove unused Metro theme code and resources [r=rsilveira] 2013-11-01 16:10:49 -07:00
Matt Brubeck
10ce495a44 Bug 928201 - Change Run to Open in Metro download bar [r=emtwo] 2013-11-01 16:10:49 -07:00
Rodrigo Silveira
592636cf4e Bug 919232 - arrow keys not working in form autofill popup r=mbrubeck 
--HG--
extra : rebase_source : 7cfde9462e86869e032d07b21726c247b1f33f82
 2013-10-16 14:41:42 -07:00
Sam Foster
351dc76914 Bug 931115 - Cache color info for favicon urls on colorUtils. r=mbrubeck 
--HG--
extra : rebase_source : d6147e13fac276f0552dfab40275d69a680635ab
 2013-10-31 14:00:28 -07:00
Jim Mathies
45e93927a0 Bug 930995 - Display port should be set sync when the apz requests a repaint. r=kats 2013-11-01 05:09:37 -05:00
Doug Turner
951d114a44 Backing out 7fe2c77ebbf2 2013-10-31 20:25:03 -07:00
Marina Samuel
d89a79e592 Bug 925457: Clicking the urlbar should reset tap coordinates to null so we never decide to shift the browser. r=jmathies 2013-10-29 00:17:45 -04:00
Alfredo Yang
4317439507 Bug 853356 - Part 1: Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-10-26 21:19:32 -04:00
Jim Mathies
6fcae33467 Bug 907100 - Add some comments and clean things up a bit. r=mbrubeck 2013-10-24 16:35:07 -05:00
Jim Mathies
332bb5e293 Bug 907100 - When content updates its scroll position, synchrnously communicate the change back to the apz. r=mbrubeck 2013-10-24 16:35:07 -05:00
Raymond Lee
958b16ee0d Bug 926736 - Update metro caller for new return type of get directory methods in DownloadIntegration.jsm r=mbrubeck 2013-10-23 10:07:51 +08:00
Rodrigo Silveira
fe065daf83 Bug 918225 - Right-click drop down options are offset r=mbrubeck,jimm 2013-10-22 17:30:19 -07:00
Sam Foster
91ee7b07ac Bug 897113 - add noContext/contextmenu toggle for richgrid, disable selection for snapped view and awesomebar results. New selectNone richgrid method. r=rsilveira 2013-10-22 16:32:42 -07:00
Wes Kocher
16d6e76b4e Merge inbound to m-c 2013-10-22 18:11:06 -04:00
Sam Foster
1b8b912162 Bug 927226 - Add build-in animation for start grids. r=rsilveira,mbrubeck 2013-10-17 12:14:08 -07:00
Marina Samuel
69257c7198 Bug 925467: Part 2: Blur the about:config search box to close the osk when tapping on content. r=jmathies 2013-10-21 13:18:39 -04:00
Marina Samuel
8d566771b8 Bug 925467: Part 1: Workaround to make OSK more consistent. r=jmathies 2013-10-21 13:02:02 -04:00
Sam Foster
4fbe199479 Bug 927938 - Remove extra refresh of TopSites tile backgrounds. r=rsilveira 
--HG--
extra : rebase_source : 29efd6e3c8385d4c3e72d55d4a5b109b474ce1c7
 2013-10-17 15:47:22 -07:00
Phil Ringnalda
9cb8b39271 Back out dc42a14663fe (bug 927226) for either causing or landing on bustage 
CLOSED TREE
 2013-10-17 20:41:13 -07:00
Matt Brubeck
21eb3c1a72 Back out bug 925796 and bug 923596 for breaking Metro on a CLOSED TREE 2013-10-17 15:23:36 -07:00
Sam Foster
c2336b47b9 Bug 927226 - Add build-in animation for start grids. r=rsilveira 2013-10-17 12:14:08 -07:00
Matt Brubeck
868db0c7ec Bug 923596 - Integrate shumway into Metro UI (disabled by default) [r=jimm,gps] 2013-10-17 10:49:54 -07:00
Wes Kocher
e88d48b47d Merge m-c to inbound 2013-10-21 20:47:53 -04:00
Joshua Cranmer
51d2533270 Bug 900526, part 5: Move DIST_SUBDIR to moz.build, r=gps 2013-10-21 13:10:04 -05:00
Sam Foster
febecd8854 Bug 925425 - richgrid slots implementation, revised tests. r=mbrubeck 2013-10-16 16:17:17 -07:00
Jim Mathies
75376d248c Bug 917385 - Update browser_inputsource.js test. mbrubeck 2013-10-16 12:14:59 -05:00
Jim Mathies
42e157ed18 Bug 917385 - Move precise/imprecise input tracking down to widget thus making it more reliable with apz enabled. r=tabraldes, mbrubeck 2013-10-16 12:14:55 -05:00
Matt Brubeck
70ec735ff9 Bug 913909 - Fix saving of scroll offset from APZC [r=jimm] 2013-10-15 14:49:02 -07:00
Sam Foster
a36a131eb3 Bug 925418 - replace richgrid.children with .items references, plus minor nits. r=mbrubeck 2013-10-14 09:33:12 -07:00
Makoto Kato
f6a8ad20c1 Bug 919929 - AlertsService for Metro should send alertshow and alertfinished observer. r=jimm 2013-10-09 11:15:41 +09:00
Kamil Jozwiak
2e843fb9dc Bug 830618 - Check meta data then create appropriate menu entry that will take user to MS store. r=jimm 2013-10-10 10:59:48 -04:00
Kamil Jozwiak
bab7ad78e3 Bug 917020 - Removed the startup GUI portion from Metro options. r=mbrubeck 2013-10-09 10:50:33 -07:00
Rodrigo Silveira
9926ce4162 Bug 904277 - Cursor can not be seen in scroll-bar region in Metro Firefox r=mbrubeck 2013-10-08 16:52:08 -07:00
Matt Brubeck
596547a7a4 Bug 924257 - Remove unneeded moz.build/Makefile.in from metro test dir [r=Ms2ger,rsilveira] 2013-10-08 14:20:58 -07:00
Matt Brubeck
5721c047db Bug 923273 - Convert MOCHITEST_METRO_FILES to manifests [r=gps,rsilveira] 
--HG--
rename : browser/metro/base/tests/mochiperf/perfhelpers.js => browser/metro/base/tests/mochiperf/head.js
 2013-10-08 14:19:06 -07:00
Matt Brubeck
f48f661be8 Bug 923810 - Update the Metro progress bar when switching tabs [r=jimm] 2013-10-08 14:08:42 -07:00
Gavin Sharp
992c46c5f1 Bug 922338: update link to phishing protection info in Firefox, r=dao,wesj,mbrubeck,fabrice 2013-10-08 14:00:48 -07:00
Marina Samuel
7ca6dc1ffa Bug 917052 - Add dialog box specific tests. r=mbrubeck 2013-10-08 16:33:35 -04:00
Marina Samuel
e39327f26d Bug 917052 - Dialog box to confirm before clearing private data. r=mbrubeck 2013-10-08 16:33:31 -04:00
Marina Samuel
bb55ea48d0 Bug 906048 - Shift browser up to avoid covering content. r=jmathies 2013-10-08 16:02:52 -04:00
Matt Brubeck
0e632e0dae Bug 923828 - Make the download-complete notification toggleable [r=emtwo] 2013-10-08 08:27:08 -07:00
Matt Brubeck
0aa375784e Bug 923828 - Show the Metro download button only during downloads [r=emtwo] 2013-10-08 08:27:07 -07:00
Matt Brubeck
ba32db4fed Bug 923828 - Separate circular progress and download button styles [r=emtwo] 2013-10-08 08:27:06 -07:00
Matt Brubeck
3c3cb50855 Bug 922934 - Hide Metro context menus on touchstart, scroll, or mousedown [r=emtwo] 2013-10-02 14:24:18 -07:00
Matt Brubeck
c501c2ae3e Bug 915328 - Metro front-end fixes for cross slide with async panning [r=sfoster] 2013-10-02 18:03:05 -07:00
Matt Brubeck
233565104b Back out ca56f76237df (bug 922934) because of metro-chrome test failures 2013-10-02 16:00:37 -07:00
Rodrigo Silveira
ffefc2e8be Bug 859579 - disable pdf.js in metro Firefox r=mbrubeck 
--HG--
extra : rebase_source : 4a70d0b03269e0a600e3e738fdcd654f9e710f4c
 2013-10-02 14:21:39 -07:00
Matt Brubeck
3524031b70 Bug 922934 - Hide Metro context menus on touchstart, scroll, or mousedown [r=emtwo] 2013-10-02 14:24:18 -07:00
Matt Brubeck
0b6c80bbe8 Bug 917422 - Update Do Not Track strings for Metro and add a Learn More link [r=rsilveira] 2013-10-01 17:23:48 -07:00
Ryan VanderMeulen
892a11e37a Merge m-c to fx-team. 2013-10-01 17:24:45 -04:00
Marina Samuel
e8e43d95f9 Bug 905808 - Reuse browser shift code from SelectionHandler to center findbar searches. r=mbrubeck 2013-10-01 14:21:56 -07:00
Martijn Wargers
36a41557c9 Bug 922008 - Remove more enablePrivilege calls, part2. r=jmaher 2013-09-30 11:30:01 +02:00
Matt Brubeck
a5f3928efe Bug 922337 - Remove unused viewport zooming code from /browser/metro [r=jimm] 2013-09-30 20:27:05 -07:00
Matt Brubeck
5ba8170923 Bug 900072 - Work around line wrapping bugs in flyoutpanels [r=sfoster] 2013-09-25 13:42:46 -07:00
Matt Brubeck
5c2f923778 Bug 875924 - Initialize the NewTabUtils thumbnail expiration filter [r=sfoster] 2013-09-25 13:41:29 -07:00
Raymond Lee
f2a7fce4e8 Bug 875731 - Replace callers of nsIDownloadManager.usersDownloadsDirectory with Downloads.getUserDownloadsDirectory in browser/metro/. r=mbrubeck 2013-09-23 13:10:38 +08:00
Wes Kocher
1e02f948e4 Merge fx-team to m-c 2013-09-24 20:06:37 -07:00
Jim Mathies
bfce5bcbf1 Bug 915213 - Support chrome hit testing in the metrofx front end. r=bbondy 2013-09-24 16:17:26 -05:00
Matt Brubeck
cf26d48c87 Bug 920090 - Remove unused ActivityObserver code from Metro [r=jimm] 2013-09-24 13:17:03 -07:00
Matt Brubeck
863e914708 Bug 891056 - Don't show overlay buttons in snapped view [r=rsilveira] 2013-09-24 13:16:35 -07:00
Matt Brubeck
54854d9f38 Bug 891056 - Use resize events instead of Windows notifications for snapped view [r=rsilveira] 2013-09-24 13:16:11 -07:00
Rodrigo Silveira
3d9483f1ef Bug 891667 - Adding test for fix r=mbrubeck 
--HG--
extra : rebase_source : 2001d1f8ea387fed567d8fdb1c357acaa90057c6
 2013-09-23 17:03:07 -07:00
Gregory Szorc
7bd3c0ae36 Bug 901990 - Part 2: Upgrade xpcshell manifests; r=ted 
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell-unpack/head_unpack.js => toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
 2013-09-24 11:50:08 -07:00
Rodrigo Silveira
e88aa0313f Bug 916383 - Adding test for fix r=mbrubeck 
--HG--
extra : rebase_source : 1f0e9b7768e63d1e5dc8d402456cbeebbf5a6b05
 2013-09-16 12:57:11 -07:00
Ed Morley
a0e037f490 Merge mozilla-central and inbound 2013-09-20 10:55:03 +01:00
Marina Samuel
c65775caf0 Bug 904702 - Toggle download-progress notifications. r=mbrubeck 2013-09-19 13:55:54 -04:00
Honza Bambas
894ba59236 Bug 913807 - HTTP cache v2: API+top service+integration+tests, off by default, r=michal+ehsan+mark.finkle+fabrice+mhammond+gavin 2013-09-20 11:11:25 +02:00
Rodrigo Silveira
25a3b0dfc3 Bug 891667 - Define and implement keyboard interaction with half-height autocomplete. 
--HG--
extra : rebase_source : b79131c2937a3c64db3a7b2dbf7940df9fc8e45d
 2013-09-18 21:27:11 -07:00
Rodrigo Silveira
5c2b72b289 Bug 916383 - Invisible autocomplete items selectable by keyboard when 'your results' not shown 
--HG--
extra : rebase_source : dc9ffd9026b5060d9606140ccfcc77de1ff972aa
 2013-09-16 12:57:11 -07:00
Sam Foster
5246a5c014 Bug 903866 - Ensure the appbar and url input field start life as visible. r=mbrubeck 2013-09-18 14:53:28 -07:00
Sam Foster
f68da31e4c Bug 916887 - waitForEvent should return the promise that is resolved after its cleanup is complete. r=mbrubeck 
--HG--
extra : rebase_source : fb9bf106058495563e3fa37802b7bb320db773bf
 2013-09-17 11:12:40 -07:00
Jim Mathies
4068a3d163 Bug 916901 - Address issue with precise/imprecise detection when apz consumes touch. r=mbrubeck 2013-09-17 06:14:36 -05:00
Brian R. Bondy
4fc5bd78af Bug 911530 - Junior style buttons not appearing after swiping autocomplete window away. r=mbrubeck 2013-09-17 07:08:18 -07:00
Brian R. Bondy
ba3bbe287d Bug 910597 - Downloaded amount is always reported as unknown size. r=mbrubeck 2013-09-17 07:04:01 -07:00
Phil Ringnalda
f5562801b3 Back out 2bdc2ba16e56 (bug 856470) for making bug 910521 permaorange 2013-09-15 10:09:39 -07:00
Justin Dolske
e597097f30 Bug 856470 - Password manager no longer requires initialization at startup. r=mfinkle 2013-09-14 21:27:20 -07:00
Rodrigo Silveira
04eb8de16c Bug 898106 - Dim screen when autocomplete popup shows up. r=mbrubeck 
--HG--
extra : rebase_source : 98e4ac57ce5ee8bf3d9c2d533d9cfc05587e8631
 2013-09-12 14:20:30 -07:00
Marina Samuel
c228223118 Bug 908068 - Specifically check for successful login before displaying the 'connected' screen for sync. r=ally 2013-09-12 17:33:51 -04:00
Jonathan Wilde
5bd0f1c938 Bug 904417 - Adjust spacing and font sizes on start screen and autocomplete popup to more closely match comps. r=sfoster 
--HG--
extra : rebase_source : 5b3be3c4940bbc6e86cb5130963e6229870435e5
 2013-08-30 13:07:19 -07:00
Ryan VanderMeulen
ed0259103b Merge fx-team to m-c. 2013-09-11 21:48:20 -04:00
Marina Samuel
f34a072acc Bug 906772 - Adjust infobar location above navbar when infobar appears after navbar. r=mbrubeck 2013-09-11 17:26:43 -04:00
Rodrigo Silveira
ab16701d15 Bug 913229 - Snapped displays cropped multi-column tiles after touch scroll r=mbrubeck 
--HG--
extra : rebase_source : bda64fdfb199f0581d2c4f0154afdabebd6700c7
 2013-09-05 16:32:43 -07:00
Marina Samuel
e437e7fb0b Bug 910618 - Clear progress on download cancel and on interaction with infobar. r=jmathies 2013-09-10 19:07:58 -04:00
Carsten "Tomcat" Book
d4f6be647f merge mozilla-central to mozilla-inbound 2013-09-11 13:50:28 +02:00
Boris Zbarsky
505b47db7a Bug 914450. findElementWithViewId can throw if it finds nothing, so be careful to catch that exception. r=bbondy 2013-09-11 01:16:24 -04:00
Brian R. Bondy
a395f4aaa9 Bug 882142 - Initiate Metro app update requests via retarting the app like Desktop Firefox does. r=jimm 2013-09-10 10:24:56 -04:00
Sam Foster
2b008e1e0d Bug 893763 - Notify of resuming downloads at startup. r=mbrubeck 2013-09-09 17:20:51 -07:00
Jim Mathies
cd24c85048 Bug 907098 - Prevent scrolling of chrome content using apz. r=mbrubeck 2013-09-09 13:57:25 -05:00
Jonathan Wilde
2c2a933d84 Bug 892240 - Add tests for trimming and formatting of the URI r=jimm,sfoster 
--HG--
extra : rebase_source : 4decf908068c2ca35514b87a619480327d50bb8e
 2013-07-16 10:59:18 -07:00
Jim Mathies
77e3ab9b5b Bug 898055 - Disable some apz debug output. r=bbondy 2013-09-06 14:56:13 -05:00
Ryan VanderMeulen
63254ca4a6 Backed out changeset eb46f1ed8c8c (bug 897113) for mochitest-mc failures. 2013-09-06 15:50:28 -04:00
Allison Naaktgeboren
ccc72460e4 Bug 897113 Tiles on auto-complete screen should not be selectable.r=sfoster 2013-09-06 10:54:14 -07:00
Matt Brubeck
066f30b9b7 Bug 891056 (part 1) - Code cleanup for autocomplete CSS [r=rsilveira] 2013-09-05 17:40:17 -07:00
Matt Brubeck
bff32d823c Bug 909019 - Rename and simplify BrowserUI new tab API [r=ally] 2013-09-05 17:40:17 -07:00
Mike Hommey
f8bc7fa754 Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
Eklavya Mirani
8e19a7c89e Bug 878691 - Use FormHistory.jsm instead of nsIFormHistory2 in metro; r=mbrubeck 2013-09-03 09:52:29 -07:00
Ryan VanderMeulen
852d2cf85e Merge fx-team to m-c. 2013-08-30 21:00:08 -04:00
Marina Samuel
7b9c5ae03d Bug 904662 - Show layered notifications. r=mbrubeck 2013-08-30 19:21:51 -04:00
Kamil Jozwiak
11ea09ddeb Bug 885383 - Monocles don't appear when tabbing into an edit field. r=jimm 2013-08-29 16:07:47 -04:00
Ryan VanderMeulen
2cd2506f4c Backed out changeset b3bea36ce719 (bug 901607) for mochitest-mc orange. 
CLOSED TREE
 2013-08-28 16:58:25 -04:00
Ryan VanderMeulen
d5604b3c54 Backed out changeset 747b66a08641 (bug 878691) for not being ready to land yet. 
CLOSED TREE
 2013-08-28 16:51:05 -04:00
Eklavya Mirani (eklavyamirani@hotmail.com)
7d6e738250 Bug 878691 - Make Metro Firefox form history use async FormHistory.jsm instead of deprecated nsIFormHistory2. r=mbrubeck 2013-08-28 15:36:58 -04:00
Jim Mathies
ad27d6fab6 Bug 901607 - Add front end sub-frame scroll support when apz is disabled using BrowserElementPanning for metrofx. r=mbrubeck 2013-08-28 12:41:11 -05:00
Tim Abraldes
01ab3bb5bb bug 893961. Clean up metro sync strings. r=mbrubeck 2013-08-28 10:27:32 -07:00
Tim Abraldes
5180420fe8 bug 904230. Make nsIWinMetroUtils available as Services.metro. r=mbrubeck for the metro piece. r=rnewman for the sync piece. r=dolske for the toolkit piece. 2013-08-28 10:27:32 -07:00
Brandon Benvie
3c85a195b1 Bug 909782 - TabLists inheriting from BrowserTabList need to be updated to change "iterator" to "getList". r=mbrubeck, r=mleibovic 2013-08-28 10:57:59 +02:00
Rodrigo Silveira
1ee6611344 Bug 904893 - Snapped view testing r=sfoster 2013-08-26 16:32:50 -07:00
Rodrigo Silveira
546e845cf4 Bug 907244 - Test fix r=mbrubeck 
--HG--
extra : rebase_source : 1c62f2da76e193fcece8094e881f7617f52d0117
 2013-08-27 12:50:09 -07:00
Rodrigo Silveira
6cb92daac4 Bug 907244 - Opening a new tab when the page has focus doesn't correctly focus the location bar r=mbrubeck 
--HG--
extra : rebase_source : 97a91ac1aca8c4c1e27076bd9ccb03ead33ee3fd
 2013-08-26 18:25:38 -07:00
Jim Mathies
0b07a4df07 Bug 903740 - Improvements to context ui visibility plus some tests. r=mbrubeck 2013-08-27 09:58:43 -05:00
Jim Mathies
527fd62b27 Bug 909482 - Fix for getViewId exception when running without apz. r=botond 2013-08-26 16:00:33 -05:00
Sam Foster
5a776400e9 Bug 897099 - Update download progress-ring graphics 2013-08-26 16:52:32 -07:00
Rodrigo Silveira
501055e733 bug 904893 - Splitting head.js into multiple files r=sfoster 
--HG--
extra : rebase_source : fd5e076a9f7cc17e86e7303f73cdeb61a1810465
 2013-08-26 09:40:30 -07:00
Rodrigo Silveira
c05f2a16c0 bug 904893 - Snapped view testing r=sfoster 
--HG--
extra : rebase_source : 870972071ae6eddf90e35179af8301f27476f5ba
 2013-08-21 18:48:14 -07:00
msamuel@mozilla.com
690b1512cc Bug 908179 - Adjust text in about flyout for clearer localization. r=mbrubeck 2013-08-26 12:51:58 -04:00
Justin Dolske
cc006be88d Bug 355063 - Password manager does not work on script-generated forms, should use new DOMFormHasPassword event instead. r=mattn,jwilde,margaret 2013-08-23 20:28:11 -07:00
Matt Brubeck
119c24a35e Bug 906047 - Remove unused code from metro/base/content/Util.js [r=sfoster] 
--HG--
extra : rebase_source : 76af61778df8adf89b63006e7331ed69e1c7b32c
 2013-08-23 17:10:29 -07:00
Sam Foster
4c871cdcf9 Bug 893091 - New populateFragmentFromString+tests, format the save-or-run download notification bar text. r=mbrubeck 2013-08-23 16:29:51 -07:00
Sam Foster
e5aa0369f2 Bug 848137 - Begin break out of Utils.js into a ContentUtil.jsm module. r=mbrubeck 2013-08-23 13:58:55 -07:00
Marina Samuel
c7b9f2067f Bug 907520 - Close soft keyboard when findbar closes. r=mbrubeck 2013-08-23 16:47:13 -04:00
Jim Mathies
a73e661ef2 Bug 906910 - Flush active tile assets on close of the browser. r=sfoster 2013-08-22 16:42:54 -05:00
Jim Mathies
4bbb688705 Bug 906735 - Fixup dpi issues when running browser_context_menu_tests.js locally. r=rsilveira 2013-08-22 16:42:53 -05:00
Tim Taubert
249f281678 merge m-c to fx-team 2013-08-22 11:14:11 +02:00
Tim Taubert
a84a0b5f89 Backed out changeset 91d27f0ac7dd (bug 355063) 2013-08-22 09:22:16 +02:00
Ms2ger
6a7bc47591 Bug 906351 - Use @DEPTH@ even more; r=ted 2013-08-22 08:55:59 +02:00
Justin Dolske
8b2b5b6f7c Bug 355063 - bustage followup for Android/Metro. r=sparky 2013-08-21 20:09:45 -07:00
Botond Ballo
f4b3e0c923 Bug 898580 - Metro mechanism for content to inform APZC about scroll events. Handles multi-APZC. r=bbondy, r=kats 2013-08-12 16:31:49 -04:00
Rodrigo Silveira
531820f87c Bug 903178 - Start screen should scroll vertically when in portrait mode r=sfoster 2013-07-29 11:01:36 -07:00
Trevor Saunders
cccb35afb2 bug 846185 - don't call into js when creating accessibles r=surkov, smaug 2013-07-19 00:13:35 -04:00
Marina Samuel
2375037301 Bug 905640 - Clear the circular progress at the end of a download. r=jimm 2013-08-19 13:40:09 -04:00
Jim Mathies
58d8e60c37 Bug 904163 - Insure inputs that receive press-hold are focused. Fixes issues with selected text not being visible. r=ally 2013-08-19 04:26:17 -05:00
Jim Mathies
601263a118 Bug 812529 - Add 1.4 and 1.8x selection monocle images. r=mbrubeck 2013-08-19 04:25:59 -05:00
Jim Mathies
bf0720c185 Bug 901019 - Reset selection monocles when pasting text into chrome or content. r=bbondy 2013-08-19 04:25:59 -05:00
Jim Mathies
4d104f3de4 Bug 903737 - Detect whether the user right-clicked selected text properly. r=rsilveira 2013-08-19 04:25:58 -05:00
Jim Mathies
15028072f1 Bug 906320 - Cleanup metro test timeouts. r=mbrubeck 2013-08-19 04:25:58 -05:00
Sam Foster
328160be66 Bug 904317 - observe viewstate in view markup, call _adjustDOMforViewState at init and from onViewStateChange. r=rsilveira 
--HG--
extra : rebase_source : accadb9ffa0a8cb3026ddb5aff0952cfd8a5186c
 2013-08-16 16:56:50 -07:00
Matt Brubeck
a7c8f2efde Bug 882074 - i18n for Metro keyboard shortcuts [r=rsilveira] 2013-08-15 16:31:52 -04:00
Marina Samuel
52b12a59fd Bug 883953 - Fix test bustage. r=me 2013-08-15 15:57:24 -04:00
Marina Samuel
bb911bfebf Bug 883953 - Fix test failures. r=mbrubeck 2013-08-15 13:06:46 -04:00
Marina Samuel
7ee28654ee Bug 883953 - Part 2: Implement infobar behaviours. r=mbrubeck 2013-08-15 13:06:42 -04:00
Marina Samuel
9c021b09db Bug 883953 - Part 1: Move infobar to bottom of screen. r=mbrubeck 2013-08-15 13:06:39 -04:00
Ed Morley
978a56d645 Backed out changeset bc56c811963e (bug 903737) for metro-chrome failures 2013-08-15 16:58:28 +01:00
Ed Morley
1cffa9896c Backed out changeset 0dbbeaba9998 (bug 901019) 2013-08-15 16:58:06 +01:00
Jim Mathies
52240c6f55 Bug 901019 - Disable selection ui when pasting into the address bar using the context menu. r=bbondy 2013-08-15 06:16:42 -05:00
Jim Mathies
f91e1bd439 Bug 903737 - Fix: right click on non-selected content with selected text in page brings up text selection context menu. r=rsilveira 2013-08-15 06:16:42 -05:00
Rodrigo Silveira
084c6c79d9 Bug 904059 - the 'Tab Bar' is auto-dismissed when closing a tab(s) r=mbrubeck 2013-08-13 17:19:57 -07:00
Ryan VanderMeulen
a3cadb0a2d Backed out changesets d864c70c64c9 and e4d7f9580e5a (bug 883953) for mochitest-mc orange. 2013-08-13 16:23:09 -04:00
Rodrigo Silveira
6d6cab6226 Bug 904058 - the Tab Bar isn't auto-dismissed once a new tab has been created using CTRL + T r=jimm 2013-08-13 11:21:57 -07:00
Marina Samuel
54df8565d2 Bug 883953: Part 2: Implement infobar behaviours. r=mbrubeck 2013-08-13 13:36:28 -04:00
Marina Samuel
bf851fef13 Bug 883953: Part 1: Move infobar to bottom of screen. r=mbrubeck 2013-08-13 13:34:36 -04:00
Allison Naaktgeboren
a7d5d40350 Bug 892038 - It should be possible to add new prefs in about:config even after searching.r=sfoster 2013-08-13 10:32:16 -07:00
Jim Mathies
e9fe513421 Bug 902937 - Fixup scrollBy in StartUI.js and tests. r=mbrubeck 2013-08-13 05:23:53 -05:00
Jim Mathies
b1dfae2c59 Bug 902937 - Remove embedded scrollbox from about start. r=mbrubeck 2013-08-13 05:23:53 -05:00
Jim Mathies
8b909bada6 Bug 903766 - Fixes for misc. js errors while running tests. r=tabraldes, sfoster 2013-08-12 15:24:26 -05:00
Jim Mathies
351e5fefe4 Bug 904111 - Fix for flyout reference to invalid object. r=tabraldes 2013-08-12 15:22:01 -05:00
Matt Brubeck
642db17538 Bug 819146 - Control/shift-enter in Metro urlbar is broken [r=ally] 2013-08-12 17:17:37 -07:00
Sam Foster
96e0cd2235 Bug 895519 - Rework tiles favicon treatment + tweaks to meet revised design. r=rsilveira 2013-08-10 01:29:22 -07:00
Jonathan Wilde
d7dfa04b5f Bug 894715 - Part 2 - Fix trimming issue. r=ally 2013-08-09 22:42:55 -07:00
Jonathan Wilde
5457da45c5 Bug 894715 - Part 1 - Failing testcase for URLs copied with trimming. r=sfoster 2013-08-01 18:55:44 -07:00
Jonathan Wilde
1a0e8052c0 Bug 903287 - Work - NewUI - Implement correct headings for the autocomplete screen. r=mbrubeck 
--HG--
extra : rebase_source : 6b3e3fe0798122d27e5b342a98c316dff69d1bea
 2013-08-09 16:24:45 -07:00
Jonathan Wilde
20be115035 Bug 903294 - Work - NewUI - Hide entire "Your Results" section when there are no autocomplete results. r=mbrubeck 
--HG--
extra : rebase_source : 71860ebe8e5aa0d84c294133427f148b5eb4006d
 2013-08-08 23:38:31 -07:00
nootanghimire
d75b2318ad Bug 898125 - Add 'use strict'; and make changes accordingly [r=mbrubeck] 2013-08-09 16:45:58 -07:00
Matt Brubeck
3c077e5bb9 Bug 903541 - Fix duplicate contextmenu handling on about:start [r=jimm] 2013-08-09 12:53:08 -07:00
Jim Mathies
dbe22870c5 Bug 903364 - Fix: Mouse scrollbar remains visible on start tab after touch. r=rsilveira 2013-08-09 13:40:36 -05:00
Jim Mathies
b85b9e909d Bug 851130 - Repush misc. code cleanup and added support for bcast_preciseInput and bcast_windowState in start tabs. (First push was empty.) r=me 2013-08-09 04:57:36 -05:00
Jim Mathies
3b9b876f2a Bug 902713 - Split bcast_urlbarState into two bimodal broadcasters, and touch up various uses in css. r=jwilde 2013-08-09 04:50:59 -05:00
Jim Mathies
70732017b0 Bug 851130 - Part 9 - Deal with tab switching from StartUI tabs that have active context actions. r=sfoster 2013-08-09 04:50:59 -05:00
Jim Mathies
fd8d10a4c0 Bug 851130 - Part 8 - Misc. fixes to ContextUI. r=mbrubeck 2013-08-09 04:50:59 -05:00
Jim Mathies
bdd09c8598 Bug 851130 - Part 7 - Update all tests to support new start tab. r=sfoster 2013-08-09 04:50:59 -05:00
Jim Mathies
67b5c14c84 Bug 851130 - Part 6 - Fixup view destructors so they don't leak. r=sfoster 2013-08-09 04:50:59 -05:00
Jim Mathies
1ffc6e2633 Bug 851130 - Part 5 - Add support for about:start alias. r=mbrubeck 2013-08-09 04:50:58 -05:00
Jim Mathies
e03433b150 Bug 851130 - Part 4 - Remove apzc exclusions for start page. r=bbondy 2013-08-09 04:50:58 -05:00
Jim Mathies
a9188be7a3 Bug 851130 - Part 3 - Fixup new StartUI tab object and dependent views. r=sfoster 2013-08-09 04:50:58 -05:00
Jim Mathies
c71dc2606f Bug 851130 - Part 2 - Remove StartUI object from browser-ui. r=mbrubeck 2013-08-09 04:50:58 -05:00
Jim Mathies
335ebeb153 Bug 851130 - Part 1 - Code reshuffle to move StartUI to a tab. r=sfoster 2013-08-09 04:34:36 -05:00
Rodrigo Silveira
1a0d4f30d2 Bug 831440 - Switch back to static thumbnails for the tab bar 
--HG--
extra : rebase_source : 6af90594890ca7ae30fecfe3234e009845e6404c
 2013-08-07 10:51:43 -07:00
Tim Taubert
8b6453c632 Backed out changeset 7e0356305566 (bug 894811) 2013-08-09 04:05:05 +02:00
Jonathan Wilde
6729d618ab Bug 895873 - Re-enable browser_context_menu_tests.js. Intermittent oranges likely fixed in bug 856264. r=jimm 
--HG--
extra : rebase_source : c2e731fd5b061eda420e60cf959c39346df65003
 2013-08-08 12:19:55 -07:00
Jonathan Wilde
c0b2132b54 Bug 856264 - Part 2 - Ensure that menus get reshown properly across input methods. r=jimm 
--HG--
extra : rebase_source : 45d8febeff971a8dd8454a242888267068d03878
 2013-08-01 16:54:27 -07:00
Jonathan Wilde
a17df00e29 Bug 856264 - Part 1 - Failing tests for context menu. r=jimm 
--HG--
extra : rebase_source : 06a8e9b6f39768e175224cf1e40889f10d979748
 2013-07-17 21:50:51 -07:00
Rodrigo Silveira
74e8abb3ca Bug 881995 - Snapped view Alignment for Bookmarks an Recent History is off and tiles are cut off 
--HG--
extra : rebase_source : c555f8623515499f7cdf84f11e0b29a8c43343cd
 2013-08-07 13:11:44 -07:00
Allison Naaktgeboren
f332128f59 Bug 894811 - First character gets dropped when typing into urlbar after opening a new tab.r=mbrubeck 2013-08-08 11:48:01 -07:00
Marina Samuel
f534b77616 Bug 883962 - Make the download button in the appbar toggle the downloads infobar. r=sfoster 2013-08-07 18:41:25 -04:00
Marina Samuel
c6eeea6332 Bug 783232 - Hook nsIAlertService up to native toast notifications and use them for download complete alerts. r=jimm 2013-08-07 16:57:06 -04:00
Allison Naaktgeboren
1e7daa1a28 Bug 895921 - Defect - Tab bar not appearing when selecting links from flyouts.r=? 2013-08-07 10:29:40 -07:00
Tim Abraldes
cd4d6bb8fa bug 866304 DialogUI "modals" cleanup patch. Removes the "modals" portions of DialogUI. Converts the crash reporter prompt to use nsIPromptService.confirmEx instead of DialogUI.importModal. r=mbrubeck 
The crash reporter prompt is the only consumer of DialogUI.importModal and related code. The "modals" concept that DialogUI implements should go away in favor of tab-modal dialogs and tab-agnostic notifications (e.g. flyouts). I don't think that the crash reporter prompt should be a tab modal dialog; I'd prefer to see it become an about: page or perhaps a flyout. Making it a tab-modal prompt was just the easiest thing to do in this set of patches.
 2013-08-05 23:29:55 -07:00
Tim Abraldes
808e8c5722 bug 866304 DialogUI dialogs cleanup patch. Removes unused/obsolete code from DialogUI. r=mbrubeck 
The "dialog" concept is unused (the last consumer was the sync setup UI which is now a flyout) and is obsolete since we have prompts.
 2013-08-05 23:29:55 -07:00
Tim Abraldes
9ee2f09a48 bug 866304. In metro, use the tab-modal prompt implementation that is available in toolkit. r=mbrubeck 
This patch replaces metro's 'PromptService' (which implements nsIPromptService and nsIPrompt, among others) with an implementation that simply forwards all calls to toolkit's nsPrompter.js. Before forwarding each call, it writes the "allowTabModal" property on the object obtained from nsPrompter.js, causing the created prompt to be tab-modal.

It also adds functionality to browser.js for creating tab modal prompts. One of the changes made as part of adding this functionality is replacing the <browser> with a <stack> of <browser> objects.
 2013-08-05 23:29:54 -07:00
Matt Brubeck
6b61bbdc62 Bug 901671 - Control-L should always select the text in the address field [r=rsilveira] 2013-08-06 16:06:37 -07:00
Allison Naaktgeboren
fde5461631 Bug 901487 - Inconsistent spelling of "add-ons" in about:addons override for Metro, improve l10n structure of sentence.r=mbrubeck 2013-08-06 15:04:46 -07:00
Marina Samuel
5681b7bcc0 Bug 883959 - re-land part of previous change that was accidentally reverted. r=me 2013-08-06 13:33:33 -04:00
Carsten "Tomcat" Book
3981876d31 Backed out changeset 516063917157 (bug 866304) mochitest metro orange 2013-08-06 12:19:29 +02:00
Carsten "Tomcat" Book
3504e05fd1 Backed out changeset e0061be20d1e (bug 866304) for causing metro mochitest failure 2013-08-06 12:19:09 +02:00
Carsten "Tomcat" Book
0b0bdf6c7a Backed out changeset 14434d2b75b9 (bug 866304) for suspicion of causing metro mochitest failure 2013-08-06 12:06:50 +02:00
Tim Abraldes
bceaaae272 bug 897121. Move handling of DNT pref to prefsFlyout.js. Correctly (hopefully :) deal with the various pref values that are possible. r=rsilveira 2013-08-05 23:29:55 -07:00
Tim Abraldes
939ef51c8a bug 866304 DialogUI "modals" cleanup patch. Removes the "modals" portions of DialogUI. Converts the crash reporter prompt to use nsIPromptService.confirmEx instead of DialogUI.importModal. r=mbrubeck 
The crash reporter prompt is the only consumer of DialogUI.importModal and related code. The "modals" concept that DialogUI implements should go away in favor of tab-modal dialogs and tab-agnostic notifications (e.g. flyouts). I don't think that the crash reporter prompt should be a tab modal dialog; I'd prefer to see it become an about: page or perhaps a flyout. Making it a tab-modal prompt was just the easiest thing to do in this set of patches.
 2013-08-05 23:29:55 -07:00
Tim Abraldes
9280195caa bug 866304 DialogUI dialogs cleanup patch. Removes unused/obsolete code from DialogUI. r=mbrubeck 
The "dialog" concept is unused (the last consumer was the sync setup UI which is now a flyout) and is obsolete since we have prompts.
 2013-08-05 23:29:55 -07:00
Tim Abraldes
50e0c395ae bug 866304. In metro, use the tab-modal prompt implementation that is available in toolkit. r=mbrubeck 
This patch replaces metro's 'PromptService' (which implements nsIPromptService and nsIPrompt, among others) with an implementation that simply forwards all calls to toolkit's nsPrompter.js. Before forwarding each call, it writes the "allowTabModal" property on the object obtained from nsPrompter.js, causing the created prompt to be tab-modal.

It also adds functionality to browser.js for creating tab modal prompts. One of the changes made as part of adding this functionality is replacing the <browser> with a <stack> of <browser> objects.
 2013-08-05 23:29:54 -07:00
Jim Mathies
7e2fe79397 Bug 890153 - Clear findbar text input focus when navigating found text. r=ally 2013-08-05 07:15:42 -05:00
Matt Brubeck
ba76e3f624 Bug 899987 - Remove workarounds for ui.mouse.radius bug [r=jimm] 2013-08-01 15:47:24 -07:00
Matt Brubeck
cc14f92401 Bug 897175 - Re-enable browser_findbar.js (back out d0edf8086809) 2013-08-03 09:14:29 -07:00
Matt Brubeck
aab22551b5 Bug 897175 - Intermittent failure in browser_findbar.js 2013-08-03 08:54:57 -07:00
Allison Naaktgeboren
046117e126 Bug 895669 - Override about:addons to display a metro custom page. r=sfoster 2013-08-02 20:36:39 -04:00
Rodrigo Silveira
b7d6ea1865 Bug 901147 - Js error 'Elements.contextappbar.hide is not a function' while running tests r=mbrubeck 
--HG--
extra : rebase_source : 0f3b3b09848ef554a57d6ebdf0e9c4e1ca7c4120
 2013-08-02 12:47:22 -07:00
Matt Brubeck
873222c678 Back out 7579823b624a (bug 899987) temporarily until the underlying bug is really fixed 2013-08-02 16:59:50 -07:00
Ryan VanderMeulen
f26052e447 Bug 897175 - Disable browser_findbar.js due to frequent failures. r=jimm 
CLOSED TREE
 2013-08-02 17:01:56 -04:00
Ryan VanderMeulen
93007c3658 Merge m-c to fx-team. 2013-08-02 17:09:31 -04:00
Gijs Kruitbosch
f65bc5bc5b Merge m-c to fx-team 2013-08-02 15:47:01 +02:00
Ed Morley
d0d23f42ca Bug 880739 - Disable browser_context_menu_tests.js for intermittent failures 
--HG--
extra : rebase_source : 799644a3aeed0a22887338aac05417143c772871
 2013-08-02 15:49:13 +01:00
Jonathan Wilde
30997e38c2 Bug 899726 - Defect - during keyboard showing/hiding, sometimes hidden appbars show up. r=mbrubeck 
--HG--
extra : rebase_source : 520ea7bbfb5667cb96d603ec876fd8bc9a9610ec
 2013-08-01 11:59:17 -07:00
Jonathan Wilde
ea9c6bf9a5 Bug 892241 - Change - NewUI - Disable extraneous UI elements when on start screen. r=mbrubeck 
--HG--
extra : rebase_source : 582f36a246323cbb0e0c29e8db61081375abaa44
 2013-07-31 19:04:56 -07:00
Jim Mathies
11f8ccb59f Bug 899027 - Fixes for various errors in FormHelper while running the tests in bug 891688. r=rsilveira 2013-08-01 07:31:35 -05:00
Jim Mathies
6a56aa2f59 Bug 891688 - Fix for caret selection not always appearing in subframes. r=mbrubeck 2013-08-01 07:31:34 -05:00
Brian R. Bondy
784f023fb0 Bug 900044 - Get rid of viewport-needs-updating and related code. r=kats 2013-07-31 20:59:24 -04:00
Sam Foster
dca66ae079 Bug 898651 - Dont add the find-in-page menuitem when the StartUI is visible. r=mbrubeck 
--HG--
extra : rebase_source : 627dd222e76bdbbe7fe882a636ae9a90c5a58c09
 2013-07-30 15:50:14 -07:00
Matt Brubeck
cb6e0c7815 Bug 900186 - Fix the copy command in the Metro JS console [r=jimm] 2013-08-01 15:48:14 -07:00
Matt Brubeck
68cd71548c Bug 899987 - Remove workarounds for ui.mouse.radius bug [r=jimm] 2013-08-01 15:47:24 -07:00
Marina Samuel
92828105b2 Bug 883959: Part 2: Rework download progress. r=sfoster. 2013-08-01 15:18:02 -04:00
Marina Samuel
5098698141 Bug 883959: Part 1: Show circular download progress indicator. r=sfoster. 2013-08-01 15:17:30 -04:00
Nicholas Cameron
6a449045ab Bug 895873 - backout bug 893117 for Win8 mc bustage 2013-07-30 23:32:35 -04:00
Rodrigo Silveira
52243bdf34 Bug 896757 - Defect - Remove > from narrow version of grid title strings r=mbrubeck 
--HG--
extra : rebase_source : c9cc4980e978d0d16a7c3b2023a26ad100fcbcd1
 2013-07-29 18:11:16 -07:00
David Zbarsky
019b465894 Bug 893117: Remove nsIDOMHTMLLabelElement r=bz 2013-07-30 14:55:13 -07:00
David Zbarsky
77f5c02605 Bug 893117: Remove nsIDOMHTMLHeadingElement r=bz 2013-07-30 14:55:12 -07:00
David Zbarsky
2c4b6577e1 Bug 893117: Remove nsIDOMHTMLTableCellElement r=peterv 2013-07-30 14:55:10 -07:00
Sam Foster
3a40a40c47 Bug 899623 - Ensure activeTileset is bound before calling methods on it. r=jimm 2013-07-30 12:16:58 -07:00
Matt Brubeck
9014abc43e Bug 898539 - Thumbnails are broken when restoring previous session at startup [r=ally] 2013-07-29 16:34:37 -07:00
Kamil Jozwiak
4e859d29a8 Bug 876816 - Adding a class into flyoutpanels.css for standard widths. r=ally 2013-07-29 16:34:16 -07:00
Sam Foster
0ac7ef2f2d Bug 896766 - Add metro_viewstate_changed handling to toggle grid selectability. r=rsilveira 
--HG--
extra : rebase_source : b1be067967f81507bfd88f43341116650c244d9e
 2013-07-29 15:03:16 -07:00
Jonathan Wilde
e0c4612b7e Bug 897830 - Part 1 - Rename "flyout" to "flyoutpanel" for clarity. r=timA 
--HG--
rename : browser/metro/base/content/flyouts/aboutFlyout.js => browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
rename : browser/metro/base/content/flyouts/flyoutUI.js => browser/metro/base/content/flyoutpanels/FlyoutPanelsUI.js
rename : browser/metro/base/content/flyouts/prefsFlyout.js => browser/metro/base/content/flyoutpanels/PrefsFlyoutPanel.js
rename : browser/metro/base/content/flyouts/syncFlyout.js => browser/metro/base/content/flyoutpanels/SyncFlyoutPanel.js
extra : rebase_source : b97f23e84ad37814d9d8476c9e41fc57c0537e06
 2013-07-29 14:35:17 -07:00
Matt Brubeck
428dcb922e Bug 896097 - Hide Metro overlay buttons during autocomplete [r=sfoster] 2013-07-26 14:34:03 -07:00
Matt Brubeck
ad3a8d752b Bug 898120 - Fix leak of global variable in Metro selection code [r=jimm] 2013-07-26 14:34:02 -07:00
Jim Mathies
38830953cb Bug 897417 - Add support for Talos tp-cmdline parameters in metro browser startup. r=mbrubeck 2013-07-26 07:05:37 -05:00
Sam Foster
188ab01295 Bug 892425 - Stabilize grid sizing in start sections with & without scrollbars. r=mbrubeck 2013-07-25 18:25:25 -07:00
Jim Mathies
182b915271 Bug 894713 - Followup fix, don't call removeEventListener on targetElement if targetElement is null. Fixes spurious console errors while running tests. r=me 2013-07-25 19:39:43 -05:00
Jim Mathies
6c8006bf05 Bug 897131 - Fixup Windows line endings in browser_urlbar.js. r=me 2013-07-25 19:25:14 -05:00