strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
23961 commits 2 branches 55 tags 148 MiB
Commit graph

5487 commits

Author SHA1 Message Date
Philipp 774d04cd2f
Merge pull request #7044 from MrPetovan/task/router 
Move mod/admin to src/Module/Admin
 2019-05-02 18:26:30 +02:00
Hypolite Petovan 41f781c52a Replace System::httpExit() by HTTPException throwing 2019-05-02 11:37:09 -04:00
Philipp 07cb887885
Merge pull request #7067 from MrPetovan/task/remove-app-error 
Remove App->error
 2019-05-02 17:24:56 +02:00
Hypolite Petovan 9774c95b80 Remove duplicate $baseurl template variable 
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
 2019-05-02 09:55:48 -04:00
Hypolite Petovan 26bee52212 Removed unused mod/admin 2019-05-02 09:52:54 -04:00
Hypolite Petovan fa4b42c6dd Move phpinfo module to src/Module/Admin 2019-05-02 09:52:53 -04:00
Hypolite Petovan bc5d1384e1 Move admin/deleteitem to src/Module/Admin 2019-05-02 09:52:52 -04:00
Hypolite Petovan a201391d11 Move admin/dbsync to src/Module 2019-05-02 09:52:51 -04:00
Hypolite Petovan df947ba9db Move admin/logs to src/Module 2019-05-02 09:52:51 -04:00
Hypolite Petovan 740723534f Move admin/site to src/Module 
- Replace default theme settings modal with simple link to admin/themes
 2019-05-02 09:52:50 -04:00
Hypolite Petovan d0b40cda4c Move admin/themes/{theme} to src/Module 
- Remove now unused templates/admin/addon_detail.tpl
- Remove references to themes admin in mod/admin.php
 2019-05-02 09:52:50 -04:00
Hypolite Petovan a88df9b259 Ensure theme consistency when using filebrowser 
- Send frio filebrowser result to current frame instead of parent one
 2019-05-02 09:52:48 -04:00
Hypolite Petovan 5a01c53781 Move admin/queue to src/Module 
- Add Module\Admin\Queue class
- Add route for admin/queue[/deferred]
- Add queue admin aside menu entry
- Remove obsolete templates/admin/queue.tpl from base and frio
- Move templates/admin/workerqueue.tpl to templates/admin/queue.tpl
- Remove admin_page_workerqueue and admin_page_workerqueue_post from mod/admin.php
- Update admin/summary.tpl with new queue admin paths
 2019-05-02 09:52:48 -04:00
Hypolite Petovan 5750623b48 Move admin/blocklist/server to src/Module 
- Add Module\Admin\Blocklist\Server class
- Add route for admin/blocklist/server
- Add server blocklist admin aside menu entry
- Move templates/admin/blocklist.tpl to templates/admin/blocklist/server.tpl
- Remove admin_page_blocklist and admin_page_blocklist_post from mod/admin.php
 2019-05-02 09:52:47 -04:00
Hypolite Petovan cf885841c8 Move admin/blocklist/contact to src/Module 
- Add Module\Admin\ContactBlock\Contact class
- Add route for admin/blocklist/contact
- Add contact blocklist admin aside menu entry
- Move templates/admin/contactblock.tpl to templates/admin/blocklist/contact.tpl in base and frio
- Remove admin_page_contactblock and admin_page_contactblock_post from mod/admin.php
 2019-05-02 09:52:46 -04:00
Hypolite Petovan 446cb905e4 Move admin/features to src/Module 
- Add Module\Admin\Features class
- Add route for admin/features
- Add features admin aside menu entry
- Move templates/admin/settings_features.tpl to templates/admin/features.tpl
- Remove admin_page_features and admin_page_features_post from mod/admin.php
 2019-05-02 09:52:46 -04:00
Hypolite Petovan f3f055758c Move admin/users to src/Module 
- Add Module\Admin\Users class
- Add route for admin/users[/{action}/{uid}]
- Add users admin aside menu entry
- Remove admin_page_users and admin_page_users_post from mod/admin.php
 2019-05-02 09:52:45 -04:00
Hypolite Petovan 87e51ddd67 Move admin/addons/{addon} to src/Module 
- Add Module\Admin\Addons\Details class
- Add route for admin/addons/{addon}
- Remove addons pages from mod/admin
 2019-05-02 09:52:44 -04:00
