wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19158 commits 157 branches 562 tags 714 MiB
Commit graph

785 commits

Author SHA1 Message Date
Lukas Reschke
199ee18c0c Merge pull request #8229 from owncloud/menutoggle-mobile 
do not show menu toggle on public share links as there is no menu
 2014-04-20 01:13:24 +02:00
Morris Jobke
0b4431216d Merge pull request #8236 from owncloud/header-right-fix 
remove duplication of header and 'header-right' element, also ellipsize when too wide
 2014-04-17 15:18:40 +02:00
Morris Jobke
2f6eed4f9d Merge pull request #7994 from owncloud/fix-login-fields 
Fix login fields
 2014-04-16 23:17:49 +02:00
Jan-Christoph Borchardt
03ad908c30 fix overlapping infield labels 2014-04-16 17:49:46 +02:00
Jan-Christoph Borchardt
067a5cdee7 fix database infield label indentation 2014-04-16 17:44:05 +02:00
Jan-Christoph Borchardt
6a79b7f2b5 fix sizing for fields when password is shown 2014-04-16 17:43:15 +02:00
Jan-Christoph Borchardt
9c6f8e59ae fix header code duplication, code style fixes 2014-04-16 16:26:41 +02:00
Jan-Christoph Borchardt
547ddf7775 remove duplication of 'header-right' element, also make it overflow when too wide 2014-04-16 15:53:38 +02:00
Jan-Christoph Borchardt
7110ecbf06 fix error display on smaller screens, fix #8090 2014-04-16 15:31:15 +02:00
Jan-Christoph Borchardt
9dabed04a4 do not show menu toggle on public share links as there is no menu 2014-04-16 10:49:16 +02:00
jbtbnl
b10bf72999 Vertically align public layout to better fit small mobile screens 2014-04-10 00:33:55 +02:00
Jan-Christoph Borchardt
1258cde020 fix search box wrapping on very narrow screens 2014-04-09 13:20:46 +02:00
jbtbnl
86adee98bf Merge pull request #8072 from owncloud/slideshow-buttons 
Fix slideshow buttons being invisible
 2014-04-06 01:17:43 +02:00
Robin Appelman
ceb6666e73 Fix slideshow buttons being invisible 2014-04-06 00:16:14 +02:00
Lukas Reschke
ce1b382905 Delete auth.css 2014-04-04 22:38:26 +02:00
Morris Jobke
bf7624fb25 Merge pull request #6968 from owncloud/files-ajaxload 
Ajaxify files list for files + trashbin + public page
 2014-04-03 22:02:05 +02:00
Vincent Petry
0be9de5df5 Files, trashbin, public apps use ajax/JSON for the file list 
Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app
 2014-04-02 15:33:47 +02:00
Jan-Christoph Borchardt
5301056ab1 fix h3 style, move out from settings to apps CSS 2014-04-02 09:18:33 +02:00
Morris Jobke
bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps 
Makes #app-navigation a part of app management.
 2014-04-01 21:38:43 +02:00
Jan-Christoph Borchardt
0c441724bc make infield labels use less space so pasting in is easier 2014-04-01 17:21:05 +02:00
Jan-Christoph Borchardt
c926e98ea9 fix log in input sizing caused by core input field switch to px 2014-04-01 17:18:03 +02:00
Vincent Petry
18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock 
Replace personalblock with .section
 2014-04-01 11:20:16 +02:00
Morris Jobke
0d2a81a095 apply proposed change 2014-04-01 10:48:55 +02:00
Morris Jobke
ab696edba6 Merge pull request #7916 from owncloud/fix-input-sizes 
Fix input sizes
 2014-03-31 15:56:19 +02:00
Morris Jobke
8bd308ffed merge CSS rules 2014-03-31 13:51:53 +02:00
Jan-Christoph Borchardt
2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
Jan-Christoph Borchardt
615de6534f fix duplicate rules for button/input styles, em to px 2014-03-31 12:27:26 +02:00
raghunayyar
881c66df52 Removes highlighting of selected items, padding from apps management. 2014-03-30 15:48:47 +05:30
Thomas Müller
e3b951f412 Merge pull request #7724 from owncloud/mobile 
[WIP] Mobile optimization for base layout and Files app
 2014-03-28 10:27:15 +01:00
