Commit Graph

9562 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer 926737fdb7 clear search when navigating via breadcrumbs 2015-01-06 13:55:51 +01:00
Jenkins for ownCloud 6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Jörn Friedrich Dreyer 7a812801db correctly clear searchbox when switching filelists 2015-01-05 17:53:14 +01:00
Jörn Friedrich Dreyer 10038640ae fix onScroll breaking search, fix keyboard navigation, fix filter for files in other dirs 2015-01-05 14:28:09 +01:00
Jörn Friedrich Dreyer 23900a5a39 filter trashbin and share views 2015-01-05 13:11:50 +01:00
Morris Jobke 28c8f5a0f9 Check for version before mounting a public link
* ownCloud 7.0.0 is needed - version of merge of server <-> server
  sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
2015-01-05 11:50:05 +01:00
Lukas Reschke a0023974e3 Merge pull request #13099 from owncloud/fix-provisioning-api
Remove unnecessary setUp method from provisioning_api
2015-01-05 10:35:24 +01:00
Jenkins for ownCloud 8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
Tom Needham f17f0ade7f Remove unnecessary setUp method 2015-01-04 23:10:44 +00:00
Jenkins for ownCloud 84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Morris Jobke fcae87170d Merge pull request #13091 from owncloud/fix-provisioning-api
Fix remaining unit tests for provisioning_api
2015-01-03 22:41:44 +01:00
Tom Needham a20de1548d Add proper group setup and teardown to all provisioning_api tests 2015-01-03 15:58:36 +00:00
Tom Needham 5c0d7f2ee5 Create admin group before running provisioning_api tests 2015-01-03 15:39:42 +00:00
Tom Needham 97d31946c3 Ensure admin group is present before running tests 2015-01-03 13:25:48 +00:00
Morris Jobke 92f062baac Merge pull request #13082 from mmattel/rename_text_no_external_storages
adopt text "no external storage configured"
2015-01-03 11:59:22 +01:00
Jenkins for ownCloud 05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
root c44d41178a adopt text "no ecternal storage configured"
storage -> storages
2015-01-02 21:00:02 +01:00
Tom Needham 32d9563359 Change array element order to fix failing test 2015-01-02 19:07:31 +00:00
Tom Needham a4f270a9ce Add placeholder app.php for provisioning_api so app is detected 2015-01-02 18:52:11 +00:00
Jörn Friedrich Dreyer ba235eb51d delay hiding no results message until search is triggered 2015-01-02 16:13:15 +01:00
Jörn Friedrich Dreyer 6f820b0209 use " to avoid escaping ' 2015-01-02 14:59:55 +01:00
Jörn Friedrich Dreyer 152c8b3969 text and icon fixes 2015-01-02 14:58:39 +01:00
Jörn Friedrich Dreyer 2eec8dc156 correctly update search results when query is changed, show spinner when searching 2015-01-02 14:22:48 +01:00
Jörn Friedrich Dreyer 0cca9e26c4 show no files found message 2015-01-02 12:50:21 +01:00
Jörn Friedrich Dreyer 9e3f4e043f make OCA.Search.Files available in tests and for other apps 2015-01-02 10:57:25 +01:00
Jörn Friedrich Dreyer 6ba8881343 add file summary filter spec tests 2015-01-02 10:28:42 +01:00
Robin Appelman f8700ec649 Fix rendering search results 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer 457f5abf6c fix count 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer 4fdd626f0a use correct visibilities 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer b45d0f03fc fix js tests 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer 8abd954d9a instantiate file search 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer 66cf17b32b don't use full class name to register plugin 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer 8bf048376c allow getting the last query 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer 80ded08ec4 hide irrelevant stuff in empty filelist 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer a6204efa0d show audio icon & image previews 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer b93f2ddcb5 hide header when no files in list match 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer 7e6c660b00 filter new rows 2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer 606f802b7b move search results below filelist, show hint when results are off screen, use js plugin mechanism 2015-01-02 10:28:41 +01:00
Jenkins for ownCloud 4b357274bb [tx-robot] updated from transifex 2015-01-02 01:54:28 -05:00
Jenkins for ownCloud ec6e70889a [tx-robot] updated from transifex 2015-01-01 01:54:30 -05:00
Jenkins for ownCloud 573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
Jenkins for ownCloud c8e946f633 [tx-robot] updated from transifex 2014-12-29 01:54:27 -05:00
Thomas Müller 9f327457dc Merge pull request #13023 from owncloud/provisioning_api-2
[jenkins] Add provisioning_api app
2014-12-28 14:29:49 +01:00
Thomas Müller 85e02460c8 Merge pull request #13025 from lyonel/master
user_ldap is too verbose by default
2014-12-27 21:39:23 +01:00
Thomas Müller 688a4022df Merge pull request #13012 from owncloud/small_fix
only send activity if we have a valid path and the file is readable
2014-12-27 21:38:47 +01:00
Jenkins for ownCloud d2e53d1022 [tx-robot] updated from transifex 2014-12-27 01:54:33 -05:00
Jenkins for ownCloud 0836ce9cd8 [tx-robot] updated from transifex 2014-12-26 01:54:28 -05:00
Jenkins for ownCloud e0fc26a5cb [tx-robot] updated from transifex 2014-12-25 01:54:29 -05:00
Tom Needham dc85c20b18 Add provisioning_api app
enable unit tests for provisioning api