Hypolite Petovan 9bbb438534 Move admin/addons to src/Module 
- Add Module\Admin\Addons\Index class
- Add route for admin/addons
- Add addons admin aside menu entry
- Remove unused template admin/addons.tpl from base and frio
- Remove addon list from mod/admin
 2019-05-02 09:52:44 -04:00
Hypolite Petovan a13bc14933 Move admin/themes to src/Module 
- Add Module\Admin\Themes\Index class
- Add route for admin/themes
- Add themes admin aside menu entry
- Add admin/addons/index.tpl template
- Remove theme list from mod/admin
 2019-05-02 09:52:43 -04:00
Hypolite Petovan 488e425416 Move admin/tos to src/Module 
- Add Module\Admin\Tos class
- Add route for admin/tos
- Add admin aside menu entry
- Remove admin_page_tos and admin_page_tos_post from mod/admin.php
 2019-05-02 09:52:42 -04:00
Hypolite Petovan 35d222f95d Move admin/federation to src/Module 
- Add Module\Admin\Federation class
- Add missing abstract keyword in Module\BaseAdminModule
- Add route for admin/federation
- Remove admin_page_federation()  from mod/admin.php
 2019-05-02 09:52:42 -04:00
Hypolite Petovan 6387a77b52 Move admin summary to src/Module 
- Add BaseAdminModule class
- Add Module\Admin\Summary class
- Add Route for Admin\Summary module
- Remove admin_page_summary() in mod/admin
- Remove $showwarning variable from admin/summary.tpl
 2019-05-02 09:52:41 -04:00
Hypolite Petovan dd0b7d2642 Replace straightforward q() calls by DBA::selectFirst or DBA::exists in mod/photos 2019-05-02 09:49:20 -04:00
Michael 28f316b7e4 Replace the legacy DFRN connection process with AP 2019-05-02 13:05:31 +00:00
Hypolite Petovan 7b1ea6cad6 Remove App->error 2019-05-01 21:17:03 -04:00
Hypolite Petovan 9b91b0550d Rework suggest module without App->error 
- Add POST treatment for ignore request
 2019-05-01 21:13:33 -04:00
Hypolite Petovan 9fa2139681 Remove unused code mentioning App->error in mod/videos 2019-05-01 20:29:01 -04:00
Hypolite Petovan 5dd6e6b5fb Reworked /photos module without App->error 
- Moved confirm dialogs to photos_content()
- Removed comments/interactions from photo edit page
 2019-05-01 19:36:14 -04:00
Philipp Holzer 90248f6bb7
Move .well-known, webfinger, xrd to src/Module/ 2019-05-01 18:25:04 +02:00
Philipp Holzer e7f8d8c3b6
Adding to router 2019-05-01 18:24:51 +02:00
Philipp Holzer 6afeacf02b
remove require_once 2019-05-01 18:24:41 +02:00
Philipp Holzer 3cd438c4e3
Move mod/hostxrd to src/Module/Hostxrd 2019-05-01 18:24:41 +02:00
Hypolite Petovan a4c2de7a0b
Merge pull request #7063 from nupplaphil/task/mod_amcd 
Move mod/amcd to src/Module/AccMgmtControlDoc
 2019-05-01 11:32:20 -04:00
Philipp Holzer 1460e417c1
Move mod/amcd to src/Module/AccMgmtControlDoc 2019-05-01 00:32:33 +02:00
Michael Vogel 581895c07d Preparation for switching the connect mechanism from DFRN to AP 2019-04-30 20:07:20 +02:00
Steffen K9 0719f6436b
Fix parenthesis encoding in admin.php 
Parenthesis in admin, site, worker, frontend worker have wrong encoding.
 2019-04-28 11:02:11 +02:00
Hypolite Petovan e0deb633f0 Move item feed display after permission checking in mod/display 2019-04-28 01:13:39 -04:00
Hypolite Petovan 2d1e771178
Merge pull request #7029 from nupplaphil/task/mod_manifest 
Move mod/manifest to src/Module/Manifest
 2019-04-24 09:26:57 -04:00