Jörn Friedrich Dreyer
2561107b4e prevent dimmed ocdialog div from scrolling 2014-03-28 02:43:33 +01:00
Jan-Christoph Borchardt
ec46a07195 convert input metrics to px 2014-03-27 17:13:36 +01:00
Jan-Christoph Borchardt
5b2abb32a6 remove CSS rules for personalblock, remove it from core 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
bf77c580c1 general styles for the content area 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
ba82175e11 specify logo to not repeat when container is bigger 2014-03-27 14:37:41 +01:00
raghunayyar
3d8ce8104f Adds Style changes to app-navigation in core/css/apps.css 2014-03-24 17:59:53 +05:30
Jan-Christoph Borchardt
9b9b6ec31e mobile: set a width for navigation popover to it's always 3 columns 2014-03-21 16:40:39 +01:00
Jan-Christoph Borchardt
f2566e649f mobile: adjust break to 768, also fix min-widths 2014-03-21 16:36:45 +01:00
Jan-Christoph Borchardt
ecf52e05fb mobile: adjust width of app title, fix overlap 2014-03-21 14:30:11 +01:00
Jörn Friedrich Dreyer
c9d97d2ef2 add top:45px to position:fixed controls, fixes alignment on android 4.0.4 browser 2014-03-21 11:56:47 +01:00
jbtbnl
57cfff7d51 Fix #7758 2014-03-19 16:45:10 +01:00
Thomas Tanghus
13f1f105c8 Set overflow-y to auto 2014-03-18 18:25:30 +01:00
Jan-Christoph Borchardt
59906fbb4d mobile: show caret indicator next to logo to make clear it is tappable 2014-03-18 17:48:28 +01:00
Jan-Christoph Borchardt
b37aae9925 mobile: menu togglable for mobile, use code by @PVince81 2014-03-14 10:33:19 +01:00
Jan-Christoph Borchardt
eb7b125254 mobile: position share dropdown 2014-03-14 09:15:20 +01:00
Jan-Christoph Borchardt
84c96c2bf7 mobile: don't require a minimum width for controls bar 2014-03-14 09:14:52 +01:00
Jan-Christoph Borchardt
9a31e53313 Merge pull request #7567 from owncloud/apps-scroll-settings 
restrict height of settings and make scrollable
 2014-03-09 01:22:51 +01:00
Jan-Christoph Borchardt
0b0687c9fc fix noise not repeating 2014-03-06 12:38:11 +01:00
Morris Jobke
8c1cd2b83e Merge pull request #7566 from owncloud/button-outlines 
Adds 0 Outlines to Buttons
 2014-03-05 16:50:22 +01:00
Jan-Christoph Borchardt
4a4b32d325 restrict height of settings and make scrollable 2014-03-05 15:08:16 +01:00
raghunayyar
5a9689eb5c Adds 0 Outlines to Buttons 2014-03-05 19:36:36 +05:30
Jan-Christoph Borchardt
4d679de30b add hover/focus states for star icons to hint at action 2014-03-05 13:21:33 +01:00
jbtbnl
e603164517 Do not override button background image 2014-03-03 14:07:44 +01:00
Raghu Nayyar
e304809612 Merge pull request #7382 from jbtbnl/master 
Remove necessity of icon class
 2014-02-27 21:11:26 +05:30
Morris Jobke
7af846e656 Merge pull request #7452 from owncloud/icon-delete-hover 
icons: automatically show delete hover instead of using explicit class
 2014-02-27 14:44:29 +01:00
Jan-Christoph Borchardt
58bc6aee51 icons: automatically show delete hover instead of using explicit class 2014-02-27 12:48:25 +01:00
Jan-Christoph Borchardt
f0cd08ab5d remove border from log in input fields, simpler and works better with themes 2014-02-27 12:13:09 +01:00
jbtbnl
d28fd8f64d Remove necessity of icon class 
Only the icon specific class is needed
 2014-02-24 22:37:19 +01:00
Jan-Christoph Borchardt
877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman
80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
Jan-Christoph Borchardt
d5739e83d1 remove additional transition rule, reduce width of collapsed search bar 2014-02-20 18:40:08 +01:00
Robin Appelman
d9bb21146f fix IE10 viewport sizeing 2014-02-20 18:14:40 +01:00
Jan-Christoph Borchardt
bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance 
Improve users list scrolling performance
 2014-02-20 16:45:36 +01:00
Jan-Christoph Borchardt
5cc4a47f4c Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix 
remove fix for IE9 nav bar width
 2014-02-20 16:25:08 +01:00
Jörn Friedrich Dreyer
3f6d14be85 Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core 
Conflicts:
	core/css/styles.css
 2014-02-20 14:29:23 +01:00