fix admin docu key
2014-12-24 22:15:20 +01:00
Lyonel Vincent f94b300602 Be less verbose when using a paged search
Lower the priority from INFO to DEBUG
2014-12-24 16:35:36 +01:00
Lyonel Vincent 5a00b33a90 Be less verbose when disabling SSL cert validation
change log level from WARN to DEBUG
2014-12-24 16:32:27 +01:00
Jenkins for ownCloud 801b9e0494 [tx-robot] updated from transifex 2014-12-24 01:54:33 -05:00
Bjoern Schiessle 8c48be453e only send activity if we have a valid path and the file is readable 2014-12-23 13:32:54 +01:00
Morris Jobke 5352b4b2b8 Merge pull request #10292 from owncloud/external-share-delete
Fix trashbin when deleting a file over an external share
2014-12-23 11:21:06 +01:00
Jenkins for ownCloud d8f04f5a97 [tx-robot] updated from transifex 2014-12-23 01:55:23 -05:00
Björn Schießle 711220e82d Merge pull request #12997 from owncloud/sharing_activities
add activity if public shared file/folder was downloaded
2014-12-22 23:31:07 +01:00
Robin Appelman 3afcc71764 Make sure the path passed to the activity manager is normalized 2014-12-22 18:50:00 +01:00
Bjoern Schiessle 393deb5961 add activity if public shared file/folder was downloaded 2014-12-22 18:50:00 +01:00
Thomas Müller cf595ecc67 Merge pull request #12860 from owncloud/remove-apparently-unused-file
Remove unused file
2014-12-22 14:47:14 +01:00
Morris Jobke eab4c029c2 Merge pull request #12961 from owncloud/try_to_cache_keys
cache keys to read them only once from the hard disc
2014-12-22 09:50:29 +01:00
Jenkins for ownCloud 92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05:00
Morris Jobke 510488ad3e Merge pull request #12942 from owncloud/favs-missingsharedsubdirs
Fix issues with searchByTag in shared storage
2014-12-21 10:38:34 +01:00
Jenkins for ownCloud 312891c603 [tx-robot] updated from transifex 2014-12-21 01:54:36 -05:00
Arthur Schiwon 61ed363f82 planned refactorings for OC 8 2014-12-20 18:28:29 +01:00
Arthur Schiwon 3ca70d647a move from \OC\Preferences to \OCP\IConfig 2014-12-20 16:33:37 +01:00
Arthur Schiwon 144d95de7d basic adjustments for OC 8. I.e. no visible issues, LDAP tests pass. 2014-12-20 16:09:04 +01:00
Jenkins for ownCloud 5a54ca380d [tx-robot] updated from transifex 2014-12-20 01:56:24 -05:00
Arthur Schiwon 4fa39250e7 LDAP User Cleanup: Port from stable7 without further adjustements
LDAP User Cleanup

background job for user clean up

adjust user backend for clean up

register background job

remove dead code

dependency injection

make Helper non-static for proper testing

check whether it is OK to run clean up job. Do not forget to pass arguments.

use correct method to get the config from server

methods can be private, proper indirect testing is given

no automatic user deletion

make limit readable for test purposes

make method less complex

add first tests

let preferences accept limit and offset for getUsersForValue

DI via constructor does not work for background jobs

after detecting, now we have retrieving deleted users and their details

we need this method to be public for now

finalize export method, add missing getter

clean up namespaces and get rid of unnecessary files

helper is not static anymore

cleanup according to scrutinizer

add cli tool to show deleted users

uses are necessary after recent namespace change

also remove user from mappings table on deletion

add occ command to delete users

fix use statement

improve output

big fixes / improvements

PHP doc

return true in userExists early for cleaning up deleted users

bump version

control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default.

improve doc