Tobias Diekershoff bdc09f1c28 remove superfluous leftover require that broke the .well-known page 2019-04-23 19:03:03 +02:00
Hypolite Petovan 568ce4dd75
Merge pull request #7030 from nupplaphil/task/mod_nodeinfo 
Move mod/nodeinfo to src/Module/Nodeinfo
 2019-04-22 09:51:23 -04:00
Hypolite Petovan 0aa0ec2710
Merge pull request #7027 from nupplaphil/task/mod_statistics_json 
Moving mod/statistics_json to src/Module/Statistics_json
 2019-04-22 09:51:03 -04:00
Philipp Holzer 6056081d5a
Move mod/nodeinfo to src/Module/Nodeinfo 2019-04-22 14:00:17 +02:00
Hypolite Petovan 86529ce6ae
Merge pull request #7028 from nupplaphil/task/mod_localtime 
Move mod/localtime to src/Module/Localtime
 2019-04-22 07:53:17 -04:00
Philipp Holzer ac96e1bf3e
Move mod/manifset to src/Module/Manifset 2019-04-22 12:48:40 +02:00
Philipp Holzer 300a7069f5
Move mod/localtime to src/Module/Localtime 2019-04-22 12:31:18 +02:00
Philipp Holzer 6503be8035
Moving mod/statistics_json to src/Module/Statistics_json 2019-04-22 10:38:34 +02:00
Philipp Holzer 88f2d77786
Moving mod/babel to src/Module/babel 2019-04-21 15:17:04 +02:00
Hypolite Petovan 75387ea171
Merge pull request #6991 from fabrixxm/fix/invalid-storage-on-legacy 
Allow set empty string storage class for legacy
 2019-04-11 09:04:48 -04:00
fabrixxm d2e43619b3 Code standards 2019-04-11 10:44:28 +02:00
fabrixxm 5a07afbc14 Use direct logic 2019-04-10 20:57:22 +02:00
fabrixxm 47aa9daf5a Tweak storage selection in admin page 
Don't call `StorageManager::setBackend()` on save when legacy is selected,
dont't show legacy option in selectbox after backend is changed from legacy
 2019-04-10 08:40:50 +02:00
Philipp Holzer 318a3ca785
Create own base URL class which holds the whole base url business logic 2019-04-09 08:31:16 +02:00
Michael 46a99a05a1 Remove the queue from the core 2019-04-05 18:04:39 +00:00
Tobias Diekershoff 1db0a29291 beautification of pleroma stats 2019-04-05 06:39:34 +02:00
Hypolite Petovan b529c03a20 Sanitize theme path items 
- Sanitize theme style/color/scheme path items
 2019-03-31 21:52:48 -04:00
Philipp Holzer 06175ede1e
forgot admin setting 2019-03-24 22:58:36 +01:00
Philipp Holzer 23654ce566
Added Update checks 
- Logging
- Console
- Admin overview
 2019-03-24 22:51:30 +01:00
Philipp Holzer 49def0dc27
Adding ConfigFileSaver and tests 2019-03-24 13:47:35 +01:00
Philipp Holzer fa31bb6dde
remove basepath and hostname from admin panel and add update path 2019-03-24 13:47:31 +01:00
Philipp Holzer 083820b107 Moving mod/feedtest to src/Module/Feedtest 2019-03-22 22:55:49 -04:00
Philipp Holzer 78d0d6e6e1 Moving mod/filer to src/Module/Filer 2019-03-22 22:55:47 -04:00
Philipp Holzer a876f132bd Moving mod/credits to src/Module/Credits 2019-03-22 22:55:46 -04:00
Philipp Holzer 25a7086fc5 moving mod/apps to src/Module/Apps 2019-03-22 22:28:12 -04:00
Hypolite Petovan 7e2e2f425e Check that provided class implements IStorage in StorageManager::setBackend 
- Add notice in admin if setting value change failed
- Add notice in console if setting value change failed
 2019-03-19 22:42:44 -04:00
Michael cd1fc091cb Only remove when "acct:" is the beginning 2019-03-14 21:18:07 +00:00
Michael 09b6978e4c Oeertube or Peertube? The last one sounds better :-) 2019-03-14 20:08:38 +00:00
Michael 33ffabcca7 Issue 6874: Allow remote follow via Peertube 2019-03-14 19:45:51 +00:00
Hypolite Petovan db3f884a3e Remove item query limit when using file param in mod/network 
- Only mark items as seen on regular network page
 2019-03-09 18:36:11 -05:00