Jan-Christoph Borchardt
20b740f8e4 do not show display name on mobile when profile picture is present 2014-02-20 13:37:23 +01:00
Jan-Christoph Borchardt
92d57cb5a7 move avatar into clickable area of user menu 2014-02-20 13:36:52 +01:00
Jan-Christoph Borchardt
3e2c56157b reduce width of searchbox on mobile, fix overlap, fix #7282 2014-02-20 11:33:46 +01:00
Vincent Petry
c732764eb5 Improve users list scrolling performance 
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
  into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
  the server side)
 2014-02-17 19:32:45 +01:00
Raghu Nayyar
299a8285bd Merge pull request #6278 from nickvergessen/issue/6263 
[issue/6263] layout.user.php code is not valid markup
 2014-01-29 10:42:17 -08:00
jbtbnl
f798ad9a20 Add white color variant of checkmark icon 2014-01-29 13:47:37 +01:00
Morris Jobke
0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css 
Remove %webroot% from CSS
 2014-01-27 04:11:15 -08:00
Jan-Christoph Borchardt
46745895ae Merge pull request #5153 from owncloud/core-em-to-px 
Cleans up Core apps for relative(em) to absolute(px) styles.
 2014-01-27 02:29:47 -08:00
Jan-Christoph Borchardt
6fbc73e673 Merge pull request #5152 from owncloud/files-em-to-px 
Converts em to px values for styles in Files.
 2014-01-27 02:28:01 -08:00
raghunayyar
932e8f9f58 Fixes width of the dropdown menus as per computed styles. 2014-01-26 02:59:28 +05:30
Jan-Christoph Borchardt
25e9b7a742 add icons.css file, first step to get rid of %webroot% 2014-01-23 12:55:39 +01:00
Morris Jobke
ce0cbbd7bc remove comment & add space 2014-01-18 14:22:56 +01:00
Konstantin.Popov
9d355f2124 remove fix for IE9 nav bar width 2014-01-17 13:41:51 +04:00
raghunayyar
12e5d0f68d Fixes typos, adds ; wherever not present. 2014-01-16 21:06:14 +05:30
raghunayyar
775e08e0ee Merge branch 'master' into core-em-to-px 
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
 2014-01-16 14:42:37 +05:30
raghunayyar
f975fd5499 Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase 2014-01-16 14:23:39 +05:30
Morris Jobke
5c1a9f35f1 Indicate password strength using strengthify 
* uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29
 2014-01-15 11:10:12 +01:00
Joas Schilling
d95cab632b Extend margin to avoid displaying a scrollbar 2014-01-10 10:17:19 +01:00
Vincent Petry
22abc53e3b Merge pull request #5968 from owncloud/legacy-popup-fixes 
fix the legacy popup to make calendar settings look nicer
 2013-12-10 05:37:52 -08:00
Jan-Christoph Borchardt
e574158bd8 fix shadow size and arrow position 2013-12-09 12:21:37 +01:00
Morris Jobke
3444c15b86 fix IE8 transparent background 2013-12-07 17:03:53 +01:00
ringmaster
e7748613ef Link to enable-javascript.com 2013-12-05 12:06:20 -05:00
ringmaster
38745e4bd1 Move message up 10% 2013-12-05 09:48:20 -05:00
ringmaster
bdab0409c4 Add overlay noscript message to fix #6032 2013-12-05 09:19:46 -05:00
Vincent Petry
72f80c972f Merge pull request #5946 from owncloud/public-page-details 
Public page details
 2013-12-03 07:26:00 -08:00
Thomas Müller
ab21e1b16e Merge pull request #5931 from owncloud/fix-time-field-properly 
fix time input field properly, details
 2013-12-03 07:23:04 -08:00
zombiehugs
519f63ee97 Revert "[fix] Center Share Dropdown & Versions Dropdown" 
This reverts commit 1dbbfcf3dc.
 2013-12-03 08:23:13 -06:00
zombiehugs
1dbbfcf3dc [fix] Center Share Dropdown & Versions Dropdown 
Center Share Dropdown & Versions Dropdown
 2013-12-03 08:14:06 -06:00
Morris Jobke
b3a96c081b fix public page - gallery view issues 2013-12-03 13:46:58 +01:00
Jan-Christoph Borchardt
c44f534c2b account for shift of controls bar due to app navigation, do not shift on public page 2013-12-03 10:54:16 +01:00
Frank Karlitschek
1dc931b778 Merge pull request #5984 from owncloud/nav-scrollbar 
always show app navigation scrollbar when too many apps in there
 2013-11-29 03:27:50 -08:00