rename cli method to be consistent with  others

introduce ldapUserCleanupInterval in sample config

don't show last login as unix epoche start when no  login happend

less log output

consistent namespace for OfflineUser

rename GarbageCollector to DeletedUsersIndex and move it to user subdir

fix unit tests

add tests for deleteUser

more test adjustements

Conflicts:
	apps/user_ldap/ajax/clearMappings.php
	apps/user_ldap/appinfo/app.php
	apps/user_ldap/lib/access.php
	apps/user_ldap/lib/helper.php
	apps/user_ldap/tests/helper.php
	core/register_command.php
	lib/private/preferences.php
	lib/private/user.php

add ldap:check-user to check user existance on the fly

Conflicts:
	apps/user_ldap/lib/helper.php

forgotten file

PHPdoc fixes, no code change

and don't forget to adjust tests
2014-12-19 19:47:54 +01:00
Björn Schießle 8164415b45 Merge pull request #12749 from owncloud/server2server-sharing-ng
server to server sharing next generation
2014-12-19 19:04:44 +01:00
blizzz ad6814f920 Merge pull request #12101 from owncloud/ldap_split_mapping
Ldap split mapping from Access superclass
2014-12-19 18:52:30 +01:00
Arthur Schiwon ec0f80fee9 Split mapping from Access and Helper classes into it's own. Fully test them, too.
remove unused methods

split mapping methods off from Access class

fix DB query handling

move 'clear mapping' methods from static helper to new mapping class

add tests

test directly with DB

finishing tests and fix return value from setDNbyUUID

add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class.

add missing info to PHPDoc

add unmap method

fix namespaces

fix test inheritance

PHPDoc and a small code restructure for scrutinizer, no effective changes

PostgreSQL does not accept LIMIT in DELETE queries