Hypolite Petovan 60c8668aca Add defaults() to url parameter in mod/follow 
- Add error redirection to /contact when url param is empty
- Addresses part of https://github.com/friendica/friendica/issues/6338#issuecomment-470681556
 2019-03-08 21:53:44 -05:00
Hypolite Petovan efdb6634a2 Add defaults() to term parameter in mod/filerm 
- Addresses part of https://github.com/friendica/friendica/issues/6338#issuecomment-470681556
 2019-03-08 21:51:23 -05:00
Hypolite Petovan 3127fd6be6 Check $profile variable in mod/match 
- Addresses https://github.com/friendica/friendica/issues/6337#issuecomment-470733015
 2019-03-07 18:42:49 -05:00
Michael f2560c42d1 Reduce the default maximum load for the worker to 20 2019-03-02 18:41:12 +00:00
Hypolite Petovan 748a0ca21b Fix allow_cid variable type in mod/network 
- Improve SQL query for network contacts
- Add missing query statement closure
- Addresses https://github.com/friendica/friendica/issues/6337#issuecomment-467111446
 2019-03-02 09:28:37 -05:00
Hypolite Petovan fe8d5abe0a Replace strong by title format for item title in mod/share 2019-02-27 20:59:39 -05:00
Michael Vogel efe358c617
Merge pull request #6746 from nupplaphil/issue/6338-notices 
Fixing notices
 2019-02-24 15:44:54 +01:00
Michael Vogel fa5525d084
Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions 
Fix last batch of implicit mentions issues
 2019-02-24 15:40:11 +01:00
Philipp Holzer fe74db6311
Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-458030934 2019-02-24 15:15:25 +01:00
Michael Vogel df5ea1fab0
Merge pull request #6732 from MrPetovan/bug/1777-fix-blocked-contact-group 
Allow to remove blocked contact from groups
 2019-02-24 14:30:36 +01:00
Hypolite Petovan 102c44e8ee Fix typo in mod/profiles 2019-02-23 18:11:48 -05:00
Hypolite Petovan 486de602ff Delete mod/contactgroup and mod/group files 2019-02-23 17:32:41 -05:00
Hypolite Petovan 67aa188830 Improve Logger calls 
- Add context in various calls
- Remove deprecated Logger::log call in Processor
 2019-02-23 17:32:13 -05:00
Hypolite Petovan c7dfc88c6c Add implicit mention gathering in local posts 
- Rename $parent_item to $toplevel_item in item_post()
- Add $thread_parent_id variable to distinguish from $parent_item
- Add item_add_implicit_mentions() function
 2019-02-23 17:32:12 -05:00
Hypolite Petovan 8c1db51a76 Improve Logger calls 
- Replace various deprecated Logger::log calls
- Reassign log level for verbose log calls
 2019-02-23 17:32:11 -05:00
Philipp Holzer 45cc8180b1
Return 404 if nodeinfo isn't enabled. 2019-02-23 10:10:33 +01:00
Hypolite Petovan 4375edd63e
Merge pull request #6719 from annando/worker-scheduler 
New scheduler mechanism - now to the correct branch
 2019-02-21 16:12:19 -05:00
Roland Häder 9fa812b35d
Rewrites: 
- converted single-line if() block to multi-line and with curly braces
- "imported" SPL classes to have unified code style
- always initialize your variables ... :-/
- added some empty lines/spaces for better readability

Signed-off-by: Roland Häder <roland@mxchange.org>
 2019-02-19 01:56:41 +01:00
rabuzarus 3ba7907b57 forumdirectory: type is array 2019-02-18 13:27:26 +01:00
rabuzarus 2b7c331afb forumdirectory: some polishing 2019-02-18 13:03:21 +01:00
rabuzarus 85f0508494 own function for processing data of directory entries 2019-02-18 03:00:10 +01:00
Michael 061d959e7f Code cleanup 2019-02-17 18:55:17 +00:00
Michael f6e8246e75 Ensure that "strtotime" returns the correct timestamp 2019-02-12 06:42:45 +00:00
Hypolite Petovan d6a82c6c2d
Merge pull request #6638 from Ixiter/develop-markdown-anchors 
ACL network - fixed preselected acl items
 2019-02-11 07:23:32 -05:00
