Michael
7b7132971a
Raw content is now stored with announce messages as well
2020-03-04 06:04:27 +00:00
Michael
79986c1fe5
Spaces removed
2020-03-03 22:57:29 +00:00
Michael
8410c5e283
The direction field needs to be removed
2020-03-03 22:43:19 +00:00
Michael
986877b1cf
Restore previous state
2020-03-03 22:22:59 +00:00
Michael
e38640da76
The original content of the post hadn't always been stored
2020-03-03 21:58:03 +00:00
Michael
d63e903d9f
Changed template for direction
2020-03-03 21:29:51 +00:00
Hypolite Petovan
86a6268aac
Add guid context to item deletion logging
2020-03-03 12:01:03 -05:00
Michael
e3d3dc50e5
Store the direction only when there is content to store
2020-03-03 08:04:14 +00:00
Michael
af6db65961
Store the push/pull direction in the conversation table
2020-03-03 08:01:04 +00:00
Michael
6f0d40c6c0
Merge remote-tracking branch 'upstream/develop' into push-pull
2020-03-03 06:55:13 +00:00
Hypolite Petovan
6ae5f705b6
Rename Item::delete* methods to Item::markForDeletion*
2020-03-03 01:48:29 -05:00
Hypolite Petovan
dd613cda45
Merge pull request #8357 from annando/private
...
Support unlisted public posts
2020-03-03 01:19:07 -05:00
Michael
a19151fa6a
Improved description, support for "unlisted" via DFRN as well.
2020-03-02 22:35:25 +00:00
Philipp
8770a2089e
Merge pull request #8354 from MrPetovan/bug/7134-local-post-deleted
...
Add debug for item deletion
2020-03-02 17:23:35 +01:00
Michael
72c198990e
Merge remote-tracking branch 'upstream/develop' into private
2020-03-02 15:05:00 +00:00
Michael
d3c6f6de2a
New query for community page
2020-03-02 14:59:16 +00:00
Hypolite Petovan
e008811514
Merge pull request #8350 from nupplaphil/bug/8342_not_link
...
Add Login form in case of notification links
2020-03-02 09:31:54 -05:00
Hypolite Petovan
25dceccf77
Add debug for item deletion
2020-03-02 09:30:34 -05:00
Michael
ca1b92bb34
Support unlisted public posts
2020-03-02 07:57:23 +00:00
nupplaPhil
55a5e43715
Add UID as parameter for notify repository call
2020-03-01 22:24:53 +01:00
Michael Vogel
25cc745d70
Merge pull request #8356 from MrPetovan/bug/notices
...
Add check for semi-colon existence in theme file comment lines
2020-03-01 20:51:02 +01:00
Hypolite Petovan
39a87b1f54
Add check for semi-colon existence in theme file comment lines
...
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-592946450
2020-03-01 14:19:46 -05:00
Hypolite Petovan
ad2b9198a4
Remove last on/off data occurrences in additional features
...
- Address https://github.com/friendica/friendica/issues/7999#issuecomment-589808923
2020-03-01 14:15:08 -05:00
nupplaPhil
c11cfd5e48
Rename notice message.
2020-03-01 15:38:23 +01:00
nupplaPhil
c751352d60
Add Login form in case of notification links
2020-03-01 13:47:02 +01:00
Hypolite Petovan
dd999164c6
Do not cache Contact::getDetailsByURL result if it doesn't come from the DB
...
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-592169621
2020-02-29 11:41:33 -05:00
nupplaPhil
811f075aa1
Rename method name
2020-02-29 17:10:34 +01:00
nupplaPhil
ed422be734
Improve start/count parameter
2020-02-29 17:10:33 +01:00
nupplaPhil
d950a3241b
Add basic search
2020-02-29 17:10:32 +01:00
nupplaPhil
3a317c5c0d
More list sub commands
2020-02-29 17:10:32 +01:00
nupplaPhil
2adc6a0974
Add list command
2020-02-29 17:10:31 +01:00
nupplaPhil
ecf7f40704
Admin page improvements
2020-02-29 17:10:31 +01:00
nupplaPhil
0fade7fc0a
Fix Admin page
2020-02-29 17:10:30 +01:00
nupplaPhil
4f2bea5cb1
Move "regmod" functionality into Admin Users page
2020-02-29 17:10:29 +01:00
nupplaPhil
bb47624bf2
Add "User::remove()" to console command
2020-02-29 17:10:29 +01:00
nupplaPhil
0c3f8b124b
Add "User::block()" to console command
2020-02-29 17:10:28 +01:00
nupplaPhil
b4f6e8fda1
Move "User::deny()" to own method and update usages
2020-02-29 17:10:28 +01:00
nupplaPhil
6aee153bbd
Move "User::allow()" to own method and update usages
2020-02-29 17:10:27 +01:00
nupplaPhil
f3f764bc39
Add new possibility to add a user per console
2020-02-29 17:10:27 +01:00
nupplaPhil
4d436c10df
Move "NewPassword" to a common "user" console command
2020-02-29 17:10:26 +01:00
Philipp
b2198c7510
Merge pull request #8345 from annando/store-raw
...
Store the raw data in a different way
2020-02-29 16:20:48 +01:00
Michael
1743682153
We don't need to pass the protocol that way
2020-02-28 09:46:53 +00:00
Michael
a9896ecdb1
Store the conversation data as well
2020-02-28 09:42:04 +00:00
Michael
bcb3a81988
Store the protocol as well
2020-02-28 09:25:41 +00:00
Michael
26cffd379a
Store the raw data in a different way
2020-02-28 09:21:40 +00:00
Philipp
79803a6546
Merge pull request #8344 from MrPetovan/bug/8339-remote-follow-local-profile
...
Only show remote follow button for local profiles
2020-02-28 07:36:31 +01:00
Hypolite Petovan
c0f2ef4ab0
Only show remote follow button for local profiles
2020-02-27 22:14:00 -05:00
Hypolite Petovan
b39872578d
Replace Diaspora mentions before the parsing to HTML in Text\Markdown
2020-02-27 21:47:39 -05:00
Michael
acd99b9010
Push/Pull indicator
2020-02-27 05:01:43 +00:00
Philipp
b0690077aa
Merge pull request #8329 from MrPetovan/bug/notices
...
Remove unused conversation response code
2020-02-25 21:45:13 +01:00
Michael Vogel
cdc39b0f72
Merge pull request #8333 from MrPetovan/bug/8280-about-conversion-export
...
Add about field conversion to HTML in Protocol\ActivityPub\Transmitter
2020-02-25 20:36:11 +01:00
Hypolite Petovan
064cc227c0
Remove simple_html parameter from about field conversion in Protocol\ActivityPub\Transmitter
2020-02-25 07:41:26 -05:00
Michael Vogel
fccecf92cd
Merge pull request #8337 from MrPetovan/task/8323-protect-target-blank
...
Add rel="noopener noreferrer" to all target="_blank" links
2020-02-25 05:50:33 +01:00
Hypolite Petovan
b100b9600e
Add rel="noopener noreferrer" to all target="_blank" links
...
See https://mathiasbynens.github.io/rel-noopener/
2020-02-24 20:07:34 -05:00
Hypolite Petovan
0f85f5d167
Convert outgoing profile description to Markdown in Protocol\Diaspora
2020-02-24 07:59:53 -05:00
Hypolite Petovan
c147446c93
Add about field conversion to HTML in Protocol\ActivityPub\Transmitter
2020-02-23 20:36:04 -05:00
Hypolite Petovan
bfea5d42ad
Simplify about field conversion to plaintext in Protocol\Diaspora
2020-02-23 20:35:36 -05:00
Hypolite Petovan
e94911620a
Expand system.no_auto_update to community, profile statuses and contact conversations pages
...
- Update setting name and description
2020-02-23 19:38:24 -05:00
Andy
699b567d97
modified: src/Module/Admin/Users.php
2020-02-23 03:31:59 +00:00
Hypolite Petovan
452d7e6404
Remove unused conversation response code
...
- Remove get_responses()
- Remove get_response_button_text()
- Remove title key from $conv_responses array
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-589263329
2020-02-22 20:41:12 -05:00
Hypolite Petovan
18a5cc6916
Test for the existence of the precise parsed url part in BoundariesPager
...
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-587138376
2020-02-22 20:19:42 -05:00
Michael
9cbea34fa4
Clean the profile URL when follow
2020-02-22 12:29:33 +00:00
Michael
1b87a97a81
Remove "hidewall" check from ACL
2020-02-22 08:54:28 +00:00
Michael
d03fb89494
Replace "hidewall" with "net-publish" / other "hidewall" stuff
2020-02-20 17:24:41 +00:00
Hypolite Petovan
637e38e535
User hide_dislike user setting to hide dislike button and conversation responses
2020-02-20 05:37:07 -05:00
Hypolite Petovan
96ba2ac00d
Add new hide dislike user setting
2020-02-20 05:37:07 -05:00
Hypolite Petovan
1a8110234f
Move /settings/display module to src/
2020-02-20 05:37:06 -05:00
Michael Vogel
b6b567fc97
Merge pull request #8315 from MrPetovan/task/8310-improve-manifest
...
Update manifest output with config/theme info
2020-02-20 09:34:36 +01:00
Michael
7ee9aad6ca
Some more unneeded settings removed
2020-02-19 19:31:55 +00:00
Hypolite Petovan
33c7b62326
Move manifest JSON from template to array
2020-02-19 13:29:55 -05:00
Hypolite Petovan
858b63656e
Merge pull request #8306 from annando/contact-unfollow-delete
...
Don't show "delete contact" when there is a follow or unfollow option
2020-02-19 11:44:49 -05:00
Hypolite Petovan
930d395d7b
Update manifest output with config/theme info
2020-02-19 10:29:13 -05:00
Hypolite Petovan
b9325251e8
Add Theme::getBackgroundColor and Theme::getThemeColor methods
2020-02-19 10:28:57 -05:00
Michael
c57246450f
"Delegations" is renamed to "Accounts"
2020-02-19 07:09:29 +00:00
Hypolite Petovan
61cc047611
Merge pull request #8309 from annando/remote-comment
...
Remotely load posts to comment on them on the own page
2020-02-18 13:29:11 -05:00
Michael
efddd248f7
"remote_follow" is now "remote_comment"
2020-02-18 17:31:02 +00:00
Michael
d64bb0dd8f
Remotely load posts to comment on them on the own page
2020-02-18 06:57:38 +00:00
Steffen K9
3ec23a4c70
Remove 'this' from 'View this profile'
2020-02-17 23:42:35 +01:00
Michael
f8670b6268
Don't show "delete contact" when there is a follow or unfollow option
2020-02-17 22:25:12 +00:00
Philipp
09961a07e4
Merge pull request #8297 from MrPetovan/task/8285-api-events
...
[API] Add new api/friendica/events endpoint
2020-02-16 21:07:44 +01:00
Philipp
da124af6ed
Merge pull request #8293 from MrPetovan/task/5562-community-pagination
...
Improve community pagination
2020-02-16 19:38:49 +01:00
Hypolite Petovan
e0d03615bc
Add node-wide default items per page config
2020-02-16 13:04:26 -05:00
Hypolite Petovan
efbafce2d5
Use namespace alias in Module\Update\Community
2020-02-16 12:50:45 -05:00
Hypolite Petovan
d78f66cd09
Replace local_user() by Session::isAuthenticated() where appropriate
2020-02-16 12:50:44 -05:00
Hypolite Petovan
561472b975
Add L10n parameter to Pager classes
2020-02-16 12:50:39 -05:00
Hypolite Petovan
d3b3f716f8
[API] Add new endpoint api/friendica/events
2020-02-16 12:07:39 -05:00
Michael
cceb497bd5
Avoid a fatal error
2020-02-16 15:45:26 +00:00
Michael
ee6cceba30
Clarify the effect of "net-publish"
2020-02-16 15:39:44 +00:00
Michael
3bd1f3a836
No more gender
2020-02-16 10:55:18 +00:00
Hypolite Petovan
682fb7e4e2
Move community module to src/
...
- Use boundaries pagination instead of number pages
- Trim down community update module output
- Part of https://github.com/friendica/friendica/issues/4090
2020-02-16 04:41:22 -05:00
Hypolite Petovan
5d169a4098
Add System::htmlUpdateExit() method to refactor update modules
2020-02-16 04:32:56 -05:00
Hypolite Petovan
e89e606b88
Add new BoundariesPager
2020-02-16 03:23:27 -05:00
Hypolite Petovan
2b4317d472
Remove stripping search term in Pager
...
- Address https://github.com/friendica/friendica/issues/8216
2020-02-16 03:23:11 -05:00
Hypolite Petovan
0b0309ce8f
Remove pager parameter from conversation()
...
- Add getUrlParameter() Javascript function to determine current page
2020-02-13 23:40:00 -05:00
Hypolite Petovan
2a7de4213f
Correctly initialize post actions button template variable
...
- Address https://github.com/friendica/friendica/issues/7999#issuecomment-586020764
2020-02-13 20:42:15 -05:00
Hypolite Petovan
95b09aaec4
[frio] Add loading animation on comment form submit
2020-02-11 23:45:47 -05:00
Michael
8969af04f9
Duplicated "hide-friends" setting removed
2020-02-10 23:11:28 +00:00
Michael Vogel
e80d68ba53
Merge pull request #8261 from MrPetovan/task/8251-use-about-for-pdesc
...
Use profile.about for profile description
2020-02-10 23:36:59 +01:00
Michael Vogel
01640a7045
Merge pull request #8272 from MrPetovan/bug/8254-regex-url-img
...
Increase specificity of [url][img] capture regex in BBCode::getAttachedData
2020-02-10 05:32:43 +01:00
Hypolite Petovan
d2ca5ccd35
Increase specificity of [url][img] capture regex in BBCode::getAttachedData
...
- Prevents it from over capturing when there's a [url] tag before the image
2020-02-09 22:19:21 -05:00
Hypolite Petovan
097620b627
Merge pull request #8230 from AlfredSK/AlfredSK-statistics-query
...
Changed statistics query for nodeinfo
2020-02-09 17:54:22 -05:00
Hypolite Petovan
2ec3a97393
Merge pull request #8263 from annando/remote-follow
...
New page for remote follow requests
2020-02-09 17:53:13 -05:00
Michael Vogel
5ad3a40647
Update src/Module/RemoteFollow.php
...
Co-Authored-By: Philipp <admin+Github@philipp.info>
2020-02-09 23:12:00 +01:00
Michael
e628d2726b
Removed unneeded stuff
2020-02-09 22:08:59 +00:00
nupplaPhil
217d099181
Fix CurlResult copy&pate error
2020-02-09 22:48:04 +01:00
Michael
2eebeeaa32
New page for remote follow requests
2020-02-09 17:04:35 +00:00
nupplaPhil
7d714319c8
Add license info at Friendica PHP files
2020-02-09 16:34:23 +01:00
nupplaPhil
85dc9bb96b
Add license info at Friendica PHP files
2020-02-09 16:18:46 +01:00
nupplaPhil
23c64b9a11
Add license info at Friendica classes
2020-02-09 15:45:36 +01:00
Hypolite Petovan
a42104ce43
Use profile.about instead of profile.pdesc for profile description
2020-02-09 02:36:19 -05:00
Hypolite Petovan
5552f5ee72
Accept empty values for profile birthday
2020-02-09 02:17:48 -05:00
nupplaPhil
9eca2c98ed
Add license to src\App namespace
2020-02-08 20:42:47 +01:00
Hypolite Petovan
1a3807d598
Merge pull request #8249 from annando/a11y-4
...
Useless links removed / Item menu is moved to the item actions bar
2020-02-07 06:55:20 -05:00
Michael
6e02105d88
Useless links removed / Item menu is moved to the item actions bar
2020-02-06 22:06:24 +00:00
Hypolite Petovan
557ece7d5a
Remove unused translated yes/no labels in converted checkbox field definitions
2020-02-06 10:25:36 -05:00
Hypolite Petovan
40db6baa6b
Rename hide friends checkbox field variable
2020-02-05 21:37:58 -05:00
Hypolite Petovan
a7a38da62d
Remove yesno option from Storage backend
2020-02-05 21:37:32 -05:00
Michael
4f362f6693
Asynchronously add contacts to avoid timeout problems
2020-02-06 00:00:00 +00:00
Hypolite Petovan
6347578978
Merge pull request #8239 from nupplaphil/task/move_enotify_parts
...
Move Notify "type" and "otype" into own enum classes
2020-02-05 16:56:54 -05:00
Philipp
b6764468e0
Merge pull request #8241 from annando/notice
...
Remove a notice about a missing variable
2020-02-05 22:41:54 +01:00
Michael
5bbe02dcae
Remove a notice about a missing variable
2020-02-05 21:40:35 +00:00
Hypolite Petovan
1595cf413d
Merge pull request #8240 from annando/a11y-3
...
Accessibility again: Notifications are now accessible
2020-02-05 16:22:26 -05:00
Michael
ace3c52c8e
Accessibility again: Notifications are now accessible
2020-02-05 21:06:03 +00:00
nupplaPhil
511556085a
Move Notify::TYPE_SYSTEM
2020-02-05 21:41:07 +01:00
nupplaPhil
c6915dc672
Move Notify::TYPE_SHARE
2020-02-05 21:41:06 +01:00
nupplaPhil
a78e19ea76
Move Notify::TYPE_POKE
2020-02-05 21:41:05 +01:00
nupplaPhil
bee110dc0b
Move Notify::TYPE_TAGSHARE
2020-02-05 21:41:05 +01:00
nupplaPhil
51260f234f
Move Notify::TYPE_TAGSELF
2020-02-05 21:41:04 +01:00
nupplaPhil
88dc3efdc9
Move Notify::TYPE_SUGGEST
2020-02-05 21:41:03 +01:00
nupplaPhil
9435cc4b88
Move Notify::TYPE_MAIL
2020-02-05 21:41:02 +01:00
nupplaPhil
e6fb044e60
Move Notify::TYPE_COMMENT
2020-02-05 21:41:02 +01:00
nupplaPhil
b86ad37001
Move Notify::TYPE_WALL
2020-02-05 21:41:01 +01:00
nupplaPhil
6e45514e2c
Move Notify::TYPE_CONFIRM
2020-02-05 21:41:00 +01:00
nupplaPhil
cfd50f9abb
Move Notify::TYPE_INTRO
2020-02-05 21:41:00 +01:00
nupplaPhil
97b6f6b3b3
Move OTYPE constants to own enum class
2020-02-05 21:40:59 +01:00
Hypolite Petovan
e42b843505
Merge pull request #8232 from nupplaphil/task/notify_email_builder
...
Introduce NotifyEmailBuilder
2020-02-05 13:00:14 -05:00
Hypolite Petovan
16c2705016
Merge pull request #8237 from annando/a11y-2
...
Accessibility: Improve navigation and contact approval
2020-02-05 12:11:53 -05:00
Michael
0b66970ec9
Acessibility: Improve navigation and contact approval
2020-02-05 16:14:04 +00:00
nupplaPhil
ea99ab22a9
Fix content not allowed flag ...
2020-02-04 21:38:59 +01:00
nupplaPhil
8815ee1346
Remove Notify reference
2020-02-04 21:28:27 +01:00
nupplaPhil
13c19fa9da
Add Logger
2020-02-04 21:14:40 +01:00
nupplaPhil
cb08912926
split mailbuilder types
2020-02-04 21:14:39 +01:00
nupplaPhil
34dce9fd76
Introduce NotifyEmailBuilder
2020-02-04 21:14:39 +01:00
Hypolite Petovan
e37b1c8794
Merge pull request #8215 from nupplaphil/task/extract_email
...
Cleanup enotify & Extract System emails
2020-02-04 15:10:27 -05:00
nupplaPhil
3e898d0415
formating
2020-02-04 21:33:53 +01:00
nupplaPhil
11c831945c
Add logging
2020-02-04 21:32:18 +01:00
nupplaPhil
0b94b84dc7
simplify mail creation
2020-02-04 21:05:33 +01:00
Steffen K9
52789f3ae4
Remove join profile table
...
Remove join profile table and remove exclude forums
2020-02-04 07:13:29 +01:00
Steffen K9
9424ecc5bc
Use PHP constants for literals
2020-02-03 23:30:31 +01:00
Steffen K9
b16ca2b026
Changed statistics query for nodeinfo
...
Removed the published to directories condition. Added check for 'user has logged in at least once'. Excluded community accounts (forums) from the user count.
2020-02-03 21:49:53 +01:00
Tobias Diekershoff
38e5733b6e
Merge pull request #8227 from annando/daemon-checks
...
Daemon: Added check for empty data
2020-02-03 06:26:13 +01:00
Michael
7ddcb1e35d
Daemon: Added check for empty data
2020-02-03 00:13:09 +00:00
nupplaPhil
7fb913eb86
Add extra email banner (including setting)
2020-02-02 22:43:44 +01:00
nupplaPhil
262c94f12f
Fix indents
2020-02-02 22:43:43 +01:00
nupplaPhil
ed9756225d
improvements
2020-02-02 22:43:42 +01:00
nupplaPhil
ca67e3111c
Set sender data directly
2020-02-02 22:43:42 +01:00
nupplaPhil
97e708f2e2
Remove DI::app() dependency again
2020-02-02 22:43:41 +01:00
nupplaPhil
0b309245b1
Improve check
2020-02-02 22:43:41 +01:00
nupplaPhil
0e13428210
Move "App::getSenderEmailAddress()" to "Emailer::getSiteEmailAddress()"
2020-02-02 22:43:40 +01:00
nupplaPhil
206b53477e
Fix Lookup
2020-02-02 22:43:39 +01:00
nupplaPhil
9428466d1d
Set Sitename / site email as sender for system emails
2020-02-02 22:43:39 +01:00
nupplaPhil
abad42f7d2
fix wrong template
2020-02-02 22:43:38 +01:00
nupplaPhil
05dfff4bb4
Remove unused dependency
2020-02-02 22:43:35 +01:00
nupplaPhil
3291728059
Extract System emails from enotify
...
- Removed every SYSTEM_EMAIL occurrence in enotify
- Introduced a "SystemMailBuilder" for build system emails
- Replaced every SYSTEM_EMAIL usage in the classes with calling this builder
- Added tests for this new Builder
- Split the email templates between "base" template for email and concrete usages for different use cases
2020-02-02 22:43:35 +01:00
Hypolite Petovan
0d268d8811
Merge pull request #8224 from nupplaphil/task/force_avatar_contact
...
Force avatar update for Contact Advanced page
2020-02-02 15:33:48 -05:00
nupplaPhil
3ed3e8ff42
Force avatar update for Contact Advanced page
2020-02-02 22:19:02 +01:00
Hypolite Petovan
42775d53b2
Merge pull request #8222 from annando/ap-gnusocial
...
AP comments from GNU Social are now working
2020-02-02 15:21:23 -05:00
Michael
56816ea9d5
AP comments from GNU Social are now working
2020-02-02 19:59:14 +00:00
nupplaPhil
41ec7d8370
Replace stylesheet names
2020-02-02 20:56:31 +01:00
nupplaPhil
8632c90327
Fix crepair links
2020-02-02 20:50:53 +01:00
Hypolite Petovan
7033cdcd6b
Remove next link when there aren't any introductions in Module\Api\Mastodon\FollowRequests
2020-02-01 21:38:25 -05:00
Hypolite Petovan
24abdaf64f
Merge pull request #8214 from nupplaphil/bug/7998-fata-itemccmail
...
Fix ItemCCMail
2020-02-01 14:13:05 -05:00
nupplaPhil
3a012d6fb7
Fix ItemCCMail
2020-02-01 20:11:09 +01:00
Philipp
346da998df
Merge pull request #8212 from MrPetovan/task/release-cache-buster
...
Release Cache Buster
2020-02-01 18:45:58 +01:00
Hypolite Petovan
6eb985ca47
Merge pull request #8213 from AlfredSK/AlfredSK-fix-archives-widget
...
Fix Archives Widget on Status Page
2020-02-01 08:29:58 -05:00
Hypolite Petovan
a3028e69aa
Merge pull request #8211 from nupplaphil/task/mod_crepair
...
Move mod/crepair to src/Module/Contact/Repair
2020-02-01 08:28:29 -05:00
Steffen K9
e901468602
Fix Archives Widget on Status Page
...
Solution 'borrowed' from PR8116.
2020-02-01 14:06:35 +01:00
nupplaPhil
d9ae813b43
Improvements
2020-02-01 08:45:38 +01:00
Hypolite Petovan
42990ac0f4
Append version parameter to script and stylesheets paths in App\Page
2020-01-31 19:41:20 -05:00
Hypolite Petovan
703ad99464
Add Util\Network::appendQueryParam method
2020-01-31 19:39:15 -05:00
Hypolite Petovan
96b9619608
Merge pull request #8210 from nupplaphil/task/mod_fsuggest
...
Move mod/fsuggest to src/Module/SuggestFriend
2020-01-31 18:43:32 -05:00
nupplaPhil
048bb014d8
Move CRepair to Contact Advanced route
2020-02-01 00:37:11 +01:00
nupplaPhil
f21196df7c
improvements
2020-02-01 00:27:46 +01:00
nupplaPhil
f565d590f6
Move mod/crepair to src/Module/Contact/Repair
2020-02-01 00:20:50 +01:00
Hypolite Petovan
dad530802f
Merge pull request #8209 from nupplaphil/task/mod_worker
...
Move mod/worker to src\Module\Worker
2020-01-31 18:12:36 -05:00
nupplaPhil
d4e836855b
Remove deprecated code
2020-02-01 00:05:27 +01:00
nupplaPhil
34f4aedb87
Move mod/fsuggest to src/Module/SuggestFriends
2020-01-31 23:50:46 +01:00
Philipp
0406fe7ade
Merge pull request #8163 from MrPetovan/task/7817-custom-fields-part-3
...
New custom profile fields feature part 3: Updating the API
2020-01-31 22:39:11 +01:00
nupplaPhil
17389de261
Move mod/worker to src\Module\Worker
2020-01-31 22:38:49 +01:00
nupplaPhil
7909d9c417
Notifications cleared for a whole thread in case of one mark seen
2020-01-31 21:34:12 +01:00
nupplaPhil
0c01512c5d
Remove logging
2020-01-31 19:43:48 +01:00
nupplaPhil
9ba8735b4a
fix logger settings
2020-01-31 19:40:50 +01:00
nupplaPhil
fc370f74ea
Fix secure Mail addon
2020-01-31 19:32:17 +01:00
Hypolite Petovan
dd24b3bac0
Move api/profile/show to src/Module
...
- Update API documentation
- Update BaseApi::format to include headers by format
2020-01-29 23:31:37 -05:00
Hypolite Petovan
608e634858
Update Mastodon API with new profile field entity
2020-01-29 23:30:38 -05:00
Hypolite Petovan
07a4bb73fa
Add DDD classes for Mastodon\Field entity
2020-01-29 23:26:07 -05:00
Hypolite Petovan
5670c19d5c
Move/rename base module classes
2020-01-29 23:23:07 -05:00
Hypolite Petovan
b03796957b
Improve logging in mod/item
...
- Set legacy Logger constants as deprecated
2020-01-29 22:42:49 -05:00
nupplaPhil
f2271d1692
Fix Contact notification link
2020-01-29 22:48:16 +01:00
nupplaPhil
16e1df0b22
final keyword removed :-)
2020-01-29 22:27:55 +01:00
nupplaPhil
da2d49ba43
Fix Introduction Diaspore sendShare()
2020-01-29 22:20:59 +01:00
nupplaPhil
f6aea0d65a
Fix invalid "emailer_prepare" Hook
...
- Use IEmail instead of array data
- Introduce "composer" based library for phpmailer
2020-01-29 20:20:40 +01:00
nupplaPhil
d1b7bfda4b
Add System::jsonExit()
2020-01-28 23:36:28 +01:00
nupplaPhil
c2b8c65104
Merge "notification" routes
2020-01-28 23:21:24 +01:00
nupplaPhil
dd8d9d7c70
Fix ignore notification
2020-01-28 22:47:15 +01:00
nupplaPhil
2b433e0ea6
fix https://github.com/friendica/friendica/issues/8187
2020-01-28 22:06:59 +01:00
nupplaPhil
d23008c2f5
remove false parameter
2020-01-28 22:01:42 +01:00
nupplaPhil
5ccf41a56f
Add API test case for notification
2020-01-28 22:00:21 +01:00
nupplaPhil
582f6bd4a3
Refactor API notification usage
...
- Remove "mapFields()" from BaseModel
- Add new Notification API entity (including collection)
- Add new NotificationFactory method "getApiList()"
2020-01-28 21:28:57 +01:00
nupplaPhil
4a3544582c
Add parameter for "toArray()" method
2020-01-28 18:41:47 +01:00
nupplaPhil
8f130335a3
remove now empty array from logger
2020-01-28 18:41:47 +01:00
nupplaPhil
52a4010121
enotify: empty out fields instead of using "abort" for addons
2020-01-28 18:41:46 +01:00
nupplaPhil
443e106105
Fix missing notifications:
...
- Add namecache in enotify
- Add "unset()" in notify repository for additional field "abort"
- Add possibility for additional, non-saved fields in model
2020-01-28 18:41:45 +01:00
Philipp
977248f510
Merge pull request #8191 from MrPetovan/task/7967-mastodon-api-custom_emojis
...
Add custom emojis Mastodon API endpoint
2020-01-28 17:12:00 +01:00
Hypolite Petovan
a2fb8cc035
Fix wrong variable name in Module\NoScrape
...
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-579292541
2020-01-28 10:33:19 -05:00
Hypolite Petovan
bd910342df
Add custom emojis Mastodon API endpoint
2020-01-28 08:14:48 -05:00
Philipp
353dddaf15
Merge pull request #8190 from MrPetovan/task/profile-tidings
...
Deprecated profile fields cleanup
2020-01-28 13:41:55 +01:00
Hypolite Petovan
1ac9107e5f
Move Mastodon API factories to Factory\Api\Mastodon
2020-01-28 07:33:55 -05:00
Hypolite Petovan
7b0ec6252f
Remove uses of the rest of deprecated profile fields
2020-01-27 23:06:30 -05:00
Hypolite Petovan
e69497454b
Remove uses of profile.marital
2020-01-27 23:01:25 -05:00
Hypolite Petovan
8e2910976f
Remove usage of profile.gender
2020-01-27 23:00:18 -05:00
Hypolite Petovan
a7dd0173a7
Remove obsolete profile_id parameter in Model\Profile::load
2020-01-27 22:01:12 -05:00
Hypolite Petovan
65cb77b6a0
Fix wrong use of DPA::p return value in Module\NoScrape
...
- Address https://github.com/friendica/friendica/issues/7998#issuecomment-579036775
2020-01-27 21:57:07 -05:00
Hypolite Petovan
75a2190af5
Move Module\Base\Api to Module\BaseApi
2020-01-27 21:18:42 -05:00
Hypolite Petovan
0de8e4db08
Move Mastodon API entities to src/Object
2020-01-27 20:01:32 -05:00
Hypolite Petovan
a607656607
Replace profile tab GET parameter by route
2020-01-27 19:21:18 -05:00
nupplaPhil
c4d309f801
Fix NoScrape SQL
2020-01-27 23:28:38 +01:00
Hypolite Petovan
589b7e718d
Merge pull request #8178 from nupplaphil/task/mod_noscrape
...
Move mod/noscrape to Module\Noscrape
2020-01-26 17:14:26 -05:00
nupplaPhil
7db4621eef
Adapt json error
2020-01-27 00:05:45 +01:00
nupplaPhil
4762476c89
Use parameters
2020-01-26 23:53:49 +01:00
nupplaPhil
4260b94fec
Move mod/noscrape to Module\Noscrape
2020-01-26 23:43:47 +01:00
Hypolite Petovan
df61be84fc
Merge pull request #8176 from nupplaphil/task/split_emails
...
Prepare Model\Notify for include/enotify.php (Part 3)
2020-01-26 17:02:14 -05:00
nupplaPhil
6350b210a6
Renaming - part 2 :-)
2020-01-27 00:01:17 +01:00
nupplaPhil
765a0d8892
Some Renames:
...
- EMail => EMail
- toEmail => toAddress
- fromEmail => fromAddress
2020-01-26 23:47:16 +01:00
nupplaPhil
ac1a20e5fd
Fix Introductions tab
2020-01-26 21:39:50 +01:00
nupplaPhil
f6878b5bcf
fix return type
2020-01-26 21:35:05 +01:00
nupplaPhil
4efba4d0cf
fix boolean field
2020-01-26 21:35:04 +01:00
nupplaPhil
2b8f067715
Introduce interface for emailing and create email classes
2020-01-26 21:35:04 +01:00
nupplaPhil
915abe8a33
Add explicit parameters to Sender::send() method signature
2020-01-26 21:35:03 +01:00
nupplaPhil
ea9d3b7438
Make EMailer util dynamic
2020-01-26 21:35:03 +01:00
Philipp
9269221825
Merge pull request #8175 from MrPetovan/task/revert-profile-default-tab
...
Revert profile base URL behavior
2020-01-26 20:33:27 +01:00
Hypolite Petovan
e5ab4f1889
Re-enable pinned items in profile wall
2020-01-26 14:21:20 -05:00
Hypolite Petovan
46c4bfe580
Restore base profile URL behavior
...
- Add new profile-specific route
2020-01-26 14:21:20 -05:00
Hypolite Petovan
f2d917114f
Move Model\Profile::getTabs to new Module\BaseProfile class
2020-01-26 14:21:18 -05:00
Hypolite Petovan
c42dd168c4
Merge pull request #8170 from nupplaphil/task/repo_notification
...
Prepare Model\Notify for include/enotify.php (Part 2)
2020-01-26 14:09:28 -05:00
nupplaPhil
0840938dff
Rename classes
...
- Repository/Model Notification => Notify
- Factory/Object Notification => Notification
2020-01-26 20:30:24 +01:00
nupplaPhil
b85511b00d
Improvements:
...
- Fix API-select
- Introduce OTYPE-constants
- Rename `IntroductionFactory` methods
2020-01-26 14:33:10 +01:00
Hypolite Petovan
602a57577d
Remove duplicate call to Profile::getTabs in Module\Profile\Index
...
- Address https://github.com/friendica/friendica/issues/8167
2020-01-25 16:27:43 -05:00
Hypolite Petovan
5c05d28a8e
Increase argument counter after route change in Module\Profile\Status
...
- Address https://github.com/friendica/friendica/pull/8156#issuecomment-578302294
2020-01-25 16:27:43 -05:00
nupplaPhil
74f3a2f90c
Fix API result, add PHPDoc and cleanup object construction
...
Fix missing getters
fix data array
fix missing "$" for template-variables
Remove lazy-loaded parent notification instance (for now..)
2020-01-25 21:15:01 +01:00
nupplaPhil
4c5856da2b
update PHPDoc
2020-01-25 19:58:27 +01:00
nupplaPhil
0850fb88dd
ReWork Notification Model/Module/Object/Repository/Factory
...
- Introduce Repository for interaction with "notify" table
- Introduce Factory for read-only notification objects (they're just loosely based on notification the table!)
- Introduce Objects for type-safe usage at the presentation layer
- Reworked Model, which is now fully based on the notify table, including generated fields (cache, ..)
2020-01-25 19:58:22 +01:00
Philipp
09de4a5b47
Merge pull request #8156 from MrPetovan/task/7817-custom-fields-part-2
...
New custom profile fields feature part 2: Feature switcheroo
2020-01-24 20:17:52 +01:00
Hypolite Petovan
188720c3cd
Merge pull request #8155 from nupplaphil/task/move_notifications
...
Move mod/notifications to Module\Notification
2020-01-24 12:10:49 -05:00
nupplaPhil
0458b9c2df
rename notify => notification once more :-)
2020-01-24 19:08:03 +01:00
nupplaPhil
b229939c3d
rename CSS attributes notify => notification
2020-01-24 18:56:34 +01:00
nupplaPhil
b016e420fe
notify_type => str_type
...
str_notifytype => st_notification_type
2020-01-24 18:39:50 +01:00
nupplaPhil
16b1d3fc08
Notifies => Notifications
2020-01-24 18:34:29 +01:00
nupplaPhil
0f932ae723
Notify => Notification
...
Notifs => Notifications
2020-01-24 18:32:38 +01:00
Hypolite Petovan
4da90b9378
Add group membership filter widget in contact list
2020-01-23 17:49:55 -05:00
Hypolite Petovan
ed3ac36621
Refactor queries in contact module
2020-01-23 17:49:42 -05:00
Hypolite Petovan
451596f5b3
Rename migration method for clarity in Repository\ProfileField
2020-01-23 14:00:42 -05:00
Hypolite Petovan
a9695998e9
Move dependencies to constructor in Repository\ProfileField
2020-01-23 10:01:11 -05:00
Hypolite Petovan
1fc1989f93
Remove superfluous includes in profile modules
2020-01-23 10:00:48 -05:00
Hypolite Petovan
087c3cdcd8
Remove duplicated TOC loop in Module\Help
2020-01-23 09:13:31 -05:00
Hypolite Petovan
02dda8af9b
Add PUBLIC constant in Repository\Permission
2020-01-22 19:42:38 -05:00
Hypolite Petovan
e8bf74914b
Update user import/export with profile fields
...
- Account for backward compatibility when exporting: add values for profile.is-default and profile.profile-name fields
- Account for forward compatibility when importing: migrate legacy profiles to custom profile fields
2020-01-22 19:42:37 -05:00
Hypolite Petovan
18cfd8dfaa
Remove references to deprecated profile.is-default and profile.profile-name fields
2020-01-22 19:42:37 -05:00
Hypolite Petovan
d9f7556b4a
Add post-update migration routine for custom profiles
2020-01-22 19:42:36 -05:00
Hypolite Petovan
64c05f2280
Add custom fields help text
2020-01-22 19:42:36 -05:00
Hypolite Petovan
cc007f715d
Add sortability to custom profile fields form
2020-01-22 19:42:36 -05:00
Hypolite Petovan
6657cf7bb1
Rework profile setting page with custom fields
2020-01-22 19:42:35 -05:00
Hypolite Petovan
d11a0d3814
Add permission set lazy loading to Profile Field model
2020-01-22 19:42:35 -05:00
Hypolite Petovan
d475cb5028
Replace advanced profile display with custom profile fields
...
- Merge all profile/advanced.tpl theme templates into profile/index.tpl
- Remove obsolete Model\Profile::getAdvanced method
2020-01-22 19:42:34 -05:00
Hypolite Petovan
3297d5c3e6
Create new ProfileField classes
...
- Create ProfileField model class
- Remove obsolete BaseCollection->models property
2020-01-22 19:42:34 -05:00
Hypolite Petovan
62fec2f190
Remove duplicate profile_uid key in App->profile array
2020-01-22 19:42:33 -05:00
Hypolite Petovan
f6f4cbab9d
Remove multi profiles feature
...
- Remove mod/profperm
- Remove additional feature
- Remove profile visibility on contact page
- Remove profile list templates
2020-01-22 19:42:33 -05:00
Hypolite Petovan
d1be68b754
Move Module\Profile to Module\Profile\Index
...
- Move /profiles to Module\Settings\Profile\Index
2020-01-22 19:42:32 -05:00
nupplaPhil
5c4eb2b2c9
Move templates into sub-dir "notifications"
2020-01-23 00:16:34 +01:00
nupplaPhil
512b00550e
rename some variables
2020-01-22 23:37:23 +01:00
nupplaPhil
d0c153943a
Add phpdoc
2020-01-22 23:31:00 +01:00
nupplaPhil
fa6c33d3ac
Move mod/notifications to Module\Notification
2020-01-22 23:18:14 +01:00
Hypolite Petovan
3c1f174c7f
Merge pull request #8150 from nupplaphil/task/prepare_enotify
...
Prepare Model\Notify for include/enotify.php (Part 1)
2020-01-22 14:18:59 -05:00
nupplaPhil
82f37ccdaf
Revert Repo::select()/selectFirst() changes
2020-01-22 20:28:56 +01:00
SpencerDub
2091ae0776
Fix "accout" typo
2020-01-21 22:22:45 -08:00
nupplaPhil
a77c78522c
Add properties to PermissionSet Model
2020-01-22 00:22:53 +01:00
nupplaPhil
b46b72ad3b
Introduce "order" and "limit" argument instead of "param" array for BaseRepository and make Repositories more Dependency Injectable
2020-01-22 00:09:08 +01:00
nupplaPhil
26d6afd27f
Move "Notify::getTab()" to notification module since it's presentation layer logic
2020-01-22 00:03:57 +01:00
Hypolite Petovan
4f29e4c4a7
Merge pull request #8149 from annando/fix-warning
...
Fix: unknown variable
2020-01-21 14:58:32 -05:00
Michael
6b8239f63f
Fix: unknown variable
2020-01-21 19:15:38 +00:00
Philipp
ae2959c780
Merge pull request #8147 from annando/fetch-post
...
Fix for AP posts where the URL don't match
2020-01-20 23:51:07 +01:00
Michael
34b813bbfa
Fix for AP posts where the URL don't match
2020-01-20 22:30:34 +00:00
Hypolite Petovan
689c8ce0e3
Remove superfluous variable type hint in Module\Settings\Profile\Photo\Index
2020-01-20 13:28:41 -05:00
Hypolite Petovan
3ebc0371b7
Add trace for admin in exceptionpages
...
- Fix exception message not showing on raw exception page
2020-01-20 07:47:53 -05:00
Hypolite Petovan
bac5159f6f
Clarify update.php doc and mention Database\PostUpdate
2020-01-20 07:47:53 -05:00
Hypolite Petovan
db518e7ef2
Fix birthday display and setting
...
- Add new translation string
2020-01-20 07:47:10 -05:00
Hypolite Petovan
1c50bc58e4
Move Permission Set over to DDD
...
- Add Permission Set Repository, Model and Collection
- Mark static PermissionSet method as deprecated
2020-01-20 07:35:05 -05:00
Hypolite Petovan
5ab898f67f
Improve Base collection, model and repository
...
- Add collection pipeline methods
- Add save collection method
2020-01-20 07:32:49 -05:00
Hypolite Petovan
559879f41f
Enable Model lazy updating based on only the changed data
...
- Simplify update decision in Database
2020-01-20 07:32:48 -05:00
Hypolite Petovan
f0474c07ce
Add "Yourself" ACL choice and allow multiple ACL selectors on a single page
2020-01-20 07:32:48 -05:00
Hypolite Petovan
ebf60cee33
Enable meta groups in Model\Group::getIdsByContactId
...
- Don't return early if contact isn't part of any group in PermissionSet::get
2020-01-20 07:32:47 -05:00
Hypolite Petovan
353dab166e
Rename PermissionSet::fetchIDForPost to PermissionSet::getIdFromACL
...
- Allow creating/retrieving a permission set id with arbitrary parameters
- Rename ACLformatter->sanitize to ACLFormatter->sanitizeItem
- Move PermissionSet::sortPermissions to ACLformatter->sanitize
2020-01-20 07:32:47 -05:00
Hypolite Petovan
f97a358a9b
Normalize the return value type of Session::getRemoteContactID
2020-01-20 07:32:46 -05:00
Hypolite Petovan
e04b679e6a
Improve ForumManager::profileAdvanced logic
2020-01-20 07:32:46 -05:00
Hypolite Petovan
6d7f0a6fd8
Remove duplicate profile_uid key in App->profile array
2020-01-20 07:32:46 -05:00
Hypolite Petovan
9803c96db4
Move profile-related templates to sub-folder
2020-01-20 07:27:14 -05:00
Hypolite Petovan
0d1befdf2d
Move /profile_photo to Module\Settings\Profile\Photo
2020-01-20 07:27:12 -05:00
Michael
035e0c5a61
Issue 8136: Optical enhancements for delegation page
2020-01-20 05:05:20 +00:00
Hypolite Petovan
04d620fc2f
Merge pull request #8142 from nupplaphil/task/di_config
...
CleanUp Config namespace
2020-01-19 22:22:57 -05:00
nupplaPhil
ed9392469e
Remove unneeded Config namespace usages
2020-01-19 22:50:44 +01:00
nupplaPhil
f9d0e57f91
Fix tests & Router is now using Dependency Injection instead of DI Registry
2020-01-19 22:38:33 +01:00
nupplaPhil
d5a473abda
Shorten "PConfiguration" to "PConfig" again, since the Wrapper is gone
2020-01-19 22:23:44 +01:00
Michael
dcbd44ab88
Removed the rest of the @brief fields
2020-01-19 20:44:01 +00:00
nupplaPhil
cb80108957
Shorten "Configuration" to "Config" again, since the Wrapper is gone
2020-01-19 21:29:36 +01:00
nupplaPhil
21640ec5d8
Add missing Friendica\DI namespace to files (PHPStorm inspection)
2020-01-19 21:26:42 +01:00
nupplaPhil
2204016071
Delete Core\Config
2020-01-19 21:23:00 +01:00
nupplaPhil
a6a2efa18a
Move Config::delete() to DI::config()->delete()
2020-01-19 21:22:33 +01:00
nupplaPhil
3411ced833
Move Config::set() to DI::config()->set()
2020-01-19 21:21:53 +01:00
nupplaPhil
6c36fd9e01
Move Config::get() to DI::config()->get()
2020-01-19 21:21:13 +01:00
nupplaPhil
5d294e8be8
Move Config::load() to DI::config()->load()
2020-01-19 21:20:10 +01:00
Hypolite Petovan
ab8997f9db
Merge pull request #8140 from annando/mail-probe
...
Don't update mail contacts when polling
2020-01-19 15:05:00 -05:00
Michael
3bd99bccba
Don't update mail contacts when polling
2020-01-19 19:27:30 +00:00
Hypolite Petovan
1bc4b2e078
Merge pull request #8134 from nupplaphil/task/di_l10n
...
Cleanup L10n namespace
2020-01-19 11:30:19 -05:00
nupplaPhil
8138b05032
fix L10n path after move
2020-01-19 17:11:48 +01:00
nupplaPhil
174129af94
add missing namespaces/fix wrong class-names
2020-01-19 16:31:35 +01:00
nupplaPhil
3b16829484
fix forgotten use DI namespaces ...
2020-01-19 16:31:35 +01:00
nupplaPhil
5d8c625549
cleanup
2020-01-19 16:31:34 +01:00
nupplaPhil
846007d031
adapt pattern for extract command
2020-01-19 16:31:34 +01:00
nupplaPhil
d6efc90194
cleanup namespace usages for L10n
2020-01-19 16:31:33 +01:00
nupplaPhil
0e6a675cb5
cleanups
2020-01-19 16:31:33 +01:00
nupplaPhil
2838635d64
Move L10n class from L10n subdir to Core (replacing old wrapper)
2020-01-19 16:31:30 +01:00
nupplaPhil
5e188d17f9
Move L10n::getDayShort() calls to DI::l10n()->getDayShort() calls
2020-01-19 16:31:19 +01:00
nupplaPhil
d83f6335eb
Move L10n::getCurrentLang() calls to DI::l10n()->getCurrentLang() calls
2020-01-19 16:31:19 +01:00
nupplaPhil
cb4ad529f4
Move L10n::getDay() calls to DI::l10n()->getDay() calls
2020-01-19 16:31:18 +01:00
nupplaPhil
d3255afa66
Move L10n::withLang() calls to DI::l10n()->withLang() calls
2020-01-19 16:31:18 +01:00
nupplaPhil
a9a36fb302
Move L10n::tt() calls to DI::l10n()->tt() calls
2020-01-19 16:31:17 +01:00
nupplaPhil
5dfee31108
Move L10n::t() calls to DI::l10n()->t() calls
2020-01-19 16:31:16 +01:00
Hypolite Petovan
c632d4e7a2
Update deprecated passing glue string after array in implode in Content\Text\HTML
2020-01-19 10:25:18 -05:00
Michael
bb253ceeaa
AP: Create a GUID out of an URL
2020-01-19 14:33:16 +00:00
Philipp
af88c2daa3
Merge pull request #8135 from annando/brief
...
@brief is removed completely
2020-01-19 12:31:02 +01:00
Michael
845f71b7dd
Missing "*"
2020-01-19 10:10:53 +00:00
Michael
572a3f1180
And the rest of the new lines
2020-01-19 09:55:28 +00:00
Michael
cdbc94a9e1
Some more added lines
2020-01-19 09:51:37 +00:00
Michael
4e5db36177
Improved formatting
2020-01-19 09:46:31 +00:00
Michael
0a4119adaf
@brief is removed completely
2020-01-19 06:05:23 +00:00
Hypolite Petovan
0b9aec4569
Add missing use Friendica\DI statement in Util\Emailer
2020-01-18 16:28:42 -05:00
Michael
fd1f1999f0
Remove @brief in DBA.php
2020-01-18 20:33:20 +00:00
Hypolite Petovan
8536b313a1
Merge pull request #8131 from nupplaphil/task/cleanup_lock
...
CleanUp Lock namespace
2020-01-18 14:13:14 -05:00
nupplaPhil
41ff43dcdd
CleanUp Lock namespace
...
- introduce enum Lock - "Type"
- Move Lock/Lock to BaseLock
2020-01-18 20:15:46 +01:00
Hypolite Petovan
c58dc357d4
Merge pull request #8132 from annando/child-user
...
Fix: You can now register an account when you haven't done it before
2020-01-18 14:00:48 -05:00