phpdoc fixes, no code changes
2014-12-19 18:26:12 +01:00
Bjoern Schiessle aea991c22e cache keys to read them only once from the hard disc 2014-12-19 16:04:13 +01:00
Bjoern Schiessle 24993280ed Next step in server-to-server sharing next generation, see #12285
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
Thomas Müller 2d64797320 Merge pull request #12956 from owncloud/jenkins-user-backend-names
[jenkins only] introduce names for user backends - IUserBackend
2014-12-19 13:15:50 +01:00
Morris Jobke 678642a6a2 Merge pull request #12935 from owncloud/public-tagsmanagerissue
Only populate tags in main file list
2014-12-19 12:48:20 +01:00
Morris Jobke 6da33e1ea7 introduce names for user backends - IUserBackend
* LDAP with multiple servers also proved backendName
2014-12-19 10:17:17 +01:00
Thomas Müller b32dc3f2a4 Merge pull request #12906 from owncloud/keyboardnav-feedback
Accessibility: Keyboard navigation feedback
2014-12-19 09:54:28 +01:00
Morris Jobke 39d6ddd38a Merge pull request #12865 from owncloud/files-tags-webdav
Returns tags through WebDAV
2014-12-19 09:33:28 +01:00
Jenkins for ownCloud 028b0efd5c [tx-robot] updated from transifex 2014-12-19 01:56:51 -05:00
Jan-Christoph Borchardt 7b2ae46762 first part of fixing feedback for file list when using keyboard 2014-12-19 00:34:06 +01:00
Morris Jobke 3036a8714d Merge pull request #12941 from owncloud/wave-accessibility-compliance
Wave accessibility compliance
2014-12-19 00:30:56 +01:00
Morris Jobke 75e8b39826 Merge pull request #12879 from owncloud/mountconfig
Add mount specific options
2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer 891474b0d6 Merge pull request #12759 from owncloud/core-reduce-js-and-css
make sure styles and scripts are only loaded once
2014-12-18 23:18:37 +01:00
Jörn Friedrich Dreyer 49318b4d93 Merge pull request #12896 from owncloud/drop-deprecated
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
Morris Jobke 7798ea0cd7 show spinner on file upload in IE8, 9 2014-12-18 22:24:07 +01:00
Vincent Petry 11b3aa2dbe Fix issues with searchByTag in shared storage 2014-12-18 17:27:56 +01:00
Jan-Christoph Borchardt cd81687a38 properly escape variable 2014-12-18 17:19:23 +01:00
Jan-Christoph Borchardt 96ae18db59 get rid of unnecessary alt and title attributes 2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt 7faf3d17e5 fix accessibility for deleted files 2014-12-18 16:54:39 +01:00
Robin Appelman 1ef01de402 Merge pull request #12907 from owncloud/delete-invalid-external-share
Fix deleting invalid s2s shares
2014-12-18 16:38:13 +01:00
Jan-Christoph Borchardt 9009f5f727 add empty alt text to decorative preview of public share image 2014-12-18 16:00:55 +01:00
Jan-Christoph Borchardt 137d19f6b1 fix accessibility for 'New' file inputs 2014-12-18 15:52:42 +01:00
Vincent Petry 4b1b93507d Only populate tags in main file list
Moved populateTags to be done on the main file list.
This prevents the public file list to go through the same code and cause
an error when there is no user.
2014-12-18 15:36:18 +01:00
Jan-Christoph Borchardt 0e78415cb1 fix accessibility of file upload 2014-12-18 14:12:34 +01:00
Vincent Petry 10a0fc2856 Merge pull request #12925 from owncloud/fix-js-unit-tests
be more explicit in JS unit tests - caused by accessibility issues
2014-12-18 12:10:11 +01:00
Jan-Christoph Borchardt ea548cdaaa fix accessibility of logos 2014-12-18 10:51:41 +01:00
Jenkins for ownCloud 5c6e08213e [tx-robot] updated from transifex 2014-12-18 01:56:40 -05:00
Morris Jobke ec0401f97b be more explicit in JS unit tests - caused by accessibility issues 2014-12-18 01:27:58 +01:00
Thomas Müller 82f8726903 Merge pull request #12900 from owncloud/more-accessibility
More accessibility fixes for Files
2014-12-18 01:21:01 +01:00
Thomas Müller a581dcaadb Merge pull request #12924 from owncloud/improve-emptystates
Improve empty states
2014-12-18 01:10:13 +01:00
Jan-Christoph Borchardt 0bda42b8e3 add empty state for external storages 2014-12-17 21:57:31 +01:00
Morris Jobke 7c1b9aedd5 Setup a docker container that holds a webdav instance to test files_external
document docker parameter and use random host port
fix typo
copy autotest.sh to autotest-external.sh
adds ability to add start* and stop* scripts in env in external tests
run files_external WebDAV tests against ownCloud instance
introduce executor number to be able to shut down the correct docker container
fetch docker images in advance - this also fetches latest versions of the docker images
add second argument to autotest-external.sh which can specify a single test to run
print out the explicit test run
change naming schema of files_external setup scripts
2014-12-17 21:50:35 +01:00
Jan-Christoph Borchardt 59dec3834f wording fix for Files app empty state 2014-12-17 21:45:51 +01:00
Jan-Christoph Borchardt 38931176df apply empty state for 'Deleted files' 2014-12-17 21:45:34 +01:00
Jan-Christoph Borchardt ab2ae91b11 improve empty state of 'All files' 2014-12-17 21:27:14 +01:00
Jan-Christoph Borchardt 16c62a346c improve empty states for sharing and shared links as well 2014-12-17 21:22:28 +01:00
Jan-Christoph Borchardt e3192bfa26 use empty state for 'Shared with you' as well 2014-12-17 21:13:53 +01:00
Jan-Christoph Borchardt 2be66044cc even better empty state for Favorites, and general Empty State style 2014-12-17 20:59:26 +01:00
Robin McCorkell c20be24559 Merge pull request #12793 from owncloud/mountconfig-store-id
Add the storage id to the mount config
2014-12-17 17:53:11 +00:00
Morris Jobke a641bb7592 Merge pull request #12902 from owncloud/fix-filelist-thumbnails
Propertly restore thumbnail on cancel/rename/move
2014-12-17 17:13:21 +01:00
Vincent Petry 0b3f0716fc Returns and update tags through WebDAV PROPFIND and PROPPATCH
Added oc:tags and oc:favorites in PROPFIND response.
It is possible to update them with PROPPATCH.
These properties are optional which means they need to be requested
explicitly
2014-12-17 16:50:35 +01:00
Robin Appelman e656af4c83 Root always exists 2014-12-17 16:09:41 +01:00
Robin Appelman d075b1d743 Add the storage id to the mount config 2014-12-17 14:22:03 +01:00
Jan-Christoph Borchardt 6f4ed59883 use method to only visually hide elements, show only for screen reader 2014-12-17 14:12:13 +01:00
Robin Appelman fd85424742 Add getMountPoint to FileInfo 2014-12-17 14:03:50 +01:00
Robin Appelman 95a145f67f Load mount specific options from the mount config 2014-12-17 14:03:50 +01:00
Jan-Christoph Borchardt 532ba99f1c Merge pull request #12895 from owncloud/favorites-polish
polish the Favorites design
2014-12-17 13:42:20 +01:00
Jan-Christoph Borchardt e2977ff4c1 fix favorite star flickering on empty state page 2014-12-17 13:40:57 +01:00
Vincent Petry ab35459cac Propertly restore thumbnail on cancel/rename/move
Since the thumbnail is now in a div, the code that tries to change the
thumbnail have been adapted here as well.
2014-12-17 13:12:57 +01:00
Jan-Christoph Borchardt 1b5f43e7c3 add text to Settings button 2014-12-17 12:20:38 +01:00
Jan-Christoph Borchardt 9f9aa44b57 add alt text to 'Cancel upload' button 2014-12-17 12:05:45 +01:00
Jan-Christoph Borchardt 4344b3d3cf fix Delete action text being translatable 2014-12-17 11:55:35 +01:00
Jan-Christoph Borchardt edc8967c93 add text to Delete action 2014-12-17 11:50:58 +01:00
Jan-Christoph Borchardt e5875fda38 properly name form labels for the file selection 2014-12-17 11:40:21 +01:00
Jan-Christoph Borchardt bac2683c55 fix alt text for breadcrumbs home icon 2014-12-17 11:26:42 +01:00
Morris Jobke d41082f4d6 first step to drop \OCP\Config:: in favour of IConfig 2014-12-17 11:12:37 +01:00
Jan-Christoph Borchardt c7cf0d0386 fix file list summary left alignment 2014-12-17 11:08:39 +01:00
Jan-Christoph Borchardt 433d1de923 fix empty state for Favorites 2014-12-17 11:04:22 +01:00
Jan-Christoph Borchardt f2d7fad0fb put Favorites second in list, after 'All files' 2014-12-17 11:00:16 +01:00
Jenkins for ownCloud 6d80524e67 [tx-robot] updated from transifex 2014-12-17 01:56:41 -05:00
Thomas Müller 775f6a1354 make sure styles and scripts are only loaded once 2014-12-16 18:26:43 +01:00
Jenkins for ownCloud 5b9c453071 [tx-robot] updated from transifex 2014-12-16 01:55:32 -05:00
Lukas Reschke be3d4fd303 Merge pull request #12360 from owncloud/files-tags
Add favorites to files app
2014-12-15 19:55:18 +01:00
Lukas Reschke a0a3322b94 Remove unused file
That file is apparently unused - introduced with 30b58f5677