Peter Liebetrau 3dede5dbd2 ACL network - fixed preselected acl items 2019-02-11 10:00:42 +01:00
Tobias Diekershoff 3ab7940b8e
Merge pull request #6622 from annando/community-speed 
Improve speed on local community page
 2019-02-10 08:06:37 +01:00
Michael 5edc498d41 Improve speed on local community page 2019-02-10 06:37:31 +00:00
Michael 81ef96fd16 Fix for possible notice "Undefined offset: 0" 2019-02-10 06:04:11 +00:00
Hypolite Petovan b2c2971551
Merge pull request #6619 from annando/worker-again 
Furtner improval of the worker speed
 2019-02-09 19:50:35 -05:00
Michael Vogel c7308d98fa
Merge pull request #6614 from MrPetovan/task/6552-add-explicit-mentions 
Add explicit mentions to ActivityPub/Diaspora comments
 2019-02-10 00:52:40 +01:00
Michael 171cfe8f44 Furtner improval of the worker speed 2019-02-09 23:10:15 +00:00
Hypolite Petovan 6577b1abb0 Add alias field to mod/crepair 
- Replace deprecated q() call by DBA::update
 2019-02-08 22:38:23 -05:00
Hypolite Petovan 066ad8c01b Add PortableContact constants 
- Fix typo in mod/admin
- Replace deprecated Logger::log calls
 2019-02-08 08:38:13 -05:00
Hypolite Petovan 38ac615ba0
Merge pull request #6577 from rabuzarus/20190129_-_jot_atachment_preview 
Attachement live preview
 2019-02-07 08:43:49 -05:00
Hypolite Petovan 01b7a3976f
Merge pull request #6593 from tobiasd/20190206-can 
Storage Backend: wording of admin panel help
 2019-02-06 11:18:53 -05:00
Tobias Diekershoff a675bd5fa4 clarification 2019-02-06 17:15:14 +01:00
Hypolite Petovan a0b14a46cb
Merge pull request #6581 from nupplaphil/config_refact 
Config Refactoring
 2019-02-06 09:57:41 -05:00
Tobias Diekershoff 9f7fdb1bff Storage Backend: wording of admin panel help 2019-02-06 07:35:57 +01:00
Philipp Holzer 40d8b04795
using Config::get (automatically use the right cache) 2019-02-05 23:09:57 +01:00
Philipp Holzer 87acace660
removing code for now 2019-02-05 23:06:28 +01:00
Tobias Diekershoff b654784396 File storage options, naming of the default option and EN docs 2019-02-05 16:30:46 +01:00
Hypolite Petovan 3c62a7206e Improve Markdown::convert panel display in mod/babel 2019-02-04 21:46:34 -05:00
Philipp Holzer 1e0e1674f2
4) Adding Factories to other entrypoints 2019-02-03 22:46:50 +01:00
Philipp Holzer 4af0119b73
3) Introducing ConfigFactory 2019-02-03 22:22:04 +01:00
Philipp Holzer be6b229534
1) Refactor App->config[] into Core\Config 2019-02-03 18:54:25 +01:00
rabuzarus ba03ec857a attachment preview: some small corrections 2019-02-03 16:26:13 +01:00
rabuzarus a6322b1c4e attachment preview: some backend work in the item module: 
- convert attachment to bbcode and
- add the attachment bbcode to the item body
 2019-02-01 23:42:36 +01:00
rabuzarus 07d1932efc attachment preview: frontend work (works with frio) 2019-02-01 19:18:08 +01:00
Hypolite Petovan f0ec729466 Remove mod/profile.php 2019-01-30 08:07:31 -05:00
Hypolite Petovan 0615c8438a Add new Module\Profile class 
- Update reference to legacy module function profile_content
 2019-01-30 08:07:20 -05:00