Morris Jobke
587fc1aff3 Fix resize issue for trash button in chrome and overflowing spinner in .update class 
fixes #6108
 2013-11-28 21:36:43 +01:00
Morris Jobke
55d7cf8ffd improve encryption message 2013-11-27 23:07:19 +01:00
Bjoern Schiessle
e0924a5f07 switch to large spinner 2013-11-27 21:58:38 +01:00
Morris Jobke
6b3b3d8af4 Fix for IE - an ugly horizontal scrollbar appears 
* for IE9 the nav bar was too narrow
 * for other IEs the width of each app element was to wide and
   cause the horizontal scoll bar - now this content is hidden like
   before this PR
 2013-11-27 16:45:04 +01:00
Morris Jobke
41c6752030 fix navbar 2013-11-27 16:10:49 +01:00
Jan-Christoph Borchardt
3360719bbf prevent shift of app names caused by scrollbar, part 2 2013-11-27 16:10:48 +01:00
Jan-Christoph Borchardt
f9f123c6f6 prevent shift of app titles caused by scrollbar 2013-11-27 16:10:48 +01:00
Jan-Christoph Borchardt
457a7d4baa always show app navigation scrollbar when too many apps in there 2013-11-27 16:10:48 +01:00
Morris Jobke
4dc35909b5 Fix navbar issue 
fixes #6024
 2013-11-25 17:04:19 +01:00
Morris Jobke
ae6610f0ea fix navigation scrollbar 2013-11-22 15:48:24 +01:00
raghunayyar
aa5d5a422f Doesn't Cut the top arrow from navigation 2013-11-22 02:10:22 +05:30
Jan-Christoph Borchardt
5cb8fd2bad fix the legacy popup to make calendar settings look nicer 2013-11-20 16:29:00 +01:00
Frank Karlitschek
8bc339413b Merge pull request #5926 from owncloud/less-bold 
remove bold from legend, table header, label - less obtrusive
 2013-11-19 13:57:21 -08:00
Jan-Christoph Borchardt
59e75d4326 fix time input field properly, details 2013-11-18 19:44:56 +01:00
Jan-Christoph Borchardt
b678766c7d remove bold from legend, table header, label - less obtrusive 2013-11-18 17:32:06 +01:00
Jan-Christoph Borchardt
463b054530 adjust input CSS to multiline, coding guidelines 2013-11-18 16:14:13 +01:00
Jan-Christoph Borchardt
8dd50dc9a6 fix input type time fields, have them use the default styles 2013-11-18 14:51:43 +01:00
Vincent Petry
f670d74634 Added min-height in case of empty multi-select 2013-11-14 14:26:48 +01:00
Morris Jobke
c9517c4fc8 new line for css rule 2013-11-12 11:31:58 +01:00
Arthur Schiwon
5c31440dcd Disabled textareas should look like they are disabled 2013-11-11 19:41:51 +01:00
Thomas Müller
3917d18980 Merge pull request #5528 from frisco82/changeUpadateNotification 
Changed update message to be more instructive
 2013-10-24 10:28:17 -07:00
Ramiro Aparicio
3a81c8e3af Changed update message to be more instructive, changed update style to be less aggresive 
Fix br tags

Improve english messages
 2013-10-24 19:21:40 +02:00
Vincent Petry
2102ab8fec Fix leftcontent/right content, fixes tasks app 
Tasks app layout was broken since the controls bar is higher now.
This change should hopefully fix other apps using the same layout.
 2013-10-24 12:28:28 +02:00
Thomas Müller
e95ad29d90 Merge pull request #5435 from owncloud/share-improvements 
Share improvements
 2013-10-23 09:56:24 -07:00
Vincent Petry
88c2646f7e Fixed share dropdown checkbox wrapping 
The "show cruds" button is now embedded into the last label/checkbox
group and wraps with it.

Added ellipsis to prevent long names to exceed the dropdown's width.
 2013-10-23 17:58:27 +02:00
Vincent Petry
9656280252 Added left padding to notCreatable message 2013-10-23 16:20:53 +02:00
Frank Karlitschek
f5a6d6b43e Merge pull request #5200 from owncloud/ie8-warning-fix 
Fix warning box in IE8
 2013-10-20 23:55:18 -07:00