I guess we can remove it...
2014-12-15 17:29:16 +01:00
Vincent Petry 207d77e5cd Fixed small code style issues 2014-12-15 17:20:41 +01:00
Jörn Friedrich Dreyer 6602d3ac77 Merge pull request #12555 from owncloud/app_specific_search
introduce inApps[] filter for search via ajax query
2014-12-15 16:14:40 +01:00
Vincent Petry 976baed5f9 Remove spinner when toggling file favorite 2014-12-15 15:50:57 +01:00
Vincent Petry 33eb4483b2 Fixed has-favorites CSS 2014-12-15 15:18:29 +01:00
Jan-Christoph Borchardt fb220a1e09 shift actions to the left a bit to account for right shift due to favorites action, not not overlap with size info 2014-12-15 15:12:37 +01:00
Jan-Christoph Borchardt 4dbe8c6771 add CSS to shift header to account for when favorites are present 2014-12-15 15:11:51 +01:00
Vincent Petry 1d22cd5b22 Use star icon for favorites 2014-12-15 12:44:41 +01:00
Vincent Petry dfe922b72a Correctly replace favorites icon when re-rendering file actions 2014-12-15 12:10:54 +01:00
Vincent Petry a5bb66f4a7 Added favorites feature to the files app 2014-12-15 12:10:54 +01:00
Morris Jobke b831914aa6 Merge pull request #11991 from owncloud/bower-jquery-ui
bower jquery-ui - exported changes to a separate css file
2014-12-15 11:39:31 +01:00
Jenkins for ownCloud 036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Jenkins for ownCloud 6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke 5b3971f002 Merge pull request #12639 from owncloud/bad_mtime_format
Fix formatting of bad dates from external storages
2014-12-13 10:07:10 +01:00
Morris Jobke edcd2f2706 bower jquery-ui - exported changes to a separate css file 2014-12-13 09:47:34 +01:00
Morris Jobke 29e1c3a898 Merge pull request #12795 from owncloud/files-layoutchanges
Move file thumbnail element into the label tag
2014-12-13 09:00:43 +01:00
Jenkins for ownCloud 416e21d902 [tx-robot] updated from transifex 2014-12-13 01:55:24 -05:00