Tobias Diekershoff cb72a5fd3b look in the config directory for the file 2019-01-30 10:40:28 +01:00
Tobias Diekershoff b26d09d62b warn in admin panel when legacy config is used 2019-01-30 07:09:47 +01:00
Hypolite Petovan bd031d0b87 Add result window for item tags in mod/babel 2019-01-29 20:39:38 -05:00
Hypolite Petovan e6dccc42e4 [frio] Fix help TOC display 2019-01-29 08:51:02 -05:00
Hypolite Petovan 0c12d8af5f Rename conflicted variable $info in admin settings 2019-01-28 21:45:43 -05:00
Michael 5ded967129 Fix database error 2019-01-27 19:54:08 +00:00
Aditoo17 0564e710f0
Replace help/guide with help/Quick-Start-guide 2019-01-26 10:51:20 +01:00
Hypolite Petovan bfc0729752 Use new log levels in admin log settings page 2019-01-23 09:07:01 -05:00
Hypolite Petovan 724c4fb94d Fix output of /friendica/json for invite only and approval registration policy 2019-01-22 22:24:46 -05:00
Hypolite Petovan a1b773e149 Cleanup register artifacts 
- Remove mod/register
- Remove REGISTER_* constants
 2019-01-22 22:24:46 -05:00
Hypolite Petovan cef6757c92 Replace REGISTER_* constants by Module\Register::* ones 2019-01-22 22:24:15 -05:00
Michael Vogel 73a81290ff
Merge pull request #6487 from MrPetovan/bug/critical-fixes-after-develop-rebase 
Critical fixes after develop rebase
 2019-01-22 15:45:33 +01:00
Hypolite Petovan 0cc1a07cfa Fix default value of contact parameter of OStatus::import in mod/salmon 2019-01-22 08:53:53 -05:00
Tobias Diekershoff 169e9b0fc5 add comment about the PATH 2019-01-22 13:44:49 +01:00
Tobias Diekershoff 31fedf359d restore THEMEPATH variable in mod/view 2019-01-22 10:36:42 +01:00
Hypolite Petovan b161bd1dfa Improve get_responses() prototype 2019-01-21 11:37:05 -05:00
Hypolite Petovan aa0d464264 Revert unwarranted selectFirstForUser change in mod/display 2019-01-21 11:12:53 -05:00
Hypolite Petovan 182bffcc6b Fix wrong git-fu in mod/directory 2019-01-21 11:12:51 -05:00
Hypolite Petovan 57ab858486 Fix calls to DBA::select missing parameters 2019-01-21 11:12:50 -05:00
Hypolite Petovan abe60f0f9a Fix call to Contact::content in mod/update_contact 2019-01-21 11:12:49 -05:00
Hypolite Petovan e95ad45de5 Fix logic in mod/hovercard 2019-01-21 11:12:49 -05:00
Hypolite Petovan 9f75adf015 Fix item retrieval logic in mod/display 2019-01-21 11:12:49 -05:00
Hypolite Petovan 8a5ef2b6f4 Replace deprecated calls to q() in mod/fsuggest and mod/photos 2019-01-21 11:12:48 -05:00
Hypolite Petovan 7f2dc40601 Fix potential bugs without expected behavior change 
- Fix uninitialized variables
- Fix potentially not set variables
- Fix wrong parameter default value
- Fix method scope
- Fix missing return value
 2019-01-21 11:04:19 -05:00
Hypolite Petovan 45ada943b4 Update missing namespace uses in mod/ 
- Update missing constant moves in mod/
 2019-01-21 10:56:28 -05:00
Hypolite Petovan 3d839bb176 Move Contact::ACCOUNT_TYPE_* constants to User::ACCOUNT_TYPE_* 
- Keep Contact::TYPE_* constants for comparison with contact.contact-type
 2019-01-21 10:56:27 -05:00
Hypolite Petovan ad9c67663d Move Contact::Page_* constants to User::PAGE_FLAGS_* 2019-01-21 10:55:37 -05:00
Hypolite Petovan dbc6eb5422 Remove unused code in mod/ 
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
 2019-01-21 10:53:32 -05:00
Hypolite Petovan 0c4f8277e6 Update namespace in mod/view 2019-01-21 10:45:37 -05:00
Hypolite Petovan c5cb976b62 Update PHPDoc in include/ 2019-01-21 10:44:46 -05:00
Hypolite Petovan 14e4ab544a Update namespace use calls in mod/ 2019-01-21 10:44:21 -05:00