Jan-Christoph Borchardt
dbcfb1b830 beautify 'you dont have write permissions' notice, fix #2770 2013-10-20 23:15:58 +03:00
Jan-Christoph Borchardt
1e8af6c5ef bold share username 2013-10-20 22:52:18 +03:00
Jan-Christoph Borchardt
846ce67d01 properly align checkboxes to text 2013-10-20 22:51:04 +03:00
Jan-Christoph Borchardt
5b75673e77 more breathing space in share list 2013-10-20 22:48:25 +03:00
Jan-Christoph Borchardt
fbd0076be0 remove superfluous input hover color change 2013-10-20 22:38:14 +03:00
Jan-Christoph Borchardt
fa66dfff80 input field background size to white, fix input fields seeming disabled, fix #5168 2013-10-20 21:22:41 +03:00
Jan-Christoph Borchardt
07b885e291 correctly position ... overflow in breadcrumbs, fix #5158 2013-10-17 21:22:55 +03:00
Morris Jobke
1c4dbaeab1 Fix warning box in IE8 
* simulates a black transparent background on a blue pane
 2013-10-16 21:45:11 +02:00
Morris Jobke
a021a12b3b Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator 
Fixed external storage status indicator in admin page
 2013-10-13 13:03:02 -07:00
Thomas Tanghus
31714f8871 Merge pull request #5133 from owncloud/js_vcategories_to_tags 
Js vcategories to tags
 2013-10-11 04:17:59 -07:00
Vincent Petry
bced346c3b Now using smaller spinner image for status indicator 
To make the status indicator appear smaller, even in IE8 that doesn't
support background-size, there is no a smaller animated gif
"loading-small" for that purpose.
 2013-10-11 12:36:30 +02:00
Jake Wilson
5144def99b Moved Core Theme Logos to CSS 
In order to make it easier for a user/developer to replace logos in the core theme, I removed the hardcoded `logo.svg` and `logo-wide.svg` from the html, and replaced them with `div`s that use css background-image instead.

This has multiple advantages:
1. The user can now use any filename they want for the logo.  They are no longer forced to use logo.svg or logo-wide.svg.
2. The user can now easily use a JPG, PNG or GIF logo instead of SVG (SVG's are awesome, but used by an unfortunately small percentage of web developers at the current time.  Most probably don't even know how to make an SVG…).
3. The user doesn't have to resort to hacking the core theme template files in order to use a different filename or file type.
4. Greatly simplifies documentation instructions for how to change the logos (http://owncloud.org/theming/).

Signed-off-by: Jake Wilson <jakew@huebnerpetersen.com>
 2013-10-10 12:29:13 -06:00
Morris Jobke
cf554fd804 Merge pull request #5182 from owncloud/fix-sharring-with-password-screen 
Fix password screen for public shares
 2013-10-10 04:49:47 -07:00
Morris Jobke
d968843bf6 Merge pull request #5244 from owncloud/more-css-fixes 
More css fixes
 2013-10-10 04:48:11 -07:00
Vincent Petry
01371e3187 Fixed login warning style #5065 
Removed bold so it takes less space and set alignment to left.
 2013-10-09 11:15:54 +02:00
Morris Jobke
4af220d09e Fix password screen for public shares 
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
 * Credits to Julian Müller @Julian1998
 2013-10-07 17:38:27 +02:00
Jan-Christoph Borchardt
676ded0c63 properly indent contents of folders for app styles, to line up with text 2013-10-06 22:40:29 +03:00
Jan-Christoph Borchardt
c8c83e0e02 improve clickability of footer link 2013-10-06 22:35:24 +03:00
raghunayyar
4687d2dd0b All Core Styles from em->px, apart from styles.css 2013-10-07 00:01:29 +05:30
Jan-Christoph Borchardt
2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Morris Jobke
cc1e69c190 Merge pull request #5136 from owncloud/design-fixes 
Design fixes
 2013-10-04 14:56:09 -07:00
Jan-Christoph Borchardt
2166d99b53 prevent hover effect when settings are open 2013-10-04 20:24:07 +03:00
Jan-Christoph Borchardt
0b78db4750 fix disabled buttons not showing icons 2013-10-04 20:21:36 +03:00
Thomas Tanghus
12bb197028 JS version of the OCP\ITags interface 2013-10-04 17:21:52 +02:00
Jan-Christoph Borchardt
0c53269b5e remove specific border-radius for .primary button as it should be specific to log in instead 2013-10-04 17:37:20 +03:00
Jan-Christoph Borchardt
041837de2c merge master into input-simplify 2013-10-04 17:08:34 +03:00
Bjoern Schiessle
51295e9a6b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
 2013-10-04 12:30:49 +02:00
Morris Jobke
ecd2bf2a55 Merge pull request #5109 from owncloud/controls-bar-height 
Controls bar height
 2013-10-04 01:01:54 -07:00