nupplaPhil
|
3369dfaad9
|
Remove unused function Cache::delete()
|
2020-01-07 00:37:01 +01:00 |
|
nupplaPhil
|
182f390520
|
Move Cache::clear() to DI::cache()->clear()
|
2020-01-07 00:36:07 +01:00 |
|
nupplaPhil
|
f7ca437ba6
|
Remove unused method Cache::getAllKeys()
|
2020-01-07 00:36:06 +01:00 |
|
nupplaPhil
|
31457b8566
|
Replace Lock::release() with DI::lock()->release() and remove Core\Lock
|
2020-01-07 00:24:10 +01:00 |
|
nupplaPhil
|
634e657d23
|
Replace Lock::acquire() with DI::lock()->acquire()
|
2020-01-07 00:20:31 +01:00 |
|
nupplaPhil
|
c7476513e3
|
removed some static wrapper
|
2020-01-07 00:14:01 +01:00 |
|
nupplaPhil
|
20f1ab05e6
|
clear cookie before session clear
|
2020-01-07 00:11:39 +01:00 |
|
Philipp
|
e56c8dcc3c
|
Merge pull request #8063 from MrPetovan/bug/8058-use-default-user-acl-events
Use default user permissions when creating new event
|
2020-01-06 14:18:20 +01:00 |
|
Hypolite Petovan
|
00011fe77d
|
Remove unused use statements in Module\Item\Compose
|
2020-01-05 17:09:14 -05:00 |
|
Hypolite Petovan
|
64c8855407
|
Allow special groups in default user permissions
- Use ACLFormatter in ACL::getDefaultUserPermissions
- Remove ACL::fixACL
- Add return value to Contact::pruneUnavailable
|
2020-01-05 17:09:14 -05:00 |
|
Michael
|
6d7608fbc7
|
We only search for items with the same uid
|
2020-01-05 20:42:32 +00:00 |
|
Michael
|
c0e25bd8f4
|
Merge remote-tracking branch 'upstream/develop' into item-notification
|
2020-01-05 19:31:30 +00:00 |
|
Tobias Diekershoff
|
755b9daa45
|
Merge pull request #8061 from annando/ap-receiver
AP: ensure that incoming posts are reaching all receivers
|
2020-01-05 19:30:42 +01:00 |
|
Michael
|
ab43d3ddc4
|
AP: ensure that incoming posts are reaching all receivers
|
2020-01-05 17:20:23 +00:00 |
|
Michael
|
274788807d
|
Fix a missing ")"
|
2020-01-05 17:19:37 +00:00 |
|
Michael
|
4734242f63
|
Added to-do
|
2020-01-05 13:37:24 +00:00 |
|
Michael
|
31b6680402
|
Improved check for invalid profiles
|
2020-01-05 13:19:11 +00:00 |
|
Michael
|
4dec002dcb
|
Now using only a single array
|
2020-01-05 13:13:36 +00:00 |
|
Michael
|
45b747f13b
|
Remove duplicates in a better way
|
2020-01-05 13:05:00 +00:00 |
|
Michael
|
4e7aa33598
|
Restructured profile generation
|
2020-01-05 12:49:57 +00:00 |
|
Michael
|
dcf5471e19
|
Clarified description
|
2020-01-05 12:07:02 +00:00 |
|
Michael
|
23b73854a1
|
Spaces
|
2020-01-05 12:00:15 +00:00 |
|
Michael
|
6cbfa5b862
|
Added type hints
|
2020-01-05 11:00:57 +00:00 |
|
Michael
|
20d570823d
|
Fix post update / clean up code
|
2020-01-05 10:16:01 +00:00 |
|
Michael
|
4b44aca507
|
Don't create notifications for own posts
|
2020-01-05 09:48:31 +00:00 |
|
Michael
|
a4268a973f
|
Added post update
|
2020-01-05 09:10:32 +00:00 |
|
Michael
|
f183816b7d
|
Notification type can now be selected
|
2020-01-05 09:10:03 +00:00 |
|
Michael
|
fe1a702e8c
|
Improved documentation, now checking all items
|
2020-01-05 09:08:40 +00:00 |
|
Michael
|
6ac37e284d
|
Merge remote-tracking branch 'upstream/develop' into item-notification
|
2020-01-05 07:47:55 +00:00 |
|
Tobias Diekershoff
|
0c9fcdde69
|
Merge pull request #8057 from annando/notice-error
Fix an error and a notice
|
2020-01-05 07:40:31 +01:00 |
|
Michael
|
8878b3864f
|
Fix an error and a notice
|
2020-01-05 02:19:02 +00:00 |
|
Michael
|
e728c4829f
|
Restructuring
|
2020-01-05 02:18:11 +00:00 |
|
Michael
|
8e2494568e
|
Functionality is now added
|
2020-01-05 01:23:40 +00:00 |
|
Hypolite Petovan
|
393a671501
|
Merge pull request #8055 from nupplaphil/task/remove_get_server
Remove get_server() in favor of Search::getGlobalDirectory()
|
2020-01-04 20:10:50 -05:00 |
|
Michael
|
ecb4848dfd
|
Tests are now working
|
2020-01-05 00:54:18 +00:00 |
|
nupplaPhil
|
48baa0be4b
|
Remove get_server() in favor of Search::getGlobalDirectory()
|
2020-01-05 00:04:55 +01:00 |
|
Michael
|
30a4b0eafb
|
Merge remote-tracking branch 'upstream/develop' into item-notification
|
2020-01-04 22:53:06 +00:00 |
|
Michael Vogel
|
c8a322baf0
|
Merge pull request #8053 from nupplaphil/task/remove_get_app
Remove get_app() in favor of DI::app()
|
2020-01-04 23:41:51 +01:00 |
|
nupplaPhil
|
244f440d97
|
Remove unused killme()
|
2020-01-04 23:43:13 +01:00 |
|
nupplaPhil
|
f0eea6f875
|
Remove get_app() in favor of DI::app()
|
2020-01-04 23:42:01 +01:00 |
|
Michael Vogel
|
05de0f4a19
|
Merge pull request #8056 from nupplaphil/task/remove_rdirname
Remove rdirname() in favor of native dirname()
|
2020-01-04 23:36:59 +01:00 |
|
nupplaPhil
|
07b4ceecd2
|
Remove deprecated rdirname() in favor of native dirname()
|
2020-01-05 00:10:34 +01:00 |
|
Michael
|
b08c9692ca
|
Added parameter type
|
2020-01-04 21:48:26 +00:00 |
|
Michael
|
3a1798d1c3
|
First testable version
|
2020-01-04 21:45:20 +00:00 |
|
Michael
|
7cf27e9cb0
|
AP: Transmit the language in the contentMap
|
2020-01-04 14:35:14 +00:00 |
|
Michael
|
4bfd0abec7
|
New "UserItem" class, new notification type field
|
2020-01-04 12:21:42 +00:00 |
|
Michael Vogel
|
5d20cd7e16
|
Merge pull request #8048 from MrPetovan/bug/fix-bbcode-scaleexternalimage
Fix BBCode::scaleExternalImage
|
2020-01-03 17:38:55 +01:00 |
|
Hypolite Petovan
|
4461c16165
|
Remove superfluous comment in BBCode::scaleExternalImage
|
2020-01-03 09:30:35 -05:00 |
|
Hypolite Petovan
|
ebaf726744
|
Rework Feed::import parameters
- Remove unused $hub
- Replace $simulate with an implicit condition
|
2020-01-03 09:26:28 -05:00 |
|
Hypolite Petovan
|
38fe3b8994
|
Fix formatting in Feed::import
|
2020-01-03 09:12:32 -05:00 |
|
Hypolite Petovan
|
52c5b0e0f3
|
Remove unused BBCode::scaleExternalImage parameters
- Remove now obsolete system.no_view_full_size config key
|
2020-01-02 20:44:15 -05:00 |
|
Hypolite Petovan
|
0b3cd206c3
|
Remove harmful HTML decode/encode in BBCode::scaleExternalImages
|
2020-01-02 20:35:59 -05:00 |
|
Michael
|
fb550a0172
|
Relocated functions from PortableContact to GServer
|
2020-01-01 21:29:36 +00:00 |
|
Philipp
|
75c74e8562
|
Merge pull request #8044 from annando/contact-adding
Don't add contacts when not needed
|
2020-01-01 20:38:34 +01:00 |
|
Michael
|
bd6fb64c16
|
Fixed documentation
|
2020-01-01 18:57:55 +00:00 |
|
Michael
|
73b82d1455
|
Don't add contacts when not needed
|
2020-01-01 17:54:36 +00:00 |
|
Tobias Diekershoff
|
d3d63523ef
|
Merge pull request #8040 from MrPetovan/bug/notices
Add necessary call to BaseUrl->get() in Module\Objects
|
2019-12-31 19:43:34 +01:00 |
|
Hypolite Petovan
|
ab0a3f194a
|
Add necessary call to BaseUrl->get() in Module\Objects
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-569959500
|
2019-12-31 12:25:41 -05:00 |
|
Hypolite Petovan
|
b6e93c83fc
|
Suppress undefined index nickname notice in Model\Profile::sidebar
|
2019-12-31 12:25:39 -05:00 |
|
Hypolite Petovan
|
07f1485df1
|
Correctly capitalize DI::baseUrl in Module\Tos
- Addresses https://github.com/friendica/friendica/issues/7998#issuecomment-569959102
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-569959336
|
2019-12-31 12:19:12 -05:00 |
|
Philipp
|
b9dba631aa
|
Merge pull request #8037 from MrPetovan/bug/notices
Replace remaining $a->page by DI::page()
|
2019-12-30 23:41:23 +01:00 |
|
nupplaPhil
|
9bdb4db887
|
Replace comment
|
2019-12-30 23:45:42 +01:00 |
|
Hypolite Petovan
|
e84ad15569
|
Replace remaining $a->page by DI::page()
|
2019-12-30 17:35:01 -05:00 |
|
nupplaPhil
|
e2dc1d7477
|
Remove deprecated call
|
2019-12-30 23:08:06 +01:00 |
|
nupplaPhil
|
a4a7f19df1
|
Move redundant System::removedBaseUrl() to DI::baseUrl()->remove() calls
|
2019-12-30 23:03:56 +01:00 |
|
nupplaPhil
|
3f34229752
|
Move redundant System::baseUrl() to DI::baseUrl() calls
|
2019-12-30 23:00:08 +01:00 |
|
nupplaPhil
|
6d7362da41
|
Replace deprecated $a->page with DI::page()
|
2019-12-30 20:02:09 +01:00 |
|
Hypolite Petovan
|
4aa01ee17f
|
Use most recent last item date in Mastodon\Account
|
2019-12-30 06:12:52 -05:00 |
|
Hypolite Petovan
|
0dbce6e58b
|
Add user contact data superseding to Mastodon\Account::create
|
2019-12-30 06:12:51 -05:00 |
|
Hypolite Petovan
|
c286772fb5
|
Correct value of Mastodon API Account acct field for local users
|
2019-12-30 06:12:51 -05:00 |
|
Hypolite Petovan
|
bef16702c7
|
Add missing fields to Mastodon API Account entity
|
2019-12-30 06:12:51 -05:00 |
|
Hypolite Petovan
|
cb7875b035
|
Rename Api\Mastodon\Account::createFromContact to just create
- Retrieve public contact in Api\Mastodon\FollowRequests instead of user contact
|
2019-12-30 06:12:50 -05:00 |
|
Hypolite Petovan
|
9ed8479b32
|
Rename Api\Mastodon\Account::create contact parameter to publicContact
- Update Mastodon entity documentation link
- Add default value for fields
|
2019-12-30 06:11:48 -05:00 |
|
Hypolite Petovan
|
6f199ab7b3
|
Add missing return statement in Core\L10n
- Addresses https://github.com/friendica/friendica/issues/7998#issuecomment-569560492
|
2019-12-29 22:47:32 -05:00 |
|
Hypolite Petovan
|
ce50faf780
|
Update wrong references to ISession::delete
|
2019-12-29 21:52:56 -05:00 |
|
Hypolite Petovan
|
efadab66c5
|
Update wrong/missing references to classes
|
2019-12-29 21:51:16 -05:00 |
|
Hypolite Petovan
|
015db25d9f
|
Replace obsolete references to App baseURL and getApp by DI
|
2019-12-29 21:50:15 -05:00 |
|
Hypolite Petovan
|
3c76826793
|
Merge pull request #8033 from annando/contact-logging
Added logging for not created contacts
|
2019-12-29 21:07:36 -05:00 |
|
Michael
|
74f4637ff3
|
Fix fatal errors caused by PR 8019
|
2019-12-30 01:17:16 +00:00 |
|
Michael
|
4786298da4
|
Added logging for not created contacts
|
2019-12-30 01:03:00 +00:00 |
|
Hypolite Petovan
|
03038e7a3b
|
Merge pull request #8019 from nupplaphil/task/replace_getClass
Introduce new way of static/dynamic bridge / CleanUp deprecated methods
|
2019-12-29 17:47:28 -05:00 |
|
Hypolite Petovan
|
61fccaeb30
|
Merge pull request #8028 from annando/probe-timeout
Probe: Additional checks for connection problems
|
2019-12-29 17:45:12 -05:00 |
|
nupplaPhil
|
f2d4a5eb7d
|
Remove namespaces
|
2019-12-29 20:18:26 +01:00 |
|
nupplaPhil
|
651d693270
|
Rebase for OpenId & Hovercard
|
2019-12-29 20:18:26 +01:00 |
|
nupplaPhil
|
2660edbb48
|
Use DI::baseUrl() for Search\Index.php
|
2019-12-29 20:18:25 +01:00 |
|
nupplaPhil
|
df0c05d635
|
Add Model\Introduction class to DI registry
|
2019-12-29 20:18:25 +01:00 |
|
nupplaPhil
|
2cb449a0d5
|
make the DI abstract so no instance is possible
|
2019-12-29 20:18:24 +01:00 |
|
nupplaPhil
|
987b29d963
|
Alphabetic sort DI-container per namespace
|
2019-12-29 20:18:24 +01:00 |
|
nupplaPhil
|
c1dbb25656
|
Creating interfaces for Config/PConfig & fix tests
|
2019-12-29 20:18:19 +01:00 |
|
nupplaPhil
|
4835f1185f
|
Remove deprecated App::module - replace with DI::module()->getName()
|
2019-12-29 20:17:52 +01:00 |
|
nupplaPhil
|
33674808dc
|
Remove deprecated App::cmd - replace with DI::args()->getCommand()
|
2019-12-29 20:17:51 +01:00 |
|
nupplaPhil
|
e6f61c2cc7
|
Remove deprecated App::query_string - replace with DI::args()->getQueryString()
|
2019-12-29 20:17:50 +01:00 |
|
nupplaPhil
|
26af2feee2
|
Remove deprecated App::is_mobile/is_tablet - replace with DI::mode()->isMobile()/isTablet()
|
2019-12-29 20:17:50 +01:00 |
|
nupplaPhil
|
c7230932d6
|
Remove deprecated App::registerStylesheet()/FooterScript() - replace with DI::page()->registerStylesheet()/FooterScript()
|
2019-12-29 20:17:49 +01:00 |
|
nupplaPhil
|
302cbaa33c
|
Remove deprecated App::getScheme()
|
2019-12-29 20:17:48 +01:00 |
|
nupplaPhil
|
e944d7bed6
|
Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()
|
2019-12-29 20:17:48 +01:00 |
|
nupplaPhil
|
e57a87f224
|
Remove deprecated App::setBaseURL() - process methods to DI::baseUrl()->saveByURL()
|
2019-12-29 20:17:47 +01:00 |
|
nupplaPhil
|
50be94aa5e
|
Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName()
|
2019-12-29 20:17:47 +01:00 |
|
nupplaPhil
|
2900389696
|
Remove deprecated App::getUrlPath - process methods to DI::baseUrl()->getUrlPath()
|
2019-12-29 20:17:46 +01:00 |
|
nupplaPhil
|
e93fba5136
|
Remove deprecated App::removeBaseURL - process methods to DI::baseUrl()->remove()
|
2019-12-29 20:17:45 +01:00 |
|
nupplaPhil
|
5609e94b05
|
Refactor deprecated App - process methods to DI::process()->*()
|
2019-12-29 20:17:45 +01:00 |
|
nupplaPhil
|
aedbdc536a
|
Refactor deprecated App::getArgumentValue() to DI::args()->get()
|
2019-12-29 20:17:44 +01:00 |
|
nupplaPhil
|
8b6e123b3f
|
Refactor deprecated App::isAjax() to DI::mode()->isAjax()
|
2019-12-29 20:17:44 +01:00 |
|
nupplaPhil
|
8e6973b774
|
Refactor deprecated App::internalRedirect() to DI::baseUrl()->redirect()
|
2019-12-29 20:17:43 +01:00 |
|
nupplaPhil
|
cc9b7bb14f
|
Refactor dynamic App::getDBA() to static DI::dba()
|
2019-12-29 20:17:43 +01:00 |
|
nupplaPhil
|
9cec293ccc
|
Refactor dynamic App::getMode() to static DI::mode()
|
2019-12-29 20:17:42 +01:00 |
|
nupplaPhil
|
181529f3df
|
Refactor dynamic App::getProfiler() to static DI::profiler()
|
2019-12-29 20:17:42 +01:00 |
|
nupplaPhil
|
e2b2778e0a
|
Refactor dynamic App::getLogger() to static DI::logger()
|
2019-12-29 20:17:41 +01:00 |
|
nupplaPhil
|
fceb4f3823
|
Refactor dynamic App::getConfig() to static DI::config()
|
2019-12-29 20:17:40 +01:00 |
|
nupplaPhil
|
2bb9e46be3
|
Optimize DI class (introduce method-mapping constant)
|
2019-12-29 20:17:40 +01:00 |
|
nupplaPhil
|
388b963714
|
Replace BaseObject class with DI::* calls
|
2019-12-29 20:17:38 +01:00 |
|
nupplaPhil
|
1de3f186d7
|
Introduce new DI container
- Adding Friendica\DI class for getting dynamic classes
- Replacing BaseObject::getApp() with this class
|
2019-12-29 20:16:55 +01:00 |
|
Hypolite Petovan
|
a9220aa83b
|
Merge pull request #8026 from nupplaphil/task/l10n_immutable
Make L10n immutable
|
2019-12-29 13:54:32 -05:00 |
|
nupplaPhil
|
71a38180e9
|
Check for same language
|
2019-12-29 16:39:25 +01:00 |
|
Hypolite Petovan
|
51ee24f652
|
Fix capitalization of table definition key in DBStructure
- Addresses https://github.com/friendica/friendica/issues/7998#issuecomment-569481865
|
2019-12-29 02:23:47 -05:00 |
|
Michael
|
60df79ad2a
|
Probe: Additional checks for connection problems
|
2019-12-29 03:27:54 +00:00 |
|
Hypolite Petovan
|
25847c4c71
|
Merge pull request #8022 from nupplaphil/task/mod_hcard
Move mod/hcard to src\Module\HoverCard
|
2019-12-28 21:42:01 -05:00 |
|
Hypolite Petovan
|
f000680511
|
Merge pull request #8021 from nupplaphil/task/mod_openid
Move mod/openid to src\Module\Security\OpenId
|
2019-12-28 21:39:42 -05:00 |
|
Hypolite Petovan
|
d7c8327482
|
Merge pull request #8027 from nupplaphil/task/session_remove_cookie
Session - Remove unneeded cookie parameter
|
2019-12-28 21:38:54 -05:00 |
|
nupplaPhil
|
673c4537e4
|
Session - Remove unneeded cookie parameter
|
2019-12-29 00:03:58 +01:00 |
|
nupplaPhil
|
7a2f4dc54e
|
Make L10n immutable
- Remove Push/Pop
- Add "withLang($lang)" method
|
2019-12-28 23:12:01 +01:00 |
|
Michael
|
fab0d9b919
|
Don't create contacts for unknown networks / improved content fetching
|
2019-12-28 19:17:48 +00:00 |
|
nupplaPhil
|
4d545825f0
|
optimize usage of arguments
|
2019-12-28 15:28:17 +01:00 |
|
nupplaPhil
|
97924d39d9
|
Merge init() and content()
|
2019-12-28 15:21:58 +01:00 |
|
Michael
|
f281725a09
|
Remove test loggings
|
2019-12-28 11:17:10 +00:00 |
|
Michael
|
160f931861
|
Fix: Search for terms and posts is now possible again
|
2019-12-28 11:15:57 +00:00 |
|
Tobias Diekershoff
|
d6274ab6f7
|
Merge pull request #8023 from MrPetovan/bug/7808-markdown-unescape-chevrons
Fix chevron display in BBCode/Markdown conversion
|
2019-12-28 08:07:30 +01:00 |
|
Hypolite Petovan
|
aa3a85c727
|
Escape major HTML characters in code blocks in BBCode::convert
- HTML sanitization was removing unescaped opening chevrons in code blocks
|
2019-12-27 21:42:56 -05:00 |
|
Hypolite Petovan
|
39cb3e68b9
|
Remove faulty escape for HTML entities in BBCode::toMarkdown
- Mangled Markdown output with chevrons
|
2019-12-27 21:42:56 -05:00 |
|
Hypolite Petovan
|
424106fd4e
|
Add BBCode to Markdown to HTML raw result in Module\Babel
- Display HTML entities for BBCode to Markdown output
|
2019-12-27 20:44:24 -05:00 |
|
nupplaPhil
|
12e223b2ef
|
fix
|
2019-12-27 23:51:17 +01:00 |
|
nupplaPhil
|
eeb78d2d29
|
Move mod/hcard to src\Module\HoverCard
|
2019-12-27 22:53:09 +01:00 |
|
nupplaPhil
|
aa5771cf3e
|
Move Login/Logout/TwoFactor to bundled submodule "Security"
|
2019-12-27 22:19:28 +01:00 |
|
nupplaPhil
|
d30e8665e1
|
Move mod/openid to src\Module\OpenId
|
2019-12-27 22:16:40 +01:00 |
|
Michael
|
1b5cfc2217
|
Improved description
|
2019-12-27 19:00:54 +00:00 |
|
Michael
|
c037e9143c
|
Additionally display the protocol together with the network
|
2019-12-27 17:24:29 +00:00 |
|
Michael Vogel
|
c7e4157a5a
|
Merge pull request #8007 from MrPetovan/task/7984-add-profile-url-search
Add profile url search
|
2019-12-27 02:19:39 +01:00 |
|
Hypolite Petovan
|
a11b47f93d
|
Add profile URL search
- Move post URL search to private method in Module\Search\Index
|
2019-12-26 20:17:12 -05:00 |
|
Michael
|
9b750345c7
|
Arrays
|
2019-12-27 01:15:54 +00:00 |
|
Michael
|
b1b3744759
|
Support for tables in HTML2BBCode parser
|
2019-12-27 01:07:19 +00:00 |
|
Michael
|
48ec65eb4b
|
Fix the "ago" date (with "received at") for other themes than frio
|
2019-12-26 19:51:36 +00:00 |
|
Michael Vogel
|
65c0418807
|
Merge pull request #8004 from MrPetovan/bug/7994-add-timezone-log
Add timezone information to logger timestamp
|
2019-12-25 19:52:19 +01:00 |
|
Michael Vogel
|
4834fffe78
|
Merge pull request #8003 from MrPetovan/bug/notices
Fixed backlog of notices for 2019.12
|
2019-12-25 11:28:01 +01:00 |
|
Michael Vogel
|
221746bff3
|
Merge pull request #8005 from MrPetovan/bug/7992-empty-in-clause
Add support for empty values array in Database\DBA
|
2019-12-25 09:34:01 +01:00 |
|
Hypolite Petovan
|
016507f346
|
Use BaseURL::redirect instead of deprecated App->internalRedirect in Search\Index
|
2019-12-24 17:37:22 -05:00 |
|
Hypolite Petovan
|
1c9cb42d98
|
Move search term emptiness check before content checks in Search\Index
|
2019-12-24 17:17:35 -05:00 |
|
Hypolite Petovan
|
ec7eb9d83a
|
Rename BaseSearchModule::performSearch to performContactSearch to remove purpose confusion
|
2019-12-24 17:15:41 -05:00 |
|
Hypolite Petovan
|
6501acf0bc
|
Stop automatically remove newly blocked contacts from their groups
|
2019-12-24 16:45:08 -05:00 |
|
Hypolite Petovan
|
b610d4e82d
|
Remove group management restrictions on pending and blocked in Module\Group
|
2019-12-24 16:44:43 -05:00 |
|
Hypolite Petovan
|
9c9e07dbab
|
Add support for empty values array in Database\DBA
|
2019-12-24 16:21:00 -05:00 |
|