Philipp Holzer
ec2c84a4e9
code lisibility & filter optimization
2019-03-22 22:55:48 -04:00
Philipp Holzer
4496df79ab
Replace "q" calls
2019-03-22 22:55:48 -04:00
Philipp Holzer
b2edb85588
Replace "q" calls
2019-03-22 22:55:48 -04:00
Philipp Holzer
be6057b056
refactoring
2019-03-22 22:55:47 -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
21158e7699
Syslog - Disabling
2019-03-22 22:55:46 -04:00
Philipp Holzer
d712d36814
Adding UID and Level To String mapping
2019-03-22 22:52:46 -04:00
Philipp Holzer
ae40963507
Code cleanup
2019-03-22 22:52:46 -04:00
Philipp Holzer
ec59e538fc
Adding ident
2019-03-22 22:52:46 -04:00
Philipp Holzer
9c5e0ae415
Adding SyslogLogger
2019-03-22 22:52:45 -04:00
Philipp Holzer
8e0355bec3
reduce code
2019-03-22 22:28:13 -04:00
Philipp Holzer
25a7086fc5
moving mod/apps to src/Module/Apps
2019-03-22 22:28:12 -04:00
Hypolite Petovan
385e3a09f2
Add loop to console storage move
...
- Add timestamp to output messages
2019-03-20 00:42:50 -04:00
Hypolite Petovan
8ddbeb087f
Add limit parameter to storage move query
...
- Fixes out-of-memory errors with large tables
- Add database statement closing
- Add meaningful variable names
- Remove useless DBA::isResult check
2019-03-20 00:41:57 -04:00
Hypolite Petovan
8a48ff1f95
Relax type constraint on limit parameter in Database\DBA
2019-03-20 00:33:26 -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
Hypolite Petovan
f225a6c51a
Reformat code
...
- Reformat Console\Storage
- Reformat Core\StorageManager
- Simplify logic in Worker\CronJobs
2019-03-19 22:42:05 -04:00
Michael
ea40308048
Fixing automention
2019-03-19 22:07:53 +00:00
Hypolite Petovan
d0c0f0345c
Merge pull request #6908 from annando/sig-auth
...
Enable remote authentication with HTTP Signatures
2019-03-19 08:28:13 -04:00
Michael
dbfb0b6cff
Added app class variable
2019-03-19 06:57:37 +00:00
Michael
0aab620d32
Enable remote authentication with HTTP Signatures
2019-03-19 06:44:51 +00:00
Philipp
326a7d22ba
Merge pull request #6905 from annando/ap-summary-text
...
The "summary" field seems to be interpreted as plain text only
2019-03-19 06:45:20 +01:00
Michael
2788995ab0
The "summary" field seems to be interpreted as plain text only
2019-03-18 22:38:10 +00:00
Michael
a876c20850
Use HTTP-Signature to authenticate when fetching photos.
2019-03-18 22:33:20 +00:00
Tobias Diekershoff
d32105aa8b
Merge pull request #6904 from MrPetovan/bug/6901-autolinker-fix-punctuation-domain
...
Exclude punctuation from domain in autolinker regular expression
2019-03-18 06:07:11 +01:00
Hypolite Petovan
0c738c4f8b
Exclude punctuation from domain in autolinker regular expression
2019-03-17 19:37:26 -04:00
Michael
2cdd5a4940
Fixes errors/notices
2019-03-17 22:13:17 +00:00
Philipp
2be4990952
Merge pull request #6896 from annando/fix-summary
...
Centralise the item content processing in a single function
2019-03-17 17:10:32 +01:00
Michael
f78c148013
Clarified return values
2019-03-17 15:49:21 +00:00
Michael
75ec384fc3
Added logging since this exixted before
2019-03-17 13:56:47 +00:00
Michael
cec094c5b1
Centralise the item content processing in a single function
2019-03-17 13:50:14 +00:00
Hypolite Petovan
f9e4f2a132
Merge pull request #6894 from annando/fix-summary
...
Summary has to be converted to HTML / Don't use summary when we have the source
2019-03-17 09:11:29 -04:00
Hypolite Petovan
5ed48ba425
Merge pull request #6893 from nupplaphil/issue/fixing_htconfig
...
Fixing .htconfig loading
2019-03-17 07:36:39 -04:00
Philipp Holzer
b22ff7419e
refactor naming & superfluous check
2019-03-17 09:57:34 +01:00
Michael
0104da3c93
Summary has to be converted to HTML / Don't use summary when we have the source
2019-03-17 00:06:31 +00:00
Philipp Holzer
8c6e6b5dea
Fixing .htconfig
2019-03-16 20:31:10 +01:00
Philipp Holzer
1acd5c7d22
- Adding additional legacy .htconfig information
2019-03-16 20:06:53 +01:00
Michael
ce2e98ea68
Adding a line feed looks nicer
2019-03-16 11:18:36 +00:00
Michael
14b56ce0cc
Adding the "abstract" element to the imported feed
2019-03-16 10:59:11 +00:00
Michael
dfcf1b1e6f
We now send a summary via AP. This partially fixes the problem with Mastodon and Articles
2019-03-16 08:46:33 +00:00
Michael
4ff837488f
Issue 6167: Don't publish non visible content
2019-03-15 20:31:07 +00:00
Michael
80c2c5479a
Issue 6167: Don't distribute uploaded pictures
2019-03-15 06:05:52 +00:00
Michael
a60a440c9a
Fix notice - it's "uri" not "url"
2019-03-14 21:55:18 +00:00
Hypolite Petovan
78271f0593
Merge pull request #6881 from annando/ap-forum
...
Forums now are working with AP as well
2019-03-14 17:42:49 -04:00
Michael
cd0d6cb626
Forums now are working with AP as well
2019-03-14 18:44:41 +00:00
Hypolite Petovan
ee4585ec71
Add inline spans to code block extraction in BBCode::convert
...
- Fixes autolinker replacing URLs inside of code spans
2019-03-14 09:03:31 -04:00
Hypolite Petovan
4cafe11d4d
Swap attachment conversion and autolinking in BBCode::convert
...
- Fixes a rare display bug where an attachment description ends with a text URL
2019-03-13 23:13:10 -04:00
Philipp
c8331eb068
Merge pull request #6857 from friendica/MrPetovan-patch-autolinker-domain
...
Remove new lines from domain name part of autolinker regular expression in Util\Strings
2019-03-13 07:05:52 +01:00
Tobias Diekershoff
add0b1077e
Merge pull request #6858 from nupplaphil/issue/6788-multiple_notifies
...
Avoid double updates
2019-03-12 07:24:32 +01:00
Michael
4b98200315
Added logging
2019-03-12 05:45:02 +00:00
Michael
997b98e345
Fix for falsely detected AP profile in case of timeout
2019-03-12 05:21:04 +00:00
Philipp Holzer
cf17c72fd7
Adapt Logging messages
2019-03-11 21:36:41 +01:00
Philipp Holzer
8a358d5c98
Add Logger entry
2019-03-11 21:27:36 +01:00
Philipp Holzer
9a60eab152
Skip update if already done
2019-03-11 21:21:01 +01:00
Hypolite Petovan
8f96e383a7
Remove new lines from domain name part of autolinker regular expression in Util\Strings
...
- Fixes issue where the autolinker would include the next paragraph is a pathless URL was followed by new lines.
2019-03-11 14:37:56 -04:00
Philipp
6f3359cbcd
Merge pull request #6851 from annando/fix-mentions-again
...
Fix mentions - again
2019-03-11 08:21:32 +01:00
Michael
694cf50509
Fix mentions - again
2019-03-11 06:41:48 +00:00
Hypolite Petovan
579d42a215
Fix fatal error when using Logger::devLog
...
- Error message is "Call to a member function log() on null in src/Core/Logger.php:304"
2019-03-10 22:19:12 -04:00
Philipp
7b91c26c31
Merge pull request #6849 from annando/followup-6834
...
Follow up to 6834: Don't store item when the server is blocked
2019-03-10 23:31:59 +01:00
Michael
35ff932613
Follow up to 6834: Don't store item when the server is blocked
2019-03-10 21:19:21 +00:00
Tobias Diekershoff
61fe82ad20
Merge pull request #6846 from annando/fix-mentions
...
Fix for the automatic mentioning
2019-03-10 07:03:31 +01:00
Michael
337a3bb1aa
Fix for the automatic mentioning
2019-03-10 05:41:40 +00:00
Hypolite Petovan
4d70e32829
Add new Content\Text\MarkdownParser
...
- Add autolinker to MarkdownParser->doAutoLinks()
- Set hashtag_protection and url_filter_func properties of MarkdownParser
2019-03-09 23:28:50 -05:00
Hypolite Petovan
184b51ec56
Move autolink regex in Util\Strings
2019-03-09 23:25:53 -05:00
Hypolite Petovan
ad854d5d40
Define absolute paths for various includes
...
- Fix errors running local tests in IDE
2019-03-09 23:21:19 -05:00
Hypolite Petovan
a2ec9e676e
Revert "Avoid double update runs"
2019-03-09 18:28:48 -05:00
Philipp Holzer
f7c7851c2d
replaced duplicate code with method
2019-03-09 20:50:06 +01:00
Philipp Holzer
20498d1d40
replaced duplicate code with method
2019-03-09 20:50:00 +01:00
Philipp Holzer
7047a13ffa
added phpdoc
2019-03-09 20:49:59 +01:00
Philipp Holzer
e46a7cdf80
Avoid double update runs
2019-03-09 20:49:59 +01:00
Hypolite Petovan
85609cd5e4
Fix autolinker regular expression to match test data
2019-03-09 10:20:57 -05:00
Philipp
792a0f11c0
Merge pull request #6839 from MrPetovan/bug/6829-fix-implicit-mention-regex
...
Fix implicit mention regex
2019-03-09 15:49:43 +01:00
Hypolite Petovan
d0b2ed7966
Remove test code in ActivityPub\Processor
2019-03-09 09:04:43 -05:00
Hypolite Petovan
70782b3977
Fix implicit mention detection regular expression flags in ActivityPub\Processor
2019-03-09 09:04:11 -05:00
Philipp Holzer
50b7d95b2a
Set Timezone to 'UTC' for every Logger
2019-03-09 14:28:31 +01:00
Tobias Diekershoff
af77af0446
Merge pull request #6833 from MrPetovan/bug/notices
...
Fix various notices
2019-03-09 09:12:09 +01:00
Tobias Diekershoff
c4bfc6e86e
Merge pull request #6834 from MrPetovan/bug/6819-prevent-blocked-server-relay
...
Prevent accepting relayed posts from blocked servers
2019-03-09 09:10:28 +01:00
Hypolite Petovan
379f4d18c3
Update autolinker regular expression in Text\BBCode
...
- Thanks to https://daringfireball.net/2010/07/improved_regex_for_matching_urls
2019-03-08 23:58:20 -05:00
Hypolite Petovan
704cb052ca
Add server block provision to Diaspora::postAllow
2019-03-08 22:40:08 -05:00
Hypolite Petovan
d40cbdce32
Remove unnecessary @throws tag in Util\Network
2019-03-08 22:39:08 -05:00
Hypolite Petovan
5f2a66e66c
Add check for EXIF data existence in Object/Image
...
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-467121955
2019-03-08 22:09:41 -05:00
Hypolite Petovan
6f07bfb772
Add missing fields to Register::getPending()
...
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-470882973
2019-03-08 21:57:18 -05:00
Michael
ea71a4e83a
Refetch new jobs only once per execution loop
2019-03-08 20:39:58 +00:00
Tobias Diekershoff
5df246e9af
Merge pull request #6825 from annando/empty-spawn
...
Worker: Don't spawn without jobs
2019-03-08 07:26:22 +01:00
Michael
d87abe9563
Worker: Don't spawn without jobs
2019-03-08 05:53:36 +00:00
Tobias Diekershoff
4901cf76dc
Merge pull request #6818 from MrPetovan/bug/6812-fix-delivery-namespaces
...
Fix namespace ambiguity about Model\Queue in Worker\Delivery
2019-03-07 06:08:49 +01:00
Hypolite Petovan
77a591e6e3
Fix namespace ambiguity about Model\Queue in Worker\Delivery
2019-03-06 23:17:58 -05:00
Michael
e89d56be6d
Improved contact update from probe
2019-03-07 00:13:39 +00:00
Philipp Holzer
07bd4cec65
Fixing redis cachekey
2019-03-04 21:28:36 +01:00
Philipp Holzer
d7426e697d
Fixing redis cachekey
2019-03-04 21:09:20 +01:00
Philipp Holzer
3e53dab817
Fixing redis cachekey
2019-03-04 21:00:41 +01:00
Philipp
9d0aaf3c67
Merge pull request #6807 from MrPetovan/bug/6800-fix-contactblock-relationship-direction
...
Fix relationship direction in Widget/ContactBlock
2019-03-04 15:17:21 +01:00
Hypolite Petovan
79f2b42f74
Fix relationship direction in Widget/ContactBlock
2019-03-04 08:40:53 -05:00
Philipp
a5d86fe787
Add default value for config.sitename in App::initHead
...
- Protect $this->page['title'] even more
Co-Authored-By: MrPetovan <hypolite@mrpetovan.com>
2019-03-04 07:54:51 -05:00
Hypolite Petovan
8fdf1db032
Restore module custom title display
2019-03-04 06:47:40 -05:00
Philipp
e157c89dc7
Merge pull request #6798 from annando/key-warning
...
Added warning about an empty key
2019-03-04 08:30:20 +01:00
Michael
a911baf8e5
Avoid transmitting a deletion message when we don't have a key
2019-03-04 06:52:43 +00:00
Michael
888e2ce2a9
Added forgotten "use"
2019-03-03 07:05:57 +00:00
Michael
3237dab1a4
Added warning about an empty key
2019-03-03 07:01:11 +00:00
Michael
f2560c42d1
Reduce the default maximum load for the worker to 20
2019-03-02 18:41:12 +00:00
Michael
9427d7f628
We have to fetch the data this way
2019-03-02 13:07:29 +00:00
Michael
16c2ae89e8
Sent update mails to administrators only once
2019-03-02 12:57:47 +00:00
Philipp Holzer
16ff5af221
Fix handling table name during storage move
2019-03-01 18:07:08 +01:00
Tobias Diekershoff
53952bb426
Merge pull request #6775 from annando/issue-6395
...
Issue 6395: Don't log details to avoid memory issues
2019-02-28 10:17:01 +01:00
Michael
0b2cdf5d26
Issue 6395: Don't log details to avoid memory issues
2019-02-28 09:07:24 +00:00
Hypolite Petovan
9cdae18101
Improve reshare format for Diaspora destinations
...
- Add link to original post in post time
- Update optional bottom link label
2019-02-27 21:01:47 -05:00
Hypolite Petovan
fb965f4d81
Merge pull request #6773 from nupplaphil/issue/6772-update_query_missmatch
...
Update - query missmatch
2019-02-27 15:22:42 -05:00
Philipp Holzer
739449926c
'%' is deprecated
2019-02-27 20:30:08 +01:00
Philipp Holzer
4a47425bfd
admin mail list seems wrong escaped
2019-02-27 20:17:35 +01:00
Philipp Holzer
2b53784094
Reuse existing Strings::getRandomHex function
2019-02-27 18:32:25 +01:00
Hypolite Petovan
7217d24a97
Replace isset by array_key_exists on array class constant in Model\Term
...
- Addresses https://github.com/friendica/friendica/issues/6386#issuecomment-467835406
2019-02-27 08:00:04 -05:00
Michael
c3b12b63c8
Added some description, changed logger call
2019-02-27 09:49:26 +00:00
Michael
505a34d40e
Log the time as decimal
2019-02-27 09:12:40 +00:00
Michael
78960d4bde
Removed unneeded spaces
2019-02-27 09:11:37 +00:00
Michael
5e440aa035
The cron interval is minutes - so we have to convert it into seconds
2019-02-27 08:55:25 +00:00
Michael
0ee1ea5f29
The log text is now shorter
2019-02-27 08:41:45 +00:00
Michael
11e39da6cc
And moving the block back to the old place
2019-02-27 07:08:44 +00:00
Michael
e1cc7262de
Respawing when quitting
2019-02-27 07:04:21 +00:00
Michael
528636c9f4
Using constants is nicer
2019-02-27 06:55:04 +00:00
Michael
fb371e1048
Merge remote-tracking branch 'upstream/2019.03-RC' into worker2
2019-02-27 06:41:14 +00:00
Michael
40573120b9
Enhanced logging, stopping worker after cron lifetime
2019-02-27 06:36:19 +00:00
Tobias Diekershoff
bd7aaacfb0
fixing links in photoMenu
2019-02-26 10:19:08 +01:00
Hypolite Petovan
97eb2ba053
Fix possibly undefined after index in Text\BBCode
2019-02-25 07:12:01 -05:00
Hypolite Petovan
05d8bf6b54
Fix wrong use of array_shift in Core\Worker
2019-02-25 07:11:35 -05:00
Hypolite Petovan
f597f3b378
Protect access to rel attribute in Network\Probe
2019-02-25 03:39:40 -05:00
Hypolite Petovan
3e290da8c2
Code standards: Add missing space in ActivityPub\Processor
2019-02-25 03:16:18 -05:00
Hypolite Petovan
1f6e0f168c
Add missing author contact in ActivityPub\Processor
...
- Add logging for future occurrences
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-466812104
2019-02-24 15:52:03 -05:00
Michael Vogel
4c6c5786ad
Merge pull request #6752 from MrPetovan/bug/notices
...
Fix various notices
2019-02-24 21:30:07 +01:00
Michael Vogel
69777c275b
Merge pull request #6751 from MrPetovan/bug/fatal-errors
...
Add missing use statement in Model\Term
2019-02-24 21:07:13 +01:00
Hypolite Petovan
e66768a058
Add empty entry author if contact query fails in DFRN
...
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-462722599
2019-02-24 14:00:40 -05:00
Hypolite Petovan
0888850702
Fix missing avatar key in DFRN
...
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-456839092
2019-02-24 13:40:04 -05:00
Hypolite Petovan
42c06506ce
Stop appending entry when parent is missing in OStatus
...
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-455785854
2019-02-24 13:36:37 -05:00
Hypolite Petovan
82072bae46
Add missing use statement in Model\Term
2019-02-24 13:33:11 -05:00
Hypolite Petovan
458064ddde
Merge pull request #6749 from nupplaphil/6386-php_fatal
...
Fixing appending child at DFRN without a parent id.
2019-02-24 12:55:34 -05:00
Philipp Holzer
5d13b94761
update phpdoc
2019-02-24 16:31:16 +01:00
Philipp Holzer
bf6a765beb
Fixing appending child at DFRN without a parent id.
2019-02-24 16:30:09 +01: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
5b932867c3
Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-466749280
2019-02-24 15:22:14 +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
Michael Vogel
a51c6549ad
Merge pull request #6744 from nupplaphil/task/namespace_to_class
...
Replace string namespace with *::class
2019-02-24 14:27:48 +01:00
Philipp Holzer
e48c608db0
removed silent fail of logfile permission (should get fixed with #6745 )
2019-02-24 13:57:17 +01:00
Philipp Holzer
5fc42a744e
Replace string namespaces with ::class
2019-02-24 13:40:54 +01:00
Hypolite Petovan
4e3f780621
Merge pull request #6740 from nupplaphil/issue/6503-force_update
...
Fixing force-flag for lock-release
2019-02-24 07:04:54 -05:00
Philipp Holzer
d1c7815c4e
added whitespace
2019-02-24 12:51:58 +01:00
Philipp Holzer
aae58815a8
Adjust update parameters:
...
-f|--force Force the update command (Even if the database structure matches)
-o|--override Override running or stalling updates
2019-02-24 12:24:09 +01:00
Michael
4bad2645e5
We should execute the worker job for normal situations ;-)
2019-02-24 10:52:40 +00:00
Michael
ee300a7db6
Ensure that the database update will be processed anyway
2019-02-24 10:43:29 +00:00
Philipp Holzer
7ce549c294
fixing delete
2019-02-24 10:27:56 +01:00
Philipp Holzer
9b07132b80
Fixing force-flag for lock-releasing
2019-02-24 10:08:28 +01:00
Michael Vogel
9f11476ca0
Merge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile
...
Fix "EMPTY" label in profile
2019-02-24 06:34:48 +01:00
Hypolite Petovan
dbcca9cfac
Hide "never" on profile
2019-02-23 18:37:51 -05:00
Hypolite Petovan
b2e41e3298
Replace EMPTY value by empty value in profile selectors
2019-02-23 18:37:48 -05:00
Hypolite Petovan
6376293218
Merge /contactgroup module with Group module
2019-02-23 17:32:40 -05:00
Hypolite Petovan
7ab986bc97
Move group module to src/
2019-02-23 17:32:40 -05:00
Hypolite Petovan
b939faf4ef
Add contact removal from all groups when blocked
2019-02-23 17:32:40 -05:00
Hypolite Petovan
7e499647e3
Add System::jsonError method for ajax call returns
2019-02-23 17:32:40 -05:00
Hypolite Petovan
f4745c5936
Add doc to Model\Term
2019-02-23 17:32:13 -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
cb78e77850
Fix implicit mentions in outgoing ActivityPub posts
...
- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
- Add usage of item own implicit mentions to be prepended to the outgoing body
2019-02-23 17:32:12 -05:00
Hypolite Petovan
3ac8576c8e
Fix implicit mentions in incoming ActivityPub posts
...
- Use thr-parent instead of parent-uri to retrieve implicit mentions to remove from body
- Add potential implicit mentions to 'tags' array for storage in Processor::convertImplicitMentionsInTags()
- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
2019-02-23 17:32:12 -05:00
Hypolite Petovan
fc47a07801
Fix Diaspora outgoing implicit mention
...
- Use name instead of nick for implicit mention
- Rename $parent to $toplevel_item in Diaspora::constructComment
- Use thread parent to retrieve the expected mention instead of the top level item
2019-02-23 17:32:12 -05:00
Hypolite Petovan
e51f2cea0d
Add implicit mentions to explicit mentions default text
2019-02-23 17:32:12 -05:00
Hypolite Petovan
0cc0df9e3e
Rename system.disable_mentions_removal config key to system.disable_implicit_mentions
...
- Update configuration key description
2019-02-23 17:32:11 -05:00
Hypolite Petovan
34bc0b0c97
Add potential debug display of implicit mentions in frio
...
- Refactored conversation() by removing extraneous intermediary variables
2019-02-23 17:32:11 -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
Hypolite Petovan
1917f04153
Rewrite Term class
...
- Move term type constants from TERM_* to Term::*
- Move term object type constants from TERM_OBJ_* to Term::OBJECT_TYPE_*
- Add Term::isType() method
- Add Strings::startsWith() method
2019-02-23 17:32:11 -05:00
Hypolite Petovan
cd53585101
Improve /itemsource display
...
- Add Item Id
- Add Item Terms
2019-02-23 17:32:10 -05:00
Hypolite Petovan
7320c5e8e8
Normalize Contact::magicLinkByContact method name
2019-02-23 17:32:10 -05:00
Michael
ed54345ce1
Only check once
2019-02-23 22:27:03 +00:00
Michael
28f7c72cc7
Don't allow calling the install page after the install had been processed
2019-02-23 21:58:35 +00:00
Michael
7703875b55
Fixes "Undefined property: Friendica\App::$queue"
2019-02-23 16:08:02 +00:00
Hypolite Petovan
44953f045e
Merge pull request #6730 from nupplaphil/dba_reconnect
...
DBA::(re-)connect fix for basePath
2019-02-23 08:45:31 -05:00
Hypolite Petovan
1a0398a5b3
Merge pull request #6723 from nupplaphil/issue/6658-worker_id
...
Adding worker ID to log
2019-02-23 08:38:08 -05:00
Philipp Holzer
5f17ce574f
Fixing DBA::(re-)connect()
2019-02-23 12:50:52 +01:00
Philipp Holzer
a73235b6ee
Fixing DBA::(re-)connect()
2019-02-23 12:49:56 +01:00
Philipp Holzer
c53f0a4382
Fixing DBA::reconnect()
2019-02-23 12:48:39 +01:00
Philipp Holzer
8760d89eb8
reverting back workerLogger to Logger
2019-02-23 10:24:22 +01:00
Philipp Holzer
5b2f394e3e
Fixing #issuecomment-456403983
2019-02-23 10:16:07 +01:00
Hypolite Petovan
c1896eee34
Merge pull request #6725 from nupplaphil/6691-rendertime-fix
...
Addon loading fix
2019-02-22 23:53:11 -05:00
Philipp Holzer
3aae84edd1
[rendertime] Timing problem during addon config read
2019-02-23 01:24:08 +01:00
Philipp Holzer
40e9bbeb88
cleanup
2019-02-23 00:53:31 +01:00
Philipp Holzer
13807129aa
fixing preload adapter
2019-02-23 00:23:41 +01:00
Philipp Holzer
1dee89f215
fixing tests and preload config
2019-02-23 00:09:57 +01:00
Philipp Holzer
8d56fb8fbe
bugfix marking of db-values
2019-02-22 23:57:04 +01:00
Philipp Holzer
b47fc97b06
readded note
2019-02-22 23:55:13 +01:00
Philipp Holzer
16863c5d82
switched back to logger
2019-02-22 23:53:20 +01:00
Philipp Holzer
8c3aebc376
Bugfixings in Config
...
- replaced usage of "!<unset>!" with null-returns
- fixed bool settings (0/1)
- fixed overriding config-values
- fixed basepath problems
2019-02-22 23:51:13 +01:00
Philipp Holzer
a613523dd7
skip WorkerLogger for Logging
2019-02-22 20:45:13 +01:00
Philipp Holzer
9c12f3f226
Formatting logger to new style
2019-02-22 20:41:13 +01:00
Philipp Holzer
cec6f49023
Removed unused code
2019-02-22 20:24:10 +01:00
Philipp Holzer
ee37632695
Adding worker id & functionname to worker logs
2019-02-22 20:10:27 +01:00
Hypolite Petovan
2d91d5c3d9
Merge pull request #6717 from annando/network-mentions
...
Automatically adding mentions in the network stream hadn't really worked
2019-02-21 21:14:23 -05: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
Michael
08d92d7ad8
Automatically adding mentions in the network stream hadn't really worked
2019-02-21 20:42:00 +00:00
Michael
7810227040
Reverted test stuff
2019-02-21 19:34:12 +00:00
Michael
3450f12cba
Changed log calls
2019-02-21 19:32:31 +00:00
Hypolite Petovan
73cafb5b11
Merge pull request #6709 from annando/urlpath
...
Issue 6679: Quick fix
2019-02-20 16:40:06 -05:00
Michael
886da50474
Issue 6679: Quick fix
2019-02-20 21:06:52 +00:00
Philipp Holzer
466f7a0ee5
adding test
2019-02-20 17:20:17 +01:00
Philipp Holzer
107293bd61
Fixing rendertime
2019-02-20 17:12:40 +01:00
Tobias Diekershoff
1df19d3553
Merge pull request #6697 from annando/memory-jsonld
...
Avoid memory issue in exception of JSON-LD parser
2019-02-19 09:40:01 +01:00
Michael
4facd1dfdb
Avoid memory issue in exception
2019-02-19 07:49:27 +00: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
Philipp Holzer
c2176aad36
bugfix
2019-02-18 14:45:24 +01:00
Philipp Holzer
5127a113aa
set config_loaded with uid
2019-02-18 14:40:35 +01:00
Philipp Holzer
1194e9b41e
set config_loaded with uid
2019-02-18 14:34:30 +01:00
Philipp Holzer
5157084969
negative set
2019-02-18 14:10:04 +01:00
Philipp Holzer
2fc81898da
Preload Adapter Fix
2019-02-18 14:02:09 +01:00
Philipp Holzer
f536107911
Fixing value check for configuration
2019-02-18 11:29:51 +01:00
Philipp Holzer
86aaa6565e
Fixing saveLog()
2019-02-18 11:29:51 +01:00
Philipp Holzer
a3d6062476
check if value is set
...
get basepath with config instead cache
2019-02-18 11:29:42 +01:00
Hypolite Petovan
74edf9994f
Merge pull request #6678 from rabuzarus/20190217_-_fix_magicLinks_mentions
...
fix magic links for item mentions
2019-02-17 21:24:01 -05:00
Philipp Holzer
95deff1685
use cache for basepath
2019-02-18 01:15:55 +01:00
Philipp Holzer
218e41a818
Bugfixing index.php
2019-02-18 00:53:00 +01:00
Hypolite Petovan
256e845c5d
Merge pull request #6641 from nupplaphil/config_followup
...
Config FollowUp
2019-02-17 17:56:31 -05:00
Philipp Holzer
5e5c39b0e1
Refactored DependencyFactory for Profiler
2019-02-17 21:12:12 +01:00
Philipp Holzer
cdcf1667d7
Adding DependencyFactory
2019-02-17 20:45:39 +01:00
Philipp Holzer
0a318925a4
bugfixing adapter get() in case of no connection
2019-02-17 20:44:14 +01:00
Philipp Holzer
ad1254c49c
performance improvement in case of db-load
2019-02-17 20:44:14 +01:00
Philipp Holzer
e1d9d67632
renamed Logger::setLogger() to Logger::init()
2019-02-17 20:44:08 +01:00
Philipp Holzer
80f1feabe5
Refactoring Logging to use Configuration
2019-02-17 20:43:52 +01:00
Philipp Holzer
eafcf3592d
Config FollowUp
...
- New Configuration (Config is now only holding the instance)
- New PConfiguration (PConfig is now only holding the instance)
- Config & PConfig-Adapter don't need "ConfigCache" anymore
- DB-Connection is now outside App->reload() for better dependency-chaining
2019-02-17 20:40:27 +01:00
Michael
a1a1367d6e
Added function description
2019-02-17 19:20:24 +00:00
Michael
061d959e7f
Code cleanup
2019-02-17 18:55:17 +00:00
rabuzarus
c59ba94648
fix magic links for item mentions
2019-02-17 17:19:57 +01:00
rabuzarus
9ebb2f42a1
Merge pull request #6660 from MrPetovan/task/6552-frio-improve-thread-display
...
[frio] Improve thread display
2019-02-17 13:33:49 +01:00
Philipp Holzer
c36a0eabdb
fixing reset()
2019-02-17 10:34:48 +01:00
Michael
01d6ba85ff
The number of workers per priority is now calculated dynamically
2019-02-17 03:22:29 +00:00
Philipp Holzer
d87a6e5a67
fixed line intends
2019-02-17 02:09:39 +01:00
Philipp Holzer
3d07774509
removed wrong log-output
2019-02-17 01:57:59 +01:00
Philipp Holzer
a3b9a8fe61
Excluding Profiler from Loglines (better using the class above)
2019-02-17 01:56:46 +01:00
Philipp Holzer
88fd871844
refactoring & test fixing
2019-02-17 01:18:21 +01:00
Philipp Holzer
6d73dcbe3d
Adding composer & tests
2019-02-17 00:03:38 +01:00
Philipp Holzer
0a7861da65
Dependency of callstack moved one layer up
2019-02-16 23:17:10 +01:00
Philipp Holzer
5e6e1a8025
Introducing Profiler
2019-02-16 23:11:30 +01:00
Philipp Holzer
11a7f97fe7
friendica-6667 Installer needs to check fileinfo module
2019-02-16 22:17:34 +01:00
Michael
0845089a0f
New scheduler mechanism
2019-02-16 15:03:37 +00:00
Hypolite Petovan
d7dbc632f8
Improved comment hiding interaction
...
- Remove global window.showMore and window.showFewer
- Improve global showHideComments function
- Remove frio-specific showHideComments function
2019-02-14 22:24:34 -05:00
Philipp Holzer
b321ef776d
added type-hint
2019-02-14 17:54:34 +01:00
Philipp Holzer
347d959f25
fixing #6652 Manual installer bricked
2019-02-14 17:44:17 +01:00
Hypolite Petovan
fe57583e2b
Merge pull request #6655 from annando/worker-limit
...
Worker: Changed behaviour of "worker_fetch_limit" config value
2019-02-14 08:45:19 -05:00
Michael
ca529d9de7
The process id is currently not supported.
2019-02-14 13:30:41 +00:00
Michael
e20a675953
The setting "worker_fetch_limit" now only has an impact on high priority processes
2019-02-14 06:53:04 +00:00
Michael
ca7ceb6fe2
We should return something ;-)
2019-02-13 17:26:54 +00:00
Michael
d4baa25349
New configuration to disable the automatic mentions removal
2019-02-13 17:23:23 +00:00
Michael Vogel
a29b6f17e2
Merge pull request #6649 from MrPetovan/bug/6647-include-newlines-in-implicit-mention-regex
...
Include new lines in implicit mention regular expression
2019-02-13 18:16:47 +01:00
Hypolite Petovan
63f083f6fb
Include new lines in implicit mention regular expression
2019-02-13 08:08:46 -05:00
Michael
73ecf2100e
Indentions
2019-02-13 10:22:36 +00:00
Michael
44ac0275ab
Issue 6603: Events are now fetchable via AP
2019-02-13 07:17:19 +00:00
Hypolite Petovan
e9045dbe09
Merge pull request #6646 from annando/fix-loxk
...
Should fix "DB Error 1205: Lock wait timeout exceeded"
2019-02-12 16:26:27 -05:00
Michael
8cb2ab2a90
Should fix "DB Error 1205: Lock wait timeout exceeded; try restarting transaction"
2019-02-12 21:10:45 +00:00
Michael
f6e8246e75
Ensure that "strtotime" returns the correct timestamp
2019-02-12 06:42:45 +00:00
Hypolite Petovan
5cf5f33a1c
Merge pull request #6640 from annando/worker-stats
...
Fix worker statistics
2019-02-11 22:00:55 -05:00
Michael
742b472994
Fix: Workerqueue processes had been killed too early
2019-02-11 22:39:59 +00:00
Michael
6fd8b5f365
Don't send single item delete commands to protocols that support account removal
2019-02-11 20:30:08 +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
Michael
f65b35901e
Fix worker statistics
2019-02-11 08:59:14 +00:00
Michael
5fc6c0ef38
Fix: Corected config value name
2019-02-11 04:39:24 +00:00
Hypolite Petovan
b5dcca995c
Merge pull request #6632 from annando/check-follow
...
Prevent multiple send follow requests
2019-02-10 21:19:31 -05:00
Michael
da53206655
Revert the storing of the "follow" activity
2019-02-10 22:08:48 +00:00
Michael
abda71ac01
The "follow" activity is now stored in the "item-activity" table
2019-02-10 22:06:27 +00:00
Michael
3b7e9cc3a2
This now should really prevent sending the follow requests only once
2019-02-10 18:59:05 +00:00
Michael
04f34de3a1
Multiples follows shouldn't be send anymore
2019-02-10 18:42:51 +00:00
Michael
58eaf0ba1c
Prevent multiple send follow requests
2019-02-10 18:03:01 +00:00
Hypolite Petovan
3a9217049b
Merge pull request #6627 from annando/check-follow
...
Don't store multiple follow request from a single person
2019-02-10 13:01:52 -05:00
Michael
7939cacc44
The function moved from the user to the contact class
2019-02-10 17:19:10 +00:00
Philipp Holzer
199ceeadbf
Adding ConfigCacheLoaderTest
2019-02-10 13:39:48 +01:00
Michael
758eabd2f6
Removed test output
2019-02-10 12:21:16 +00:00
Philipp Holzer
2a42f8dded
Adding ConfigCacheTest
2019-02-10 12:30:13 +01:00
Michael
f88a1c0b51
Merge branch 'check-follow' of github.com:annando/friendica into develop
2019-02-10 11:29:58 +00:00
Michael
cf3a46b126
Don't store multiple follow request from a single person
2019-02-10 11:28:17 +00:00
Tobias Diekershoff
b6e2c254fb
Merge pull request #6616 from m4sk1n/patch-1
...
fix typo
2019-02-10 08:12:58 +01: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 Vogel
ff2164ee85
Merge pull request #6608 from MrPetovan/bug/6386-fix-poco-discover-server-users
...
Fix poco discover server users
2019-02-10 00:38:07 +01:00
Michael
171cfe8f44
Furtner improval of the worker speed
2019-02-09 23:10:15 +00:00
Hypolite Petovan
ed89a22995
Add context to some logger calls in ActivityPub\Processor
2019-02-09 08:34:54 -05:00
marcin mikołajczak
12a44c7bb9
fix typo
2019-02-09 08:42:55 +01:00
Michael Vogel
f68b3c7c4e
Merge pull request #6612 from MrPetovan/bug/6605-cache-config-adapter-connection
...
Cache config adapter connection status to reduce number of calls to DBA::isConnected()
2019-02-09 06:57:48 +01:00
Hypolite Petovan
3c137e812a
Fix delivery data increment in APDelivery
...
- Avoid incrementing the queue done if Transmitter::createCachedActivityFromItem fails
2019-02-08 23:20:15 -05:00
Hypolite Petovan
7c58944449
Add "delivery done" label
2019-02-08 23:19:26 -05:00
Hypolite Petovan
ca65450537
Add query path capabilities to /itemsource
2019-02-08 23:12:05 -05:00
Hypolite Petovan
199fac3397
Prepend implicit author mentions in outgoing Diaspora comments
...
- Add Diaspora::prependParentAuthorMention method
2019-02-08 23:10:36 -05:00
Hypolite Petovan
e514ecb6fa
Prepend implicit mentions to outgoing ActivityPub messages
...
- Add Transmitter::prependMentions method
- Fix Transmitter::mentionCallback return value when contact isn't found
2019-02-08 23:09:02 -05:00
Hypolite Petovan
9887f2c3d0
Toggle explicit mentions in comment boxes with explicit_mentions config
2019-02-08 23:07:36 -05:00
Hypolite Petovan
e8ca8182db
Add explicit_mentions feature setting
2019-02-08 22:58:48 -05:00
Hypolite Petovan
e352408876
Remove implicit mentions from incoming ActivityPub messages
...
- Add Processor::getImplicitMentionList and Processor::removeImplicitMentionsFromBody methods
- Rename Processor::constructTagList to Processor::constructTagString
- Add implicit mention skip in Processor::constructTagString
- Invert parameter order in Processor::replaceEmojis
2019-02-08 22:57:35 -05:00
Hypolite Petovan
e6a75b2609
Add alias field to ActivityPub contacts
2019-02-08 22:32:50 -05:00
Hypolite Petovan
337c02bd80
Cache config adapter connection status to reduce number of calls to DBA::isConnected()
2019-02-08 20:12:07 -05:00
Hypolite Petovan
3aa77685fc
Merge pull request #6611 from annando/worker-performance
...
Improved worker performance (changed keys, changed queries)
2019-02-08 17:46:04 -05:00
Michael
5e5a2c3cc1
Improved worker performance (changed keys, changed queries)
2019-02-08 21:48:41 +00:00
Hypolite Petovan
1eb607b351
Add missing non-empty data condition to Protocol\PortableContact
2019-02-08 09:24:04 -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
Philipp Holzer
cb791024e4
Refactor ConfigMockTrait to mocked ConfigCache
2019-02-07 20:44:03 +01:00
Hypolite Petovan
7572843083
Merge pull request #6601 from annando/false-notifications
...
Hopefully final fix for false notifications
2019-02-07 08:41:56 -05:00
Michael
ebe767b290
Hopefully final fix for false notifications
2019-02-07 05:38:43 +00:00
Hypolite Petovan
e6a7c52f7d
Add missing App parameter in addon (un)install calls
...
Follow-up to #6581
Fixes https://github.com/friendica/friendica/issues/6386#issuecomment-461080531
2019-02-06 22:28:17 -05:00
Hypolite Petovan
741701d26f
Merge pull request #6600 from annando/false-notifications
...
The automatic follow request is currently deactivated
2019-02-06 16:47:08 -05:00
Michael
16bf9c771d
The automatic follow request is currently deactivated, due to false notifications
2019-02-06 21:34:44 +00:00
Hypolite Petovan
a0b14a46cb
Merge pull request #6581 from nupplaphil/config_refact
...
Config Refactoring
2019-02-06 09:57:41 -05:00
Tobias Diekershoff
e484678187
Merge pull request #6596 from annando/worker-jpm
...
Separate config options to display the worker jobs per minute
2019-02-06 09:04:24 +01:00
Tobias Diekershoff
cbe2d1745b
Merge pull request #6595 from annando/notice
...
Some small notice prevented
2019-02-06 09:02:49 +01:00
Tobias Diekershoff
4a501e4e46
Merge pull request #6594 from annando/delete-item
...
Partly Reverted #6583
2019-02-06 09:02:18 +01:00
Michael
b0411b46c4
Separate config options to display the worker jobs per minute
2019-02-06 07:37:45 +00:00
Michael
b4fc1d6810
Partly Reverted #6583
2019-02-06 07:31:29 +00:00
Michael
71fe689aae
Some small notice prevented
2019-02-06 07:30:31 +00:00
Philipp Holzer
fcd7627c49
method refactoring & docblock
2019-02-06 00:02:25 +01:00
Philipp Holzer
7947db8537
codeblock updates
2019-02-05 23:58:38 +01:00
Philipp Holzer
3cd654e76f
bugfixing ini-loading
2019-02-05 23:47:40 +01:00
Philipp Holzer
62c79e1c4f
codeblock updates
2019-02-05 23:42:49 +01:00
Philipp Holzer
d9e38be4df
Creating legacy config loading method
2019-02-05 23:36:01 +01:00
Philipp Holzer
87acace660
removing code for now
2019-02-05 23:06:28 +01:00
Philipp Holzer
ef16e1a037
Adding unittest for empty setApp()
2019-02-05 22:56:57 +01:00
Philipp Holzer
b79bd63231
move isDirectoryUsable to System
2019-02-05 22:30:18 +01:00
Philipp Holzer
6a9d73f7d9
Refactoring ConfigCacheLoader methods
2019-02-05 22:27:57 +01:00
Philipp Holzer
800dbc7f44
Removed implicit ::getApp() instance and added docblock
2019-02-05 21:54:55 +01:00
Hypolite Petovan
a96e9f248e
Remove asterisk provision altogether in Markdown::toBBCode
2019-02-04 21:50:27 -05:00
Hypolite Petovan
eb6ca77289
Merge pull request #6587 from rabuzarus/20190204_-_magicLinks_for_profileAdvanced
...
use magic Links for forums listed in the advanced profile section
2019-02-04 19:02:22 -05:00
rabuzarus
f190aa2140
use magic Links for forums listed in the advanced profile section
2019-02-04 23:18:51 +01:00
Philipp Holzer
0d096cf32e
type-hints
2019-02-04 09:35:01 +01:00
Philipp Holzer
4b82e47034
Moved addon directory constant
2019-02-04 09:33:55 +01:00
Philipp Holzer
f779110154
Updating type-hints and some naming conventions
2019-02-04 09:32:13 +01:00
Philipp Holzer
d78ac57514
Updating type-hints and some naming conventions
2019-02-04 09:30:48 +01:00
Tobias Diekershoff
deaecfaf79
Merge pull request #6582 from MrPetovan/bug/6570-fix-diaspora-hashtags
...
Only escape leading hash marks in Markdown::toBBCode
2019-02-04 06:47:27 +01:00
Philipp Holzer
1c51d7d22f
Typo at addon-directory-name ...
2019-02-04 02:21:23 +01:00
Philipp Holzer
bdfe0c35fb
Typo at addon-directory-name ...
2019-02-04 02:14:20 +01:00
Philipp Holzer
f2f8c97b7c
Bugfixing Addon-config
2019-02-04 02:06:15 +01:00
Philipp Holzer
d6dd74690d
Bugfixing Config output for memcached_hosts[]
2019-02-04 01:19:01 +01:00
Michael
97fb2202cb
Lower priority for removing item
2019-02-03 23:59:16 +00:00
Michael
633d04049b
Lower priority for removing users
2019-02-03 23:55:46 +00:00
Hypolite Petovan
e5647be30f
Only escape leading hash marks in Markdown::toBBCode
...
- Remove useless line ending fiddling
2019-02-03 18:31:11 -05:00
Philipp Holzer
90e88d6c35
Bugfixing AutomaticInstallation test
2019-02-04 00:04:16 +01:00
Philipp Holzer
bc73d4bd2b
Adding descriptions
2019-02-03 23:39:30 +01:00
Philipp Holzer
f3da5b3a2f
Bugfixing PConfig
2019-02-03 23:22:05 +01:00
Philipp Holzer
0f5a50b46b
Bugfixing tests
2019-02-03 22:53:39 +01: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
5c50684b50
2) Refactor App->config[] into Core\PConfig
2019-02-03 19:32:31 +01:00
Philipp Holzer
f40c57fc20
2) Refactor App->config[] into Core\PConfig
2019-02-03 19:05:44 +01:00
Philipp Holzer
d43a8184f4
2) Refactor App->config[] into Core\PConfig
2019-02-03 19:04:41 +01:00
Philipp Holzer
be6b229534
1) Refactor App->config[] into Core\Config
2019-02-03 18:54:25 +01:00
Hypolite Petovan
82f713cb7f
Merge pull request #6576 from nupplaphil/cache_lock_mock
...
Refactoring DBA-mocking tests
2019-02-03 07:53:36 -05:00
Hypolite Petovan
e9b7b81232
Merge pull request #6578 from Ixiter/develop-markdown-anchors
...
Markdown - Fixed bug with local anchor links
2019-02-03 07:51:26 -05:00
peter
0ca762001b
Markdown - fixed bug in local anchor links, optimized replacer
2019-02-03 10:33:15 +01:00
peter
990cc45a26
Markdown - fixed bug in local anchor links
2019-02-03 03:23:47 +01:00
Philipp Holzer
433d6abe8c
Refactoring DBA-mocking tests
...
- Reducing DB-dependencies
- Creating DB-cache mocks
- Creating DB-lock mocks
- Switching to mocked dependencies for Cache/Lock/App
2019-02-02 19:03:15 +01:00
Hypolite Petovan
51e669616a
Merge pull request #6572 from annando/hubzilla-ap
...
Hopefully fixes a communicaton problem with Hubzilla
2019-02-01 10:22:24 -05:00
Michael
35e3700c8a
Hopefully fixes a communicaton problem with Hubzilla
2019-02-01 14:26:45 +00:00
Michael Vogel
811589c81b
Merge pull request #6562 from MrPetovan/task/4090-move-profile-to-src
...
Move profile module to src/
2019-01-31 07:02:05 +01:00
Hypolite Petovan
811bafa246
Merge pull request #6568 from annando/ap-mentions
...
Links of mentioned contacts hadn't looked great on Mastodon
2019-01-30 19:05:00 -05:00
Michael
de566cd888
Links of mentioned contacts hadn't looked great on Mastodon
2019-01-30 21:57:26 +00:00
Michael
a7963fe18a
AP: Automatically send follow requests for reshared items
2019-01-30 21:33:23 +00:00
Michael
fc0acd7b1f
AP: Debug option to deliver via AP first
2019-01-30 19:33:08 +00:00
Michael
fce46f5124
AP: Follow a note to receive all upcoming activities
2019-01-30 16:30:01 +00:00
Hypolite Petovan
23171296b2
Add missing EOF newline in Module\Profile
2019-01-30 11:11:23 -05:00
Michael
2c0ee72064
Ap: Clarify message distribution for forum posts
2019-01-30 13:07:23 +00: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
Michael
f226464acc
Don't auto mention yourself or forums, don't do it in the firstlevel post
2019-01-30 03:36:24 +00:00
Hypolite Petovan
30e97b4cc1
Ignore code blocks when extracting tags
2019-01-29 20:39:05 -05:00
Hypolite Petovan
9525e07971
Fix greedy regular expression and move code block escaping after tag extraction in Model\Item
2019-01-29 20:25:51 -05:00
rabuzarus
0993f3e6ef
fix isssue if friendica is installed into a subdirectory
2019-01-30 01:00:40 +01:00
Hypolite Petovan
2bd62bfdea
Merge pull request #6554 from Ixiter/develop-bbcode-tags
...
Fixed some bugs with weird tagging in [code] blocks and tagging of multiple ##
2019-01-29 17:11:54 -05:00
Peter Liebetrau
c3e5c77eb3
BBcode, Tags - changes for #pullrequestreview-197771905
2019-01-29 22:34:28 +01:00
Peter Liebetrau
5080778ea6
BBcode, Tags - moved [code] escaping before BBCode::getTags() call
2019-01-29 21:54:20 +01:00
Peter Liebetrau
87b1d0a4d7
BBcode, Tags - fixed doubbbllee trroubbllee
2019-01-29 21:35:11 +01:00
Peter Liebetrau
d8bd1921ee
BBcode, Tags - fix BBCode created tags in [code] blocks, fix usage of multiple ## created tags
2019-01-29 21:17:11 +01:00
Hypolite Petovan
8d84f33f15
Merge pull request #6541 from annando/mentions
...
Display mentioned users and in the comment box by default
2019-01-29 07:56:30 -05:00
fabrixxm
a7d45682e7
Filesystem storage: handle basepath with trailing slash
2019-01-29 12:36:23 +01:00
fabrixxm
ec94318a35
Filesystem storage: set permission on folders and files
...
files are set 0660 and folders 0770.
fix #6545
2019-01-29 12:35:30 +01:00
Michael
e38eebe529
Standards
2019-01-28 22:06:28 +00:00
Michael
d259007f11
Removing the parameter
2019-01-28 21:53:13 +00:00
Michael
d40b2792b6
Display mentioned users and in the comment box by default
2019-01-28 21:22:03 +00:00
Michael Vogel
41b1c9b374
Merge pull request #6539 from nupplaphil/logger_uid
...
Logger Unique ID
2019-01-28 19:32:01 +01:00
Philipp Holzer
d7e35b5802
Making the processor name more explicit
2019-01-28 18:41:29 +01:00
Philipp Holzer
26af96f31a
improving code
2019-01-28 18:26:35 +01:00
Philipp Holzer
9fe1da5f94
Double backslash
2019-01-28 12:35:14 +01:00
Philipp Holzer
88e2cc9fa2
removing array prefix (compatibility)
2019-01-28 11:35:08 +01:00
Philipp Holzer
a5e12f53e8
Logger Unique ID
2019-01-28 11:21:48 +01:00
Michael
030c0b5dc6
Another preparation for forum posts via AP
2019-01-28 06:23:06 +00:00
Hypolite Petovan
2d49b71a4c
Merge pull request #6516 from Ixiter/develop
...
BBCode - added preg_replaces for local [url] links without target="_blank"
2019-01-26 14:22:34 -05:00
Michael
9f2e9dfc1b
Fetchting the original post at first, then the other way is dafer.
2019-01-26 12:09:38 +00:00
Michael
ad782b55ef
Preparation for forum posts over AP
2019-01-26 12:03:09 +00:00
Peter Liebetrau
41663c7592
BBCode - fixed syntax error
2019-01-25 17:33:25 +01:00
Peter Liebetrau
54bec2bc8e
BBCode - optimized preg searchstring
2019-01-25 17:25:42 +01:00
Peter Liebetrau
71e58a0f42
BBCode - optimized preg escaping of searchstring
2019-01-25 16:56:28 +01:00
peter
6ba08e510d
BBCode - removed convert for relative URLs
2019-01-25 15:32:31 +01:00
peter
a505dbbe5c
BBCode - fixed code styling
2019-01-25 01:25:06 +01:00
peter
ae806a593d
BBCode - added preg_replacers for local [url] without target="_blank"
2019-01-25 01:15:43 +01:00
Hypolite Petovan
2b0610eaf5
Merge pull request #6515 from annando/connector-posts
...
Fix: Connector posts now do work again (postopts hadn't been stored)
2019-01-24 16:23:34 -05:00
Michael
7cba8942c7
Fix: Connector posts now do work again (postopts hadn't been stored)
2019-01-24 21:06:53 +00:00
Michael
ebb84f5e43
DFRN comments are now stored as comments again
2019-01-24 18:54:45 +00:00
Michael
b90c8c6346
Logger: Display the correct file, function and line number
2019-01-24 14:23:42 +00:00
Michael Vogel
6e7ca479d6
Merge pull request #6508 from nupplaphil/logger_enh
...
Adding an explicit FriendicaProcessor
2019-01-24 11:15:57 +01:00
Philipp Holzer
7634663970
Adding an explicit FriendicaProcessor
2019-01-24 08:13:44 +01:00
Hypolite Petovan
46315f6946
Fix missing use statement in Module\Inbox
2019-01-23 21:22:39 -05:00
Hypolite Petovan
8a554fef2d
Fix missing library include in Database\DBstructure
2019-01-23 21:22:26 -05:00
Michael
3392c7a8be
Fixed "created" origin
2019-01-24 00:34:14 +00:00
Michael
7e31cebb67
Parameters redone
2019-01-23 22:04:14 +00:00
Michael
0fdab4ed10
Fix for several fatal errors
2019-01-23 21:54:20 +00:00
Hypolite Petovan
004818ca1b
Fix indentation in Module\Inbox
2019-01-23 09:07:02 -05:00
Hypolite Petovan
0d9209a74b
Add AP Inbox logging back with config
2019-01-23 09:07:01 -05:00
Hypolite Petovan
c897969589
Fix wrong variable name in Worker\Delivery
2019-01-23 09:07:00 -05:00
Hypolite Petovan
a6786ac814
Update array notation in Protocol\DFRN
2019-01-23 09:07:00 -05:00
Hypolite Petovan
df706484cd
User DOMDocument object call instead of static in Content\OEmbed
2019-01-23 09:07:00 -05:00
Hypolite Petovan
ddad9721c0
Fix query return type in Widget\TagCloud
2019-01-23 09:06:59 -05:00
Hypolite Petovan
49c9b6f9ff
Fix possibly undefined variables
2019-01-23 09:06:59 -05:00
Hypolite Petovan
f8c782380f
Remove unused code/use statements
2019-01-23 09:06:58 -05:00
Hypolite Petovan
64847e7cc8
Fix types in doc blocks/prototypes
2019-01-23 09:06:58 -05:00
Hypolite Petovan
5ea033db33
Remove unused variable in Model\Item
2019-01-23 09:06:58 -05:00
Hypolite Petovan
d5ce74672e
Fix method scope in Model\Attach
2019-01-23 09:06:57 -05:00
Hypolite Petovan
0c19c4c75d
Fix missing reference to 'data' key in Util\Crypto
...
- Fix doc blocks
2019-01-23 09:06:57 -05:00
Michael Vogel
48e0b943a3
Merge pull request #6336 from MrPetovan/bug/6334-get-app-namespace
...
Move mod/register to Module\Register
2019-01-23 07:40:58 +01:00
Hypolite Petovan
1ee1d7ef4e
Add new PostUpdate function to initialize delivery data
2019-01-23 00:02:00 -05:00
Hypolite Petovan
cef6757c92
Replace REGISTER_* constants by Module\Register::* ones
2019-01-22 22:24:15 -05:00
Hypolite Petovan
0ccb6afdb5
Add Register module in src/
...
- Update REGISTER_* constants definition
- Update register template variable name
2019-01-22 22:22:04 -05:00
Hypolite Petovan
0cc1a07cfa
Fix default value of contact parameter of OStatus::import in mod/salmon
2019-01-22 08:53:53 -05:00
Hypolite Petovan
5d4bafb116
Fix two additional uses of uid in Worker\Notifier
2019-01-22 08:31:39 -05:00
Hypolite Petovan
282bc01994
Fix using wrong uid for APDelivery in Worker\Notifier
2019-01-22 01:59:30 -05:00
Hypolite Petovan
604262a70e
Extract title determination from OStatus::entryHeader logic
2019-01-22 01:59:22 -05:00
Hypolite Petovan
aa3532cd3b
Fix wrong class constant in Model\APContact
2019-01-22 01:57:46 -05:00
Michael Vogel
85ff976f83
Merge pull request #6483 from MrPetovan/bug/fixes-after-2019-03-develop-rebase
...
Fixes after 2019 03 develop rebase
2019-01-21 21:52:22 +01:00
rabuzarus
eabe192efc
bugfix Contact.php - there is no column 'deleted' in the 'profile' table
2019-01-21 21:13:13 +01:00
Hypolite Petovan
b161bd1dfa
Improve get_responses() prototype
2019-01-21 11:37:05 -05:00
Hypolite Petovan
ce177f22c8
Fix doc blocks and return value type
2019-01-21 11:36:01 -05:00
Hypolite Petovan
504945f9df
Improve page flags doc block in Model\User
2019-01-21 11:12:53 -05:00
Hypolite Petovan
d1c1c772fd
Fix missing use statement in Content\Nav
2019-01-21 11:12:53 -05:00
Hypolite Petovan
41edcd1028
Fix bad rebase in Model/Contact
2019-01-21 11:12:52 -05:00
Hypolite Petovan
3c50a11ff1
Fix wrong operators in Model\Item and Model\Contact
2019-01-21 11:12:51 -05:00
Hypolite Petovan
25b8628762
Fix missing new in throw calls in Core\StorageManager
2019-01-21 11:12:51 -05:00
Hypolite Petovan
722284ca8e
Fix unused $kw variable in Protocol\Diaspora
2019-01-21 11:12:51 -05:00
Hypolite Petovan
28397fc5fc
Fix method parameter type in Model\Attach
2019-01-21 11:12:50 -05:00
Hypolite Petovan
78931afa6f
Fix error message in Console\GlobalCommunityBlock
2019-01-21 11:12:50 -05:00
Hypolite Petovan
57ab858486
Fix calls to DBA::select missing parameters
2019-01-21 11:12:50 -05:00
Hypolite Petovan
e7be87df93
Fix missing $ in front of variable names
2019-01-21 11:12:49 -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
c280fc6484
Show followers for pages, followed for users in ContactBlock widget
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
11a4a57bfe
Update HTML::contactBlock and Profile::load with new ContactBlock widget
2019-01-21 10:55:36 -05:00
Hypolite Petovan
1f98fdfda6
Add new Widget\ContactBlock
2019-01-21 10:54:42 -05:00
Philipp Holzer
1b802548b2
revert phpdoc change
2019-01-21 10:54:41 -05:00
Philipp Holzer
9e0be97703
Bugfixing legacy loglevel
2019-01-21 10:54:41 -05:00
Philipp Holzer
c38782731f
changing failed auth to warning
2019-01-21 10:54:41 -05:00
Philipp Holzer
282507922a
Reset map function name
2019-01-21 10:54:41 -05:00
Philipp Holzer
b5afd2a21d
change regex for fail2ban
2019-01-21 10:54:40 -05:00
Philipp Holzer
aa15c0e094
Bugfixing Monolog
...
- Default Loglevel for logs set to 'info'
- Default config level is set to 'notice'
- using 'notice' for auth-failures
- Bugfixing wrong usage of legacy 'log()'
2019-01-21 10:54:39 -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
4a95ca280d
Remove unused code
...
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
- Remove duplicate array keys
2019-01-21 10:48:40 -05:00
Hypolite Petovan
d1c6ec9718
Update namespaces declaration in include/
...
- Remove unused use statements
- Add required use statements
2019-01-21 10:44:45 -05:00
Hypolite Petovan
14e4ab544a
Update namespace use calls in mod/
2019-01-21 10:44:21 -05:00
Hypolite Petovan
cb3f09ae4f
Refactor namespaces
...
- Remove unused use statements
- Add required use statements
- Escape global classes
2019-01-21 10:43:42 -05:00
Hypolite Petovan
070aa016e0
Update more PHPDoc, including in include/
2019-01-21 10:39:28 -05:00
Hypolite Petovan
af9067a381
Update PHPDoc in mod/
2019-01-21 10:39:27 -05:00
Hypolite Petovan
3282ce5389
Fix PHPDoc comments project-wide
2019-01-21 10:35:51 -05:00
Philipp Holzer
2e602afd3e
Add Monolog
2019-01-21 10:10:40 -05:00
fabrixxm
518f28a7bf
Small fixes
...
- Avoid an intermediate variable
- Use `rawContent()` in `Attach` module
- Small typo
2019-01-21 10:08:09 -05:00
Hypolite Petovan
2f49c4a058
Revert "Add monolog"
2019-01-21 10:08:09 -05:00
fabrixxm
24d7ffa3fe
Update "storage" console command
...
add support to move data in 'attach' table
2019-01-21 10:00:48 -05:00
fabrixxm
c3c0332536
return default mimetype for unknown extensions
2019-01-21 10:00:47 -05:00
fabrixxm
e561fb3a0b
Fix undefined var in module Proxy
2019-01-21 10:00:47 -05:00
Philipp Holzer
6e48df2163
Refactor Loglevels
2019-01-21 10:00:46 -05:00
fabrixxm
b640024b51
Item model, fix deletion of all attachments
...
Item model delete all attachments on item deletion, but it should check
if same attachment isn't used somewhere else.
2019-01-21 10:00:45 -05:00
fabrixxm
906b7841d4
Fix Attach model store() and storeFile()
2019-01-21 10:00:45 -05:00
fabrixxm
15b0a7a4d8
Photo model. Small fix to update()
...
pass `$old_fields` param to `DBA::update()`
2019-01-21 10:00:45 -05:00
fabrixxm
b7b3086263
Attach: store, update, delete. Model and views
2019-01-21 10:00:44 -05:00
fabrixxm
fc2b804ccc
Move mod/attach to src, add Attach model, update attach table to use storage backends
2019-01-21 10:00:44 -05:00
Philipp Holzer
df230126c9
skipStackFramesCount to 1 to skip static method
2019-01-21 09:59:11 -05:00
Philipp Holzer
45bde8fef1
Adding more information in case of warning (or dev)
2019-01-21 09:59:11 -05:00
Philipp Holzer
6150c2fa9c
Bugfixing
2019-01-21 09:59:11 -05:00
Philipp Holzer
7f7ed16dc2
Log format
2019-01-21 09:59:09 -05:00
Philipp Holzer
8f9c0fe149
Adding Develop and normal Logging instances
2019-01-21 09:59:08 -05:00
Philipp Holzer
fe8f0e0045
Add Monolog
2019-01-21 09:58:05 -05:00
Jeroen De meerleer
2bfc3d1a0c
begone
2019-01-21 09:50:59 -05:00
Jeroen De Meerleer
33f7fd72ca
Enable logged in users to force a certain language
2019-01-21 09:50:58 -05:00
Jeroen De Meerleer
b440b4c338
Updated towards code standards
2019-01-21 09:50:58 -05:00
Jeroen De meerleer
e0777b6bc9
forcing language by parameter
2019-01-21 09:50:58 -05:00
Hypolite Petovan
55e54bb950
Replace deprecated Addon::callHooks with Hook::callAll
...
- Update documentation
2019-01-21 09:50:56 -05:00
Hypolite Petovan
895b3abf32
Remove/replace killme() with *exit()
2019-01-21 09:49:17 -05:00
Hypolite Petovan
16fabb4e04
Replace misuses ItemDeliveryData::FIELD_LIST with LEGACY_FIELD_LIST
2019-01-21 09:39:15 -05:00
Hypolite Petovan
38734f17b9
Honor item delivery data legacy fields
2019-01-21 09:39:15 -05:00
Hypolite Petovan
85eb6affdf
Unit test fix
2019-01-21 09:39:14 -05:00
Hypolite Petovan
ff1f6564f9
Remove delivery queue done incrementation for mail delivery
2019-01-21 09:39:14 -05:00
Hypolite Petovan
6538a8eaca
Add delivery queue display in frio and vier
...
- Add new $item.owner_self and $item.delivery keys for display
- Add new sub/delivery_count.tpl template
2019-01-21 09:39:13 -05:00
Hypolite Petovan
1696ad962e
Add delivery queue number manipulation
...
- Add new ItemDeliveryData model class
- Add queue_count initialization in Notifier
- Add queue_done incrementation in various Delivery tasks
2019-01-21 09:36:51 -05:00
Hypolite Petovan
dea1a98a5d
Fix various documentation issues/unused variables
2019-01-21 09:33:24 -05:00
Hypolite Petovan
8a0e4e12e1
Replace item_id by target_id in multimode delivery workers
2019-01-21 09:32:41 -05:00
Hypolite Petovan
1e6193a14e
Refactor Worker/Notifier part 4
...
- Remove redundant $normal_mode flag
- Moved public message email recipient loop
- Simplify OStatus delivery
2019-01-21 09:31:57 -05:00
Hypolite Petovan
774609dd38
Refactor Worker/Notifier part 3
...
- Replace deprecated q() calls
2019-01-21 09:31:56 -05:00
Hypolite Petovan
d0228b9b97
Refactor Worker/Notifier part 2
...
- Move self-removal in a sub-method in Worker/Notifier
2019-01-21 09:27:06 -05:00
Hypolite Petovan
507c215c76
Refactor Worker/Notifier part 1
...
- Rename variables
- Remove orphan, duplicate and one-use intermediary variables
- Initialize potentially missing variables
- Replace obsolete Addon::callHooks call
- Simplify Notifier::activityPubDelivery() signature
2019-01-21 09:27:05 -05:00
Jeroen De Meerleer
ff180fb0f1
Updated towards code review
2019-01-21 09:12:38 -05:00
fabrixxm
b2211d31b9
Fix StorageManager::move()
2019-01-21 09:12:37 -05:00
Jeroen De Meerleer
a224308d42
4 spaces to tab
2019-01-21 09:12:37 -05:00
Jeroen De Meerleer
0906c3532c
Added post-update script
...
Please review first. I don't want to test changes that are not going pass the review.
2019-01-21 09:12:37 -05:00
fabrixxm
8addcf9844
Fix storage backend class names
...
This should be tested on all supported PHP versions
2019-01-21 09:12:32 -05:00
Hypolite Petovan
578a391393
Add missing methods to Storage\SystemResource
...
Part of #6263
2019-01-21 09:12:31 -05:00
fabrixxm
bbbc15a5eb
Method getPhoto of Photo model should return false on error
...
Instead of red circle image, which breaks proxy module
2019-01-21 09:12:31 -05:00
fabrixxm
4e38bc8a0d
Use DBA::exists() in Photo::exists()
2019-01-21 09:12:31 -05:00
fabrixxm
2f935a1fbf
Fix unregister storage backend
2019-01-21 09:12:30 -05:00
fabrixxm
f2b29f6591
Fix moving stored data
2019-01-21 09:12:30 -05:00
fabrixxm
55292c954b
Remove resourceid parameter from Photo::exists()
2019-01-21 09:12:29 -05:00
fabrixxm
8c75c26361
Use Model\Photo as much as possible
...
Most important is to use `Photo::delete()` to have backend
to remove data.
2019-01-21 09:12:28 -05:00
fabrixxm
d549787bc1
Remove empty line before code
2019-01-21 09:11:41 -05:00
fabrixxm
15a3fc05d3
Photo model: set edited and updated on update, fix exists(), docs
2019-01-21 09:11:40 -05:00
fabrixxm
36f30533b7
Code standards
2019-01-21 09:11:40 -05:00
fabrixxm
5fdc9097a2
Rewrite Proxy module
2019-01-21 09:11:40 -05:00
fabrixxm
a46cbfca3d
Fix Module\Photo exit with error
2019-01-21 09:11:39 -05:00
fabrixxm
fdc6608af8
Add storage options form in admin/site page
2019-01-21 09:11:39 -05:00
fabrixxm
f7b6fef197
Code standards
2019-01-21 09:11:35 -05:00
fabrixxm
682456c7d1
Add move function to storage manager and console command
2019-01-21 09:11:35 -05:00
fabrixxm
4d9d62bcdb
Add 'storage' console command
...
- list registered backend
- set backend
2019-01-21 09:11:34 -05:00
fabrixxm
6a0ed7c298
Add storage backend manager class
2019-01-21 09:11:34 -05:00
fabrixxm
e5c2d4e2f8
Add Database storage backend
...
This storage store files data in a separate database table
2019-01-21 09:11:33 -05:00
fabrixxm
6e85a18678
Storage: throw StorageException on errors
2019-01-21 09:10:47 -05:00
fabrixxm
7df3f117ac
Photo model: fix docs, don't update "created" field
...
in store() if photo exists, don't update "created" timestamp
2019-01-21 09:10:47 -05:00
fabrixxm
6f59c82978
Code standards
2019-01-21 09:10:46 -05:00
fabrixxm
69fcdaf9ab
Photo model: set updated field in update()
2019-01-21 09:10:45 -05:00
fabrixxm
3e13799e70
Add update() to Photo model
...
Edit mod/photos.php to use Photo model
2019-01-21 09:10:45 -05:00
fabrixxm
b0acf4284d
Code standards
2019-01-21 09:02:58 -05:00
fabrixxm
cbb5124d59
Code standards
2019-01-21 09:02:57 -05:00
fabrixxm
ea0cd6c919
Filesystem storage: add "index.html" files in dirs
2019-01-21 09:02:57 -05:00
fabrixxm
76579e02cc
profile_photo: use Photo model function to get photo and image
2019-01-21 09:02:57 -05:00
fabrixxm
234c110d38
Model/Photo: use self select functions, reuse backend, fix quotes, add delete()
2019-01-21 09:01:52 -05:00
fabrixxm
75daf96590
Revert "Catch HTTPExceptions in App::runFrontend()"
...
This reverts commit 58bd75f8f3
.
2019-01-21 08:59:59 -05:00
fabrixxm
07d358adc1
More code standard
2019-01-21 08:57:30 -05:00
fabrixxm
9317a1c054
Address code standards issues
2019-01-21 08:57:30 -05:00
fabrixxm
12dd7b552f
Add Filesystem storage backend and store photo via backend
2019-01-21 08:57:29 -05:00
fabrixxm
0ada604c7d
Return default profile photo if no profile photo is set
2019-01-21 08:57:29 -05:00
fabrixxm
9b2e3fa916
Add IStorage interface
...
storage classes should implement this interface
2019-01-21 08:57:29 -05:00
fabrixxm
3b3c4e8cc7
Pluggable storage backends: first steps
...
- add backend related columns in photo table
- add system resource storage class
- add code to load image data from backend class
- return "nosign" image as photo meta with SystemResource backend
2019-01-21 08:57:28 -05:00
fabrixxm
89eaf508f1
Catch HTTPExceptions in App::runFrontend()
...
Set correct http response header, display error message using "404.tpl"
2019-01-21 08:49:17 -05:00
fabrixxm
b96dbcd4cb
Move Photo module, update Photo model
2019-01-21 08:40:47 -05:00
Unknown
5db9d2fe66
Some more alignation
2019-01-21 08:40:46 -05:00
Unknown
bc553a2c49
Translated string will never match what's saved in DB if not english
...
Rare jongens die Amerikanen ;)
2019-01-21 08:40:46 -05:00
Unknown
c44ca31aec
Why got this even approved?
2019-01-21 08:40:46 -05:00
Unknown
24dbb69421
Added EMPTY key + updated to hypolite's suggestions
2019-01-21 08:40:45 -05:00
Jeroen De Meerleer
4d81158dd1
Translated gender etc. in profile view
2019-01-21 08:40:45 -05:00
Jeroen De Meerleer
1d8c64cfec
Added original keys to maritial status
2019-01-21 08:40:44 -05:00
Jeroen De Meerleer
b70d762574
Added original keys to sexual preference
2019-01-21 08:40:43 -05:00
Jeroen De Meerleer
ab49a613c9
Added original keys to gender
2019-01-21 08:40:43 -05:00
Michael
70c183b495
AP Bugfix: We hadn't transmitted an tag url at all ...
2019-01-20 23:13:55 +00:00
Michael
e2427eb9da
We only need to fetch the content once
2019-01-20 22:56:33 +00:00
Michael
9e7c59481f
Improved ID detection
2019-01-20 22:19:53 +00:00
Michael
e5d694f7fa
AP: Only reshare stuff that is AP content
2019-01-20 21:52:43 +00:00
Hypolite Petovan
89cb1b276d
Move rawContent before theme initialization
2019-01-19 22:03:49 -05:00
Hypolite Petovan
af7b852d04
Insert theme init after module init but before post/content
2019-01-19 21:52:43 -05:00
Tobias Diekershoff
892a395eb7
Merge pull request #6471 from annando/ap-bcc
...
Transmit via BCC if contact is hidden, don't store announces
2019-01-19 18:23:44 +01:00
Michael
809e556009
Transmit via BCC if contact is hidden, don't store announces
2019-01-19 16:44:15 +00:00
Hypolite Petovan
6aebece494
Merge pull request #6470 from rabuzarus/20190118_-_some_more_magic_links
...
use magic links for common/all friends and the directory
2019-01-19 10:06:35 -05:00
rabuzarus
7b78ba3929
Bugfix - use magicLinks also for common/all friends and the directory
2019-01-19 15:12:46 +01:00
Michael
103b92fc48
Avoid that forum posts are received via the Diaspora protocol first
2019-01-19 12:30:16 +00:00
Michael
2a0e18c7dd
Bugfix: Theme functions hadn't been executed anymore
2019-01-18 20:08:35 +00:00
rabuzarus
528d175baa
Bugfix - provide magic links for remote user in magicLink()
2019-01-18 17:50:21 +01:00
Michael
c8bfa0c661
Bugfix: Private posts of contacts hadn't been displayed on the contact's page
2019-01-18 06:22:15 +00:00
Hypolite Petovan
9efe140b54
Merge pull request #6460 from annando/relaying
...
Simplyfies AP relaying, fixes relaying of public contacts
2019-01-17 19:09:33 -05:00
Michael
d813d72b1a
Simplyfies AP relaying, fixes relaying of public contacts
2019-01-17 23:06:27 +00:00
Tobias Diekershoff
09a44b3039
Merge pull request #6456 from annando/long-url
...
This fixes a problem when the URL is too long
2019-01-17 07:44:15 +01:00
Michael
98d44ce7c7
The "]" had been at the wrong place
2019-01-17 05:32:06 +00:00
Michael
ce37e981cb
This fixes a problem when the URL is too long
2019-01-16 22:34:57 +00:00
Michael
fe0339dabe
Fixing a bug, adding some logging
2019-01-16 22:19:41 +00:00
Michael
c359c162a7
Issue 6282: Update the contact data regularly (including the network)
2019-01-16 21:39:56 +00:00
Michael
ae2a8b796c
Avoid a notice in HTTP signature check, preparation for authentication
2019-01-15 06:31:12 +00:00
Michael
9bec202232
Adding the date to signed get requests as well
2019-01-14 16:33:23 +00:00
Michael
2f2184cf12
Date check added for HTTP signatures
2019-01-14 16:03:13 +00:00
Hypolite Petovan
90e25faf44
Merge pull request #6447 from annando/peertube
...
Enable communication with Peertube
2019-01-14 08:40:42 -05:00
Hypolite Petovan
990bbea19d
Merge pull request #6446 from annando/approve
...
Now storing the "manually approve" data / fix update routine
2019-01-14 08:38:08 -05:00
Michael
aa4aaf1971
Enable communication with Peertube
2019-01-14 12:10:11 +00:00
Michael
5554448162
Now storing the "manually approve" data / fix update routine
2019-01-14 06:36:08 +00:00
Hypolite Petovan
795268eb7a
Fix undefined offset notices in Protocol\Email
2019-01-14 00:05:51 -05:00
Michael
c1dec50248
Avoiding some notices
2019-01-13 18:03:13 +00:00
Michael
8b5b66838d
Issue 6438: Avoid fatal error
2019-01-13 16:00:27 +00:00
Hypolite Petovan
72516191ef
Merge pull request #6435 from annando/nextcloud
...
Making Friendica compatible to Nextcloud Social
2019-01-13 07:57:37 -05:00
Michael
236c7718d3
Fixing some notice again
2019-01-13 09:44:04 +00:00
Michael
d113ccd93c
Making Friendica compatible to Nextcloud Social
2019-01-13 09:38:01 +00:00
Michael
297a549590
Issue 6282: Update the forum status of contacts
2019-01-12 16:09:27 +00:00
Hypolite Petovan
c4038e7af1
Merge pull request #6432 from annando/deleted-pending
...
Don't show deleted contacts, changed "pending" behaviour
2019-01-12 09:08:31 -05:00
Michael
28f14c7d60
Don't show deleted contacts, changed "pending" behaviour
2019-01-12 13:28:14 +00:00
Michael Vogel
2fbf1d54e2
Merge pull request #6428 from MrPetovan/bug/5148-get-cookies-from-safari-2
...
Add variable query parameter to stylesheet URL for iOS Safari
2019-01-12 09:33:35 +01:00
Michael Vogel
cd3ab5ddc9
Merge pull request #6426 from MrPetovan/bug/6425-fix-infinite-scroll-url
...
Fix infinite scroll base URL
2019-01-12 09:25:06 +01:00
Hypolite Petovan
a9b8eb4d56
Refactor Theme::getStylesheetPath to return faster if theme style.php doesn't exist
2019-01-12 02:26:16 -05:00
Hypolite Petovan
abf20368b0
Rework Profile::getThemeUid to ignore query parameter and include $a->profile_uid
...
- Use new version in frio default.php file
- Use new version in Theme::getStylesheetPath
2019-01-12 02:23:01 -05:00
Hypolite Petovan
6d1bc974a0
Add time parameter for iOS Safari to stylesheet URL
2019-01-11 20:49:16 -05:00
Hypolite Petovan
f6092ebebb
Add App->mobileDetect property
2019-01-11 20:48:29 -05:00
Hypolite Petovan
ffcd9fb78d
Revert "Change stylesheet path name for mobile browsers"
2019-01-11 20:01:42 -05:00
Hypolite Petovan
c5632a061f
Fix output of Pager->getBaseQueryString
2019-01-11 19:30:33 -05:00
Hypolite Petovan
eaea24f98b
Remove Pager->ensureQueryParameter
2019-01-11 19:29:55 -05:00
Hypolite Petovan
ec8b313c2d
Replace Pager->ensureQueryParameter by Strings::ensureQueryParameter
2019-01-11 19:29:39 -05:00
Hypolite Petovan
a20fa6a3a9
Add ensureQueryParameter method to Util\Strings
2019-01-11 19:27:56 -05:00
Michael
e3576fa0bd
Don't accept private answers to public parents
2019-01-10 22:51:03 +00:00
Tobias Diekershoff
59f701d5a9
Merge pull request #6419 from annando/unfollow
...
Unfollow should now work with Pleroma again
2019-01-10 11:08:23 +01:00
Tobias Diekershoff
6bc865ff4d
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules
...
Add password rules
2019-01-10 10:37:32 +01:00
Michael
1a702359f1
Unfollow should now work with Pleroma again
2019-01-10 07:24:12 +00:00
Hypolite Petovan
cd48b7a68e
Merge pull request #6415 from annando/pending
...
Don't show deleted contacts, set new AP contacts as "pending" until accepted
2019-01-09 18:40:30 -05:00
Michael
defc89fa9a
Fixing the Accepting of contact requests
2019-01-09 22:30:26 +00:00
Michael Vogel
4f5fb40202
Merge pull request #6414 from MrPetovan/bug/4609-add-support-hubzilla-forum-link
...
Add support for Hubzilla forum mentions (starting with !)
2019-01-09 20:25:28 +01:00
Michael
6ae6a8a983
Don't show deleted contacts, set new AP contacts as "pending" until they are accepted
2019-01-09 13:23:11 +00:00
Hypolite Petovan
b7b7b1b664
Add support for Hubzilla forum mentions (starting with !)
2019-01-08 20:56:01 -05:00
Hypolite Petovan
3b80f335fa
Merge pull request #6412 from annando/issue-6149
...
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
2019-01-08 09:17:05 -05:00
Michael
8c6df8f156
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
2019-01-08 11:17:05 +00:00
Hypolite Petovan
e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app
2019-01-06 16:38:48 -05:00
Hypolite Petovan
4bf2701912
Merge pull request #6400 from annando/issue-6394
...
Issue 6394: The contact location has to be BBEncoded
2019-01-06 16:37:43 -05:00
Michael
7e19506435
Issue 6394: The contact location has to be BBEncoded
2019-01-06 21:04:10 +00:00
Michael Vogel
b7bf335e94
Merge pull request #6380 from MrPetovan/bug/5148-get-cookies-from-safari
...
Change stylesheet path name for mobile browsers
2019-01-06 20:37:33 +01:00
Michael
9a4fc0f8bd
Issue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems
2019-01-06 07:43:11 +00:00
Michael
3022abe74c
Reset the "forum" and "prv" field
2019-01-05 23:02:58 +00:00
Michael
e88734e218
Periodically update contacts / update the contact type
2019-01-05 22:04:32 +00:00
Hypolite Petovan
cb635fb3cb
Change stylesheet path name for mobile browsers
2019-01-04 20:18:31 -05:00
Hypolite Petovan
fc87c51bb4
Merge pull request #6377 from annando/ostatus-notice
...
Prevent a notice ... again
2019-01-04 11:28:31 -05:00
Michael
d8d5031935
Prevent a notice ... again
2019-01-04 15:34:53 +00:00
Hypolite Petovan
5e1ceb57de
Escape global namespaced get_app() calls
...
- Add deprecated status
2019-01-03 21:27:36 -05:00
Hypolite Petovan
e86b8ef782
Use nickname instead of email for Login Name
2019-01-03 20:42:29 -05:00
rabuzarus
67a8f9dbd4
Bugfix - the remote user also has magicLinks again
2019-01-02 17:47:53 +01:00
Hypolite Petovan
61664ee659
Update usages of User::updatePassword
...
- Add password rules in mod/settings display
2019-01-01 01:15:52 -05:00
Hypolite Petovan
58adb5b431
Add password checks in User::updatePassword
2019-01-01 01:15:51 -05:00
Hypolite Petovan
909c9d0309
Increase auto-generated passwords to 12 chars + leading capital
2019-01-01 01:14:45 -05:00
Hypolite Petovan
961f737f36
Use User::updatePasswordHashed directly when re-hashing a password
2019-01-01 01:14:44 -05:00
Tobias Diekershoff
e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications
...
Clear private message notifications
2018-12-31 08:21:55 +01:00
Tobias Diekershoff
034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings
...
Fix site theme settings modal form
2018-12-30 10:35:44 +01:00
Hypolite Petovan
3095d4aa70
Add parent to private message notifications
...
- Fix item id for Diaspora private message notification
2018-12-30 01:10:10 -05:00
Hypolite Petovan
5abc22f6c5
Replace q() with DBA methods, fix code style
...
- Remove unused variables
- Fix doc block
- Fix indentation
2018-12-30 01:08:51 -05:00
Hypolite Petovan
979230da27
Allow theme setting in module
...
- Restore theme name caching
2018-12-29 15:40:04 -05:00
Hypolite Petovan
166b8ad440
Merge pull request #6342 from annando/notices
...
Warning and notice fixed
2018-12-29 12:16:37 -05:00
Tobias Diekershoff
7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array
...
Remove util/ folder
2018-12-29 11:43:55 +01:00
Michael
fd6c64f9c1
Warning and notice fixed
2018-12-29 09:53:31 +00:00
Hypolite Petovan
37c7a18d00
Replace latin-1 by latin1 in charset detection
...
- Simplify conditional for charset conversion
2018-12-29 00:43:00 -05:00
Michael Vogel
94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile
...
Rework mod/match and mod/msearch
2018-12-27 18:04:06 +01:00
Hypolite Petovan
fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array
2018-12-27 01:47:53 -05:00
Hypolite Petovan
620395378e
Normalize uses of Strings::formatNetworkName to $network_link
...
- Unescape HTML template variable $network_link
2018-12-26 11:11:38 -05:00
Hypolite Petovan
5b74f066f2
Fix formatting in Util\Strings
2018-12-26 11:02:50 -05:00
Michael
f274357ad6
Issue-6329: Prevent double encoding
2018-12-26 11:21:42 +00:00
Hypolite Petovan
761e94d134
Remove redundant htmlentities/htmlspecialchars
2018-12-25 11:37:57 -05:00
Hypolite Petovan
56d612b2f0
Merge pull request #6323 from annando/issue-6316
...
Issue 6316: Do not double encode / Avoid notice
2018-12-25 11:26:54 -05:00
Michael
ccb9be8f28
Issue 6316: Do not double encode / Avoid notice
2018-12-25 12:12:59 +00:00
Hypolite Petovan
a8b0aa8c8d
Normalize expected format for event fields summary, desc and location
...
- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events
2018-12-24 23:00:35 -05:00
Hypolite Petovan
c9c9fc3a96
Code cleanup in events
...
- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json
2018-12-24 23:00:35 -05:00
Hypolite Petovan
acaee626f5
Remove include/ requires that are now done directly from Composer
2018-12-24 09:56:25 -05:00
Michael
c43bd890a5
The "Follow" activity shouldn't be send to Diaspora
2018-12-24 14:50:21 +00:00
Hypolite Petovan
1938ec3ebe
Rework mod/match
...
- Replace classic pager with a start index
- Remove q() calls
- Ensure template is still loaded even with no results.
- Improve Minimal Pager display of next link
2018-12-24 00:56:14 -05:00
Hypolite Petovan
a16e8d97f6
Merge pull request #6312 from annando/check-json
...
Checks if JSON is enabled
2018-12-23 18:53:32 -05:00
Hypolite Petovan
d53ff9c34d
Add support for FULLTEXT indices in Database\DBStructure
2018-12-23 15:40:49 -05:00
Hypolite Petovan
48a356dba2
Fix formatting in Database\DBStructure
2018-12-23 15:32:23 -05:00
Hypolite Petovan
2af0542eaa
Merge pull request #6310 from annando/issue-6122
...
Handles issue 6122 - the self contact will be updated when invalid
2018-12-22 18:15:02 -05:00
Michael
732308ce6d
Hopefully this fixes the tests again
2018-12-22 22:04:47 +00:00
Michael
439afc89b6
Checks if JSON is enabled
2018-12-22 20:40:00 +00:00
Michael
faa30adf68
Handles issue 6122 - the self contact will be updated when it seems to be invalid
2018-12-22 20:12:32 +00:00
Michael
c06f7ad11e
The curl result is an object, not an array
2018-12-22 17:00:28 +00:00
Jeroen De Meerleer
2d9f4b560f
Too fast
2018-12-22 17:23:18 +01:00
Jeroen De Meerleer
27eddfee27
Fixed bug
...
$curlResult is not an array
2018-12-22 17:19:34 +01:00
Hypolite Petovan
21a055f670
Merge branch '2018.12-rc' into task/6208-escape-html-true
2018-12-18 08:36:36 -05:00
Hypolite Petovan
f413abb82b
Merge pull request #6277 from annando/nextcloud-ap
...
Fix ActivityPub with Nextcloud
2018-12-17 15:28:22 -05:00
Michael
c485ca6f06
Fix ActivityPub with Nextcloud
2018-12-17 20:13:56 +00:00
Hypolite Petovan
faff105f86
Fix feed display in browser when using emojis
2018-12-16 22:58:43 -05:00
Hypolite Petovan
6d90d35d25
Enable Smarty default HTML escaping
2018-12-16 22:38:30 -05:00
Hypolite Petovan
38109665c7
Various improvements/fixes
...
- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly
2018-12-16 22:38:30 -05:00
Hypolite Petovan
b6e1571b1e
Fix various notices
2018-12-15 04:32:47 -05:00
Hypolite Petovan
607f7daf51
Add PHP 5 compatible recursive dirname()
2018-12-15 02:46:08 -05:00
Michael
b08e5ab41b
Issue 6259: Suppress contact group widget only on network page
2018-12-14 06:33:57 +00:00
Hypolite Petovan
5a802bc474
Merge pull request #6261 from annando/fix-magic
...
Fix for magic auth
2018-12-13 17:03:44 -05:00
Michael
9ea0864394
Some added to-do
2018-12-13 21:41:19 +00:00
Michael
705211100b
Fix for magic auth
2018-12-13 21:19:57 +00:00
Michael Vogel
e2f1fd1efb
Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote
...
Add check for relationship with remote user for connect display
2018-12-13 22:18:24 +01:00
Hypolite Petovan
7c11194a2c
Use Contact::isFollower instead
2018-12-13 11:53:15 -05:00
Hypolite Petovan
096093766a
Add check for relationship with remote user for connect display
2018-12-12 22:22:43 -05:00
Michael
cced018825
Possibly fix a memory issue with large posts
2018-12-11 18:48:33 +00:00
Michael
f2e2066d33
Non public content is now displayed again to visitors.
2018-12-09 13:09:49 +00:00
Michael
8fbe0d46e9
Fix for remote authentication when visiting contact's pages
2018-12-08 20:28:01 +00:00
Michael
a041c7c0fa
Issue 6236: Handle account removal messages with very low priority
2018-12-06 10:04:16 +00:00
Michael
d52d4ca355
Avoids the notice "array_merge(): Argument #1 is not an array"
2018-12-05 06:01:58 +00:00
Michael
95c150ef28
Added to-do
2018-12-04 14:20:25 +00:00
Michael
5c20f21dd8
Improved fallback when the probing fails
2018-12-04 14:17:55 +00:00
Michael
491fc5f78a
Issue 6168: "redir" now mostly use OWA
2018-12-04 07:12:55 +00:00
Hypolite Petovan
89f5a9c550
Merge pull request #6231 from annando/notice
...
Fix for notice
2018-12-03 15:08:36 -05:00
Michael
6733b77b73
Make it simpler
2018-12-03 19:29:06 +00:00
Michael
d76003797a
Fix for notice
2018-12-03 16:32:03 +00:00
Michael
fb68b50139
Fix for exceptions on external redirects
2018-12-03 15:59:53 +00:00
Hypolite Petovan
bfe809f60d
Merge pull request #6229 from annando/issue-5911
...
Issue 5911: Fix for fetching the correct user
2018-12-03 07:40:14 -05:00
Michael
51bce11b69
Issue 5911: Fix for fetching the correct user
2018-12-03 06:16:25 +00:00
Hypolite Petovan
f7c9ed5108
Add DB connection status check in Update::check
2018-12-02 20:57:41 -05:00
Hypolite Petovan
3a9db3f637
Merge pull request #6222 from annando/long-uri
...
Avoid problems with too long URI (should only happen with some RSS feeds)
2018-12-02 19:18:45 -05:00
Hypolite Petovan
57695d48b4
Merge pull request #6223 from annando/ap-dba-error
...
Fix for "Unknown column 'guid' in 'field list'"
2018-12-02 19:18:36 -05:00
Hypolite Petovan
69a73678eb
Merge pull request #6226 from annando/oembed-array
...
Ignoring OEmbed array values
2018-12-02 19:16:13 -05:00
Michael
58b614bea1
Ignoring OEmbed array values
2018-12-02 21:36:46 +00:00
Hypolite Petovan
c5558cc459
Merge pull request #6224 from annando/dba-delete-contact
...
Avoid duplicated contacts, improve contact deletion, avoid memory issues
2018-12-02 16:16:59 -05:00
Hypolite Petovan
5e60fa8210
Merge pull request #6225 from annando/http-error
...
Using the standard function to return http errors
2018-12-02 16:15:04 -05:00
Michael
649228cd3d
More detailled HTTP error explanations
2018-12-02 20:10:53 +00:00
Michael
066a040cc7
Avoid duplicated contacts, improve contact deletion, avoid memory issues
2018-12-02 16:25:25 +00:00
Hypolite Petovan
924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all
2018-12-02 10:24:50 -05:00
Michael
2fd65503da
Avoid database error that the field "guid" is not present in the contact table
2018-12-02 15:01:08 +00:00
Michael
3d14977b73
Avoid problems with too long URI (should only happen some RSS feeds)
2018-12-02 14:49:28 +00:00
Michael Vogel
5a3991d4f7
Merge pull request #6219 from MrPetovan/task/remove-x
...
Remove x()
2018-12-01 23:40:51 +01:00
Hypolite Petovan
f9f4afa35c
Merge pull request #6220 from AndyHee/patch20181129
...
Fixing permanent deletion counter
2018-12-01 08:19:38 -05:00
AndyHee
14b4fac818
Fixing permanent deletion counter
2018-12-01 13:21:54 +07:00
Hypolite Petovan
458981f75c
Replace x() by isset(), !empty() or defaults()
...
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
2018-11-30 09:06:22 -05:00
Michael
4a1f9a9bdd
Improved url detection for redirects
2018-11-30 11:27:17 +00:00
Hypolite Petovan
663ba65f17
Remove "all" value for nets parameter
2018-11-30 05:43:07 -05:00
Hypolite Petovan
11a0dd4d4c
Remove util directory
2018-11-28 23:10:21 -05:00
Hypolite Petovan
e02295e8e8
Move testargs to bin
2018-11-28 23:10:05 -05:00