Commit graph

6044 commits

Author SHA1 Message Date
Hypolite Petovan
68c86e423b
Merge pull request #8899 from annando/item-fields
Ensure to only store valid item fields
2020-07-19 12:19:53 -04:00
Michael
1e6b5e8287 Another placed replaced with "failed" 2020-07-19 11:55:42 +00:00
Michael
5bf813d0ec Use "failed" field 2020-07-19 11:42:23 +00:00
Michael
59bebe7bcf Post update added 2020-07-19 10:03:33 +00:00
Tobias Diekershoff
11c96d380c
Merge pull request #8898 from annando/spool-log
Add some logging to SpoolPost.php
2020-07-19 10:01:06 +02:00
Tobias Diekershoff
b191c8c11c spaces instead of tabs here 2020-07-19 09:58:31 +02:00
Tobias Diekershoff
c6c7c4e841 added CSV import/export of server blocklist 2020-07-19 09:49:17 +02:00
Michael Vogel
35db33bcd2 Ensure to only store valid item fields 2020-07-19 03:40:40 +02:00
Michael Vogel
86bdb2d5b9 Add some logging to SpoolPost.php 2020-07-19 03:34:19 +02:00
Michael
b50f91b3e1 Merge remote-tracking branch 'upstream/develop' into failed 2020-07-19 01:18:35 +00:00
Michael
1532f0d529 New field "failed" for gserver, gcontact and contact 2020-07-19 01:15:57 +00:00
Hypolite Petovan
1a385153f8
Merge pull request #8895 from annando/performance
Database performance updates
2020-07-18 21:05:56 -04:00
Michael Vogel
ea8965759e
Merge pull request #8893 from MrPetovan/task/8797-strip-label-shortened-url
Add shortened URL link label stripping to PageInfo::stripTrailingUrlFromBody
2020-07-18 18:06:01 +02:00
Michael Vogel
9f1d1db1ee Database performance updates 2020-07-18 17:49:10 +02:00
Hypolite Petovan
911a23f18b Use PageInfo::appendDataToBody in ActivityPub\Processor::constructAttachList 2020-07-17 19:39:12 -04:00
Hypolite Petovan
972b65ba33 Add intermediate method PageInfo::appendDataToBody
- It handles the already existing attachment in the body case
2020-07-17 19:38:28 -04:00
Hypolite Petovan
886cf40036 Ensure ParseUrl::getSiteinfo always returns the url and type keys 2020-07-17 19:18:27 -04:00
Hypolite Petovan
25b3fa83fc Rename PageInfo::appendToBody to searchAndAppendToBody 2020-07-17 19:15:43 -04:00
Hypolite Petovan
8de66c0274 Add shortened URL link label stripping to PageInfo::stripTrailingUrlFromBody
- Add test cases for shortened URL link labels
2020-07-17 17:16:22 -04:00
Hypolite Petovan
da50456675 Add Twitter source debug to Debug\Babel 2020-07-17 17:14:13 -04:00
Michael
c987785146 Use "contact-type" instead of "account-type" to avoid notices 2020-07-17 06:58:39 +00:00
Michael
0b93bcbbf9 Create a (meaningful) title 2020-07-17 05:27:45 +00:00
Michael
c47931172d Indention fixed 2020-07-17 04:46:42 +00:00
Michael
ecf6018b89 Atom feed generation is moved to the feed class 2020-07-17 04:40:20 +00:00
Michael
70699878ee Replaced more calls of "Probe::uri" with "Contact::getByURL" 2020-07-16 19:22:38 +00:00
Hypolite Petovan
dd85f48e0d
Merge pull request #8886 from annando/getidforurl-update
in "getidforurl" "no update" is now "update"
2020-07-16 09:23:30 -04:00
Hypolite Petovan
8411c13d51
Merge pull request #8887 from annando/prevent-null
Prevent "null" value when calling "getTagsFromUrl"
2020-07-16 09:15:46 -04:00
Michael
d6bf7f2cda Replace "Probe::uri" with "Contact::getByURL" 2020-07-16 10:22:14 +00:00
Michael
4a550ddcd8 Prevent "null" value when calling "getTagsFromUrl" 2020-07-16 06:13:47 +00:00
Michael
c352af8eda Reverting accidentally commited test 2020-07-16 04:45:12 +00:00
Michael Vogel
a24fca818d
Merge pull request #8879 from MrPetovan/task/8847-httpsig-quotes
Add support for token strings in HTTPSignature::parseSigheader
2020-07-16 06:36:17 +02:00
Michael
b8682190de Fix fallback on unknown contact 2020-07-16 04:18:33 +00:00
Michael
caf548e1a7 Fix fetching contacts 2020-07-16 03:52:18 +00:00
Michael
b0086a49e2 in "getidforurl" "no update" is now "update" 2020-07-15 21:08:42 +00:00
Hypolite Petovan
631095eefd
Merge pull request #8883 from annando/replace-getdetails
Replaced "getDetailsByURL" with "getByURL/getByURLForUser"
2020-07-15 13:49:27 -04:00
Michael
6d3949d54a Changed default value 2020-07-15 17:29:52 +00:00
Michael
e374aecc46 Changed parameter order for "getbyURLForUser" 2020-07-15 17:22:12 +00:00
Michael
fc0312451d Changed parameter order for getByURL 2020-07-15 17:06:48 +00:00
Michael
d9c6a46ffe Replaced "getDetailsByURL" with "getByURL/getByURLForUser" 2020-07-15 04:42:04 +00:00
Hypolite Petovan
5ba8b4a58a Add ffi_keyword_denylist key check to match previous call in Protocol\Feed 2020-07-14 14:50:52 -04:00
Hypolite Petovan
a13e004df0 Delete include/items.php
- Remove all references
2020-07-14 10:21:31 -04:00
Hypolite Petovan
3e25fc3a72 Replace *_page_info function calls with Content\PageInfo equivalent 2020-07-14 10:15:04 -04:00
Hypolite Petovan
a1d62734fa Remove consume_feed in favor of Protocol\Feed::consume 2020-07-14 10:14:05 -04:00
Hypolite Petovan
bf599be1f8 Add support for token strings in HTTPSignature::parseSigheader
- Only quoted strings were supported before
2020-07-14 09:52:03 -04:00
Hypolite Petovan
291f11a8bb Fix critical bug in Crypto::unencapsulate
- The direction of the sub-function has been corrected
2020-07-14 09:35:06 -04:00
Michael Vogel
acea18a255
Merge pull request #8872 from MrPetovan/task/5742-update-addl-features
Update additional features
2020-07-14 07:52:02 +02:00
Hypolite Petovan
059087f998 Suppress all emails when Update::run is ran with $sendEmail = false
- Address Renderer crash in the App-less context of Console
2020-07-13 17:22:21 -04:00
Michael
bbb2f1fcf5 Use "0" as default 2020-07-13 16:24:44 +00:00
Michael
baea99dee6 Unneeded variable removed 2020-07-13 14:16:44 +00:00
Michael
5a6887fb2e Use "jsonexit" 2020-07-13 13:26:09 +00:00
Michael
27deb4d188 Module classes splitted 2020-07-13 09:45:45 +00:00
Hypolite Petovan
0816e0330f Move export public calendar additional feature to core 2020-07-12 23:08:38 -04:00
Hypolite Petovan
d11125d234 Move network sidebar widget additional features to core
- Make Archives filter core
- Make Protocol filter core
2020-07-12 22:52:51 -04:00
Hypolite Petovan
6ad8bf0cca Remove network tabs additional features
- Remove New network tab
- Remove Bookmark network tab
2020-07-12 22:41:12 -04:00
Michael
2a1e6e1a74 Support Nodeinfo2 2020-07-12 21:53:17 +00:00
Michael
81928727f2 Issue 8866: Fix fetching feed links with missing base 2020-07-12 12:45:34 +00:00
Michael
0100e0df84 Some more invalid feed elements 2020-07-11 19:11:35 +00:00
Michael
e5a336ff77 Merge remote-tracking branch 'upstream/2020.06-rc' into valid-feed 2020-07-11 18:57:17 +00:00
Michael
b107a4984e Make feeds validate 2020-07-11 18:54:08 +00:00
Hypolite Petovan
090fa78057
Merge pull request #8862 from annando/issue-8860
Issue 8860: Activities weren't fetchable all the time
2020-07-11 14:14:03 -04:00
Hypolite Petovan
db7736c566
Merge pull request #8864 from annando/feed-date
Don't check the date on regular feeds
2020-07-11 14:13:37 -04:00
Michael
fb18325b6b Don't check the date on regular feeds 2020-07-11 16:29:18 +00:00
Hypolite Petovan
e91daf8f46 Add logging for unexpected Search::searchGlobalContact return in Module\Search\Acl 2020-07-11 09:19:22 -04:00
Hypolite Petovan
2af20ea17a Fix wrong condition in Diaspora\Fetch 2020-07-11 09:18:42 -04:00
Hypolite Petovan
32a8f5003f Add provision for result containing only connector profiles in Contact::getDetailsByURL 2020-07-11 09:18:18 -04:00
Hypolite Petovan
b4eea625b6 Add another check for $a->user in Content\Nav
- Fix punctuation typo in logging call
2020-07-11 09:17:23 -04:00
Michael
63dc6950d4 Issue 8860: Activities weren't fetchable all the time 2020-07-11 07:15:54 +00:00
Michael
84d8753d5f Remove the locking to improve performance 2020-07-10 19:50:16 +00:00
Michael
87f054a642 Fix message "empty network" in gcontact::getid 2020-07-10 19:49:11 +00:00
Hypolite Petovan
42a3f278f8
Merge pull request #8858 from annando/issue-8857
Issue 8857: Fix follow accept answers
2020-07-10 08:02:20 -04:00
Michael
fcb37449f3 Fix unneeded database functions in the callstack 2020-07-10 07:01:28 +00:00
Michael
c656aea152 Issue 8857: Fix follow accept answers 2020-07-10 05:30:12 +00:00
Michael Vogel
af6f6d4957 Fix speed issues with the network page 2020-07-10 00:22:26 +02:00
Michael Vogel
ced0effa2a
Merge pull request #8854 from MrPetovan/bug/notices
Address various notices again
2020-07-09 21:45:27 +02:00
Michael
1f88bb8beb Fix the plink for reshared Diaspora posts 2020-07-09 19:19:18 +00:00
Hypolite Petovan
cb03418937 Add checks for $a->user existence
- Variable can be empty/null in many cases
2020-07-09 15:09:07 -04:00
Hypolite Petovan
ad66a92deb Add check for $a->profile structure in Module\HoverCard 2020-07-09 15:09:07 -04:00
Hypolite Petovan
2db04b0c34 Add check for parent item existence in Model\UserItem::setNotificationForUser 2020-07-09 15:09:07 -04:00
Hypolite Petovan
e683bd60ae
Merge pull request #8853 from annando/issue-8836
Issue 8836: Point the event to the local post
2020-07-08 18:41:41 -04:00
Michael
77e272e8ed Issue 8836: Point the event to the local post 2020-07-08 20:42:28 +00:00
Hypolite Petovan
68ecbcea34 Add logging to unexpected case in Content\Nav
- Address part of https://github.com/friendica/friendica/issues/8475#issuecomment-653912096
2020-07-08 09:56:40 -04:00
Hypolite Petovan
1f0b7690eb Add error handling in Module\Profile\Status
- Address part of https://github.com/friendica/friendica/issues/8475#issuecomment-653912096
2020-07-08 09:49:39 -04:00
Hypolite Petovan
f2adec6a7f Add error handling in Module\Xrd
- Address part of https://github.com/friendica/friendica/issues/8475#issuecomment-653912096
2020-07-08 09:14:34 -04:00
Hypolite Petovan
5c0e079ca6
Merge pull request #8851 from annando/issue-8844
Issue 8844: Fix probing of unknown AP contacts
2020-07-07 08:56:10 -04:00
Michael
99de216d15 Issue 8844: Fiy probing of unknown AP contacts 2020-07-07 04:47:15 +00:00
Hypolite Petovan
6cde7afa53 Exclude deleted user accounts from "active" user list in Model\User 2020-07-06 15:26:39 -04:00
Hypolite Petovan
b4910066b6 Rename -q option to -y for user delete console command
- Name was misleading, it isn't quiet mode but non-interactive mode
2020-07-06 15:25:49 -04:00
Hypolite Petovan
78b424c7fd Add support for "hs2019" algorithm value in Util\HTTPSignature 2020-07-04 13:12:59 -04:00
Hypolite Petovan
d5acd5f96a Add expected support for sort strings in select() parameters
- Fix unexpected behaviors with calls already using the sort strings
2020-07-01 22:54:14 -04:00
Hypolite Petovan
20a4799902 Update references to the friendica/friendica-directory stable branch 2020-06-30 15:25:17 -04:00
Hypolite Petovan
9c6fbc6a74 Update references to the friendica/friendica stable branch 2020-06-30 15:25:16 -04:00
Hypolite Petovan
b9873a88a5
Merge pull request #8832 from annando/fix-db-error
Fix database error ""Unknown column 'parent-item.author-id'"
2020-06-30 14:55:52 -04:00
Michael
6aadb6b923 Changed structure 2020-06-30 17:51:03 +00:00
Michael
8f1635d8fd Fix database error ""Unknown column 'parent-item.author-id'" 2020-06-30 05:49:22 +00:00
Michael
c947b7f211 "print_r" in logging replaced / obsolete stuff removed 2020-06-29 20:22:00 +00:00
Michael
9a47e51115 Next logger calls replaced 2020-06-28 18:22:29 +00:00
Michael
f6ae7db0ca Further deprecated calls replaced 2020-06-28 17:50:11 +00:00
Michael
52bb1ff0f1 Some more replaced logger 2020-06-28 17:35:56 +00:00
Michael
2350c6ab57 Replace deprecated Logger calls 2020-06-28 15:43:58 +00:00
Tobias Diekershoff
91c843608b
Merge pull request #8825 from annando/render-speed
Improve render speed by not probing for unknown contacts
2020-06-28 16:18:36 +02:00
Michael Vogel
f611c99ad7 Improve render speed by not probing for unknown contacts 2020-06-28 15:57:33 +02:00
Michael Vogel
77e0d8c7bc
Merge pull request #8821 from MrPetovan/bug/fix-item-source-route
Improve Module\Admin\Item\Source
2020-06-28 14:02:25 +02:00
Hypolite Petovan
7d726dbb0c Improve Module\Admin\Item\Source
- Use router parameter
- Accept full URLs with GUID in form
- Fix 500 error when item with guid doesn't exist
2020-06-28 07:51:17 -04:00
Tobias Diekershoff
64ba2f9b61
Merge pull request #8823 from annando/keyword-notices
Fix notice "Undefined index: keywords"
2020-06-28 11:10:37 +02:00
Michael
a1a9d4f657 Fix processing of received coordinates 2020-06-28 08:46:27 +00:00
Michael Vogel
713eda1dfe Empty lines removed 2020-06-28 08:23:53 +02:00
Michael Vogel
2756c3249b Fix notice "Undefined index: keywords" 2020-06-28 08:18:35 +02:00
Michael Vogel
c852e1479c
Merge pull request #8811 from MrPetovan/task/8517-probe-mobile-twitter
Add support for mobile profile URL to core twitter probing
2020-06-27 17:32:19 +02:00
Hypolite Petovan
3b701371ea
Merge pull request #8820 from annando/fix-author-network
Fix notice "Undefined index: author-network"
2020-06-27 11:28:14 -04:00
Michael
64dc3519a4 Fix notice "Undefined index: author-network" 2020-06-27 15:10:06 +00:00
Hypolite Petovan
0b38826a73 Simplify sender handle assignment in Model\Mail 2020-06-27 09:34:29 -04:00
Hypolite Petovan
e78db3fac6
Merge pull request #8817 from annando/ap-diaspora-delivery
Prevent delivering AP comments to Diaspora
2020-06-27 09:30:11 -04:00
Michael
de19f94aca Prevent delivering AP comments to Diaspora 2020-06-27 12:18:36 +00:00
Michael
ef56837b9e Fix receiving non public posts from AP 2020-06-27 10:35:45 +00:00
Hypolite Petovan
2c2db55298 Add support for mobile profile URL to core twitter probing 2020-06-26 12:52:40 -04:00
Hypolite Petovan
50d05cec83 Ensure url property of Probe::uri result is used authoritatively
- Some profile URLs aren't canonical and need to be updated during probe
2020-06-26 12:52:39 -04:00
Michael
a0ee12aade Fix notice "Undefined index: forum" 2020-06-26 05:29:00 +00:00
Michael
019a9d44c5 New function to fetch contact data by url 2020-06-26 05:28:25 +00:00
Michael
d8f9bb1e0a Unify code structure 2020-06-25 20:41:34 +00:00
Michael
4d986526f9 Issue 8807: Improved feed detecting 2020-06-25 20:29:21 +00:00
Michael Vogel
95ed81de5f
Merge pull request #8805 from MrPetovan/bug/notices
Add logging to rare condition in Model\Profile::sidebar
2020-06-25 08:39:28 +02:00
Michael Vogel
1625dfa0a4
Merge pull request #8804 from MrPetovan/bug/warnings
Add type hint to Database::insert
2020-06-25 08:37:41 +02:00
Hypolite Petovan
06b992a5dd Add expected whitespace before Widget::unavailableNetworks() output in Module\Contact 2020-06-24 18:49:55 -04:00
Hypolite Petovan
192576f01a Add logging to rare condition in Model\Profile::sidebar
- Adresses https://github.com/friendica/friendica/issues/8475#issuecomment-647104375
2020-06-24 09:56:11 -04:00
Hypolite Petovan
5cf5869b04 Add type hint to Database::insert
- Will escalate warning to fatal error in https://github.com/friendica/friendica/issues/8474#issuecomment-646802016
2020-06-24 09:36:34 -04:00
Michael Vogel
7fd2c00171
Merge pull request #8792 from MrPetovan/task/share-block-guid
[frio] Add local post link to share block when guid attribute is present
2020-06-23 21:26:07 +02:00
Hypolite Petovan
faeffff8a3 [pre] blocks now preserve spaces
- Added test case
- Added English documentation
2020-06-23 07:53:18 -04:00
Hypolite Petovan
251a3791dd Keep spaces after non-tags in Content\BBCode::convert
- Added test case
2020-06-23 07:52:38 -04:00
Hypolite Petovan
d2aa68106b Make guid attribute available to convertShare callback 2020-06-21 09:45:00 -04:00
Hypolite Petovan
912ff069c0 Update getShareOpeningTag::getShareOpeningTag method signature
- Optional parameter $guid is now at the end
- Always provided parameter $posted is now mandatory
2020-06-21 09:42:37 -04:00
Tobias Diekershoff
797eff853a
Merge pull request #8790 from MrPetovan/bug/notices
Fix latest notice messages
2020-06-20 18:07:54 +02:00
Hypolite Petovan
a83681e93a Use Contact::getDetailsByURL instead of custom query in Protocol\OStatus
- Address part of https://github.com/friendica/friendica/issues/8475#issuecomment-646457104
2020-06-19 07:10:39 -04:00
Hypolite Petovan
aafef02789 Replace obsolete anonymity test with a slightly less obsolete one in Model\Item
- Address part of https://github.com/friendica/friendica/issues/8475#issuecomment-646457104
2020-06-19 07:10:27 -04:00
Hypolite Petovan
51bae35d2a Account for contact.ffi_keyword_denylist field being NULL by default in Protocol\Feed 2020-06-19 07:01:05 -04:00
Hypolite Petovan
1f20111c80 Replace share_header calls with BBCode::getShareOpeningTag 2020-06-18 08:53:57 -04:00
Hypolite Petovan
cd74fb8609 Add new Content\BBCode::getShareOpeningTag 2020-06-18 08:53:30 -04:00
Hypolite Petovan
f544c8383b Implement pull request feedback
- Improve formatting of drop_item in mod/item
- Replace deprecated Logger::log() calls in Protocol\Feed::consume
2020-06-17 21:44:28 -04:00
Hypolite Petovan
4e7c45f835 Add PageInfo result panels to Debug\Babel 2020-06-17 13:24:44 -04:00
Hypolite Petovan
f3323aff5e Deprecate page_info functions to new PageInfo class
- Add tests for parts not using remote requests
- Add scheme requirement for page info URLs
- Add policy to keep label from stripped Page Info links
2020-06-17 13:24:44 -04:00
Hypolite Petovan
eba964ec12 Deprecate consume_feed() in favor of Protocol\Feed::consume 2020-06-17 13:24:44 -04:00
Hypolite Petovan
e3d20b4366 Move subscribe_to_hub function to Worker/OnePoll from include/items
- It was its only usage
2020-06-17 13:24:44 -04:00
Hypolite Petovan
51925f2994 Add new endsWith method to Util\Strings 2020-06-17 13:24:44 -04:00
Michael Vogel
df03b19a9d
Merge pull request #8783 from MrPetovan/bug/8488-exclude-img-tags
Exclude [img] tags from tag replacement
2020-06-17 08:20:50 +02:00
Michael
1a86167ac5 Possibly fix "Undefined index: url" 2020-06-16 20:41:34 +00:00
Hypolite Petovan
f9ecbbd743 Exclude [img] tags from tag replacement
- It broke image captions by inserting an HTML link inside an HTML attribute
2020-06-16 16:34:16 -04:00
Michael
8707ced2f7 Hopefully fixes notice "Undefined index: gravity" 2020-06-16 20:30:25 +00:00
Michael Vogel
c5e5defc29
Update src/Module/Admin/Site.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2020-06-16 14:37:36 +02:00
Michael
016c99935c Different comment limits for single view 2020-06-16 06:49:53 +00:00
Michael
e1dac1a87a Categories are not showing up at the bottom of the post
Fixes friendica/friendica#8766
2020-06-15 03:43:51 +00:00
Hypolite Petovan
4dc68b32b5
Merge pull request #8772 from annando/post-update
Speed up post update for gsid
2020-06-14 14:57:10 -04:00
Michael Vogel
6b93a7e395 Speed up post update for gsid 2020-06-14 18:09:59 +02:00
Michael
8ec2b21a14 Abuse mail received because of "unusual traffic"
Fixes friendica/friendica#8663
2020-06-14 15:47:47 +00:00
Hypolite Petovan
5f43f56f72
Merge pull request #8770 from annando/probing
Reduced network request when probing
2020-06-14 11:18:16 -04:00
Michael Vogel
f10062dfdb
Merge pull request #8617 from MrPetovan/task/8220-twitter-followers-list
(Re)Implement Twitter contact API endpoints
2020-06-14 16:06:22 +02:00
Michael
b948887221 Reduced network request when probing 2020-06-14 13:37:28 +00:00
Hypolite Petovan
f60697110e Clear all previous template variables before replacing Macros in FriendicaSmartyEngine
- Prevents variables leaking between replaceMacros() calls
2020-06-12 22:06:09 -04:00
Michael Vogel
aedbb0d627
Merge pull request #8753 from MrPetovan/bug/fatal-errors
Remove dependency to App in Contact::createFromProbe
2020-06-12 06:58:20 +02:00
Michael Vogel
9b85d0b16e
Merge pull request #8740 from MrPetovan/task/frio-improve-share-display
[frio] Improve share blocks display
2020-06-11 07:32:29 +02:00
Michael Vogel
a5d1c0ff78
Merge pull request #8754 from MrPetovan/task/8676-ap-attachments
Strip the link preview URL from the end of the body if any in ActivityPub\Processor
2020-06-11 06:29:33 +02:00
Hypolite Petovan
7919860274
Merge pull request #8757 from annando/simplify-probe
Simplify the probing process
2020-06-10 15:33:03 -04:00
Michael
e49de92cd4 Simplify the probing process 2020-06-10 19:19:10 +00:00
Hypolite Petovan
db3f90ec01 Replace mention to $_SERVER with parameter in Content\Markdown::convert
- $_SERVER key isn't always available, no idea what it was used for exactly
2020-06-10 11:40:18 -04:00
Hypolite Petovan
53b951a179 Strip the link preview URL from the end of the body if any in ActivityPub\Processor 2020-06-10 11:19:44 -04:00
Hypolite Petovan
a5a7855d39 Remove dependency to App in Contact::createFromProbe
- Address https://github.com/friendica/friendica/issues/8473#issuecomment-641259906
2020-06-10 10:36:42 -04:00
Hypolite Petovan
9b2d758c1a Add no-parsing block escaping in BBCode::setMentions 2020-06-10 10:16:07 -04:00
Hypolite Petovan
eaa7740da6 Remove superfluous code
- Remove explicit default parameter value in BBCode::convertShareCallback
- Remove Probe::$baseurl reset since the twitter probe sets the `baseurl` property
- Remove baseurl guessing in Probe::detect
2020-06-10 10:15:54 -04:00
Hypolite Petovan
a5f0225d60 Add mention support to shared content 2020-06-10 10:15:54 -04:00
Hypolite Petovan
e7f50a05d1 Move handle_tag() to Content\Item::replaceTag 2020-06-10 10:13:32 -04:00
Hypolite Petovan
be41095936 Add probe data return if Contact::getDetailsByURL didn't yield a result in Contact::getDetailsByAddr 2020-06-10 09:56:01 -04:00
Hypolite Petovan
2233fa0e46 Fix issue with Probe returning local baseurl for probed Twitter accounts 2020-06-10 09:56:01 -04:00
Hypolite Petovan
5f18d27b0b
Merge pull request #8752 from annando/posts-from-id
Avoid unneeded database calls when showing posts of contacts
2020-06-10 00:11:51 -04:00
Hypolite Petovan
8e14836152
Merge pull request #8751 from annando/notice
Fix notice "Undefined index: template in src/Network/Probe.php on line 598"
2020-06-10 00:10:32 -04:00
Michael
0e9331a1ff Avoid unneeded database calls when showing posts of contacts 2020-06-09 22:38:06 +00:00
Michael
e485836a24 Fix notice " Undefined index: template in src/Network/Probe.php on line 598" 2020-06-09 20:44:55 +00:00
Michael Vogel
6a23f51549
Merge pull request #8749 from MrPetovan/task/8676-ap-attachments
Add quote support in attachment title in ActivityPub\Processor
2020-06-09 22:23:26 +02:00
Michael Vogel
ad47ff50a9
Merge pull request #8729 from MrPetovan/bug/8726-mention-parsing
Add tag escaping to BBCode::setTags
2020-06-09 22:03:06 +02:00
AlfredSK
66723023f9 fix-continue-warnings 2020-06-09 16:40:36 +00:00
Hypolite Petovan
fdb22320ff Add quote support in attachment title in ActivityPub\Processor 2020-06-09 08:53:48 -04:00
Hypolite Petovan
8111ede2e5 Add support for max_id parameter in new Twitter contact API endpoints
- Use filter_input instead of manual type casting
2020-06-09 08:36:53 -04:00
Hypolite Petovan
7a5afc10bb Implement Twitter contact endpoints
- Implement /followers/ids
- Implement /followers/list
- Reimplement /friends/ids
- Reimplement /friends/list
- Update API reference
- Remove obsolete tests
2020-06-09 08:36:46 -04:00
Hypolite Petovan
173264eaab Add Twitter User Object and Factory 2020-06-08 21:51:42 -04:00
Hypolite Petovan
89b3ae2657 Add null/empty string parameter value case in BBCode::convert
- Remove obsolete coalesce operator uses
2020-06-08 19:15:08 -04:00
Hypolite Petovan
76460ddd2d Add tag escaping to Item::setHashtags
- Add return value to Item::setHashtags
2020-06-08 18:40:21 -04:00
Hypolite Petovan
472018191b Add tag escaping to BBCode::setTags 2020-06-08 18:40:20 -04:00
Hypolite Petovan
0bc7b89530 Replace existing block escaping by performWitEscaped* calls 2020-06-08 18:40:20 -04:00
Hypolite Petovan
348b71d0b0 Add new Strings::performWithEscapedBlocks methods
- Add new BBCode::performWithEscapedTags method
- Add tests
2020-06-08 18:40:20 -04:00
Hypolite Petovan
4d3dd28c44 Add check for existing attachment in ActivityPub\Processor::constructAttachList 2020-06-07 16:23:57 -04:00
Hypolite Petovan
01e9beffc2 [ActivityPub] Add support for more attachments structures
- Add support for type: Page into [attachment], type: Link using href attribute
- Ensure Receiver::process* parameter is an array
- Remove superfluous eptiness check in JsonLD::fetchElementArray
2020-06-07 15:41:11 -04:00
Hypolite Petovan
8eeb7807d3 Replace remaining instances with "allowlist", "denylist" and "blocklist" 2020-06-07 11:24:56 -04:00
Hypolite Petovan
530ff51898 Rename system config value to db_log_index_denylist 2020-06-07 11:24:56 -04:00
Hypolite Petovan
34463f37e4 Rename contact table column to ffi_keyword_denylist 2020-06-07 11:24:52 -04:00
Hypolite Petovan
586eddbd1a
Merge pull request #8738 from annando/jsonld-tests
Added tests for JsonLD class
2020-06-07 10:23:12 -04:00
Michael Vogel
3e2ebcb1c7
Merge pull request #8741 from MrPetovan/task/hook-probe-detect
Add probe_detect hook
2020-06-06 23:06:51 +02:00
Michael
c38452d16e Avoiding unwanted side effects 2020-06-06 19:29:37 +00:00
Hypolite Petovan
5cb3a5ff74 Remove obsolete Twitter probing
- Profile page source offers no details about accounts when not logged in
2020-06-06 15:08:21 -04:00
Hypolite Petovan
6bed6d5587 Add probe_detect hook 2020-06-06 14:54:04 -04:00
Michael
d68372c872 Issue 8732: Fix fetch aved searches 2020-06-06 18:45:16 +00:00
Michael
bc4e5b4d69 Issue 8735: Ensure the correct data type for "hide" 2020-06-06 08:11:19 +00:00
Hypolite Petovan
1304e14572 Exit with an error if profile info isn't available in Module\NoScrape 2020-06-05 14:28:11 -04:00
Michael
7374104f29 Fix Notice "Undefined index: subscribe" 2020-06-05 10:44:36 +00:00
Michael
7b70eefbb6 Remove the "addr" when webfinger fails 2020-06-04 22:08:31 +00:00
Michael
62217735f0 Use webfinger in apcontact fetch 2020-06-04 21:55:14 +00:00
Hypolite Petovan
e0152bec7d Remove Twitter exception for shared blocks in Text\BBCode::convertShareCallback
- Twitter stopped supporting OEmbed which defaulted to an undesirable fallback
2020-06-04 11:13:31 -04:00
Hypolite Petovan
f68652d61c Revert "Move share content conversion before link handling in Text\BBCode::convert"
This reverts commit 010ec99b35.
2020-06-04 11:11:44 -04:00
Hypolite Petovan
010ec99b35 Move share content conversion before link handling in Text\BBCode::convert 2020-06-03 22:02:01 -04:00
Michael
ad2f45d1d8 Fix fatal errors because of mixed data types 2020-06-03 06:57:51 +00:00
Michael Vogel
5630c9f132
Merge pull request #8719 from MrPetovan/task/8717-help-console-globalcommunitysilence
Improve language of console globalcommunitysilence help line
2020-06-03 06:14:56 +02:00
Hypolite Petovan
779099a491 Improve language of console globalcommunitysilence help line 2020-06-03 00:03:58 -04:00
Hypolite Petovan
a2de7d25ec Use expected return variable type in Network\Probe::detect 2020-06-02 23:41:10 -04:00
Michael
50e5bd6703 Let "subscribe" be filled at every time to avoid a notice 2020-06-02 19:11:37 +00:00
Michael
736f69c33a Changed logging 2020-06-02 06:47:44 +00:00
Michael
e379698227 Issue 8675: reduce requests of foreign pages 2020-06-01 21:52:31 +00:00
Michael
e374e5752a Changed deprecated log calls 2020-06-01 13:51:58 +00:00
Michael
7ac4a08e1b Additional "is null" check in post update / create the "vid" if needed 2020-05-31 15:48:31 +00:00
Michael
46e2423af9 Fix wrong variable names 2020-05-30 17:06:59 +00:00
Michael
2eb371dcaf Fix foreign key constraint with "post-tag" table 2020-05-30 16:36:09 +00:00
Michael
9328eee550 Missing gravity 2020-05-29 22:19:59 +00:00
Michael
b837c487c5 Fix "gravity" notice 2020-05-29 21:41:10 +00:00
Michael Vogel
235f4eaa89
Merge pull request #8697 from MrPetovan/task/8691-like-links-one-way
Make like links one way
2020-05-29 15:33:24 +02:00
Hypolite Petovan
f0b6f025d2 Appease VSCode inferior static analysis in Model\Item 2020-05-29 09:01:37 -04:00
Hypolite Petovan
0efd3dedeb
Merge pull request #8705 from annando/thread-uri-id
Add "uri-id" to the "thread" table
2020-05-28 23:59:44 -04:00
Michael Vogel
c6aa42dd4e
Merge pull request #8696 from MrPetovan/bug/8694-event-network-unkn
Assign default protocol to new events
2020-05-29 05:05:35 +02:00
Michael
3258216e8d Add "uri-id" to the "thread" table 2020-05-28 21:44:55 +00:00
Michael
0acb5d4558 "parent = id" is replaced with gravity check 2020-05-28 16:02:36 +00:00
Michael
db907c2ff8 Issue 8700: Resolvable activities 2020-05-27 19:05:33 +00:00
Hypolite Petovan
df1c74bd33 Make "like" links one way
- Updated dolike() function to accept a "un-" switch
- [frio] Updated doLikeAction() function to call dolike() instead of having duplicated code
- Added boolean logic (with explanatory truth table) to smartly delete existing activities in Model\Item::performActivity
- Moved verb/activity parameter handling closer to their use in Model\Item::performActivity
- Updated all references to dolike() and doLikeAction() to include the "un-" switch
2020-05-27 08:41:13 -04:00
Hypolite Petovan
e20d5ff0b5 Fix the event feature disabling logic in Object\Post
- Conditions on item network and dislike feature presence were mixed which could have led to unexpected behaviors
2020-05-27 08:41:12 -04:00
Hypolite Petovan
2d217129b9 Improve performance of asynchronous like/update
- Make the like module return earlier instead of outputting a full empty HTML page
- Update the force_update variable earlier to prevent spilling on multiple unrelated nav update calls
2020-05-27 08:41:10 -04:00
Hypolite Petovan
05c3d02854 Assign default protocol to new events
- This restores event interactions on the items
2020-05-27 08:23:15 -04:00
Michael
973abb6196 Replace "id = parent" checks with "gravity" checks 2020-05-27 12:19:06 +00:00
Michael
465e1890b5 Fix notice because of missing array item 2020-05-27 03:19:17 +00:00
Michael
4d23de997a Updated postupdate function 2020-05-26 21:45:57 +00:00
Michael
ba9cf32f36 The "item-activity" is removed 2020-05-26 05:18:50 +00:00
Michael
327cdf21ce Some more "baseurl" improvements 2020-05-24 20:40:00 +00:00
Hypolite Petovan
669124e72f
Merge pull request #8678 from annando/gserver-detection-type
Improved server detection / gsid introduced
2020-05-22 10:25:37 -04:00
Michael
21ab11ac18 Only fetch the gsid when it had been empty before 2020-05-22 11:29:58 +00:00
Michael
e27915a819 Centralized gsid generation 2020-05-22 10:10:24 +00:00
Michael
071505f024 Added documentation, simplified code 2020-05-22 04:52:43 +00:00
Michael
95b4f35a12 Improved server detection / gsid introduced 2020-05-22 04:19:32 +00:00
Michael Vogel
58f06a830f
Merge pull request #8671 from MrPetovan/bug/8623-relative-href
Add support for relative URL in HTML documents
2020-05-21 13:51:26 +02:00
Hypolite Petovan
04e8d5be2c Remove deprecated/implicit filter_var() flags in Network\Probe::ensureAbsoluteLinkFromHTMLDoc
- Suppresses a test breaking notice message in PHP 7.4
2020-05-21 02:27:33 -04:00
Hypolite Petovan
3ef987e4e1 Add new Network\Probe::ensureAbsoluteLinkFromHTMLDoc method
- Add supports for relative URL in href attributes to probe feed URL
2020-05-21 00:25:48 -04:00
Hypolite Petovan
c2105f93d1 Remove duplicate curl call in Network\Probe::getFeedLink
- Add page body argument instead
- Expand method scope to allow tests
2020-05-21 00:25:48 -04:00
Hypolite Petovan
6fd13300cb Fix wrong variable name in Model\Attach
- Prevented attachment data from being retrieved from storage
2020-05-20 18:28:14 -04:00
Michael
a77c0194dc Issue 8663: Prevent abusive behaviour when probing servers 2020-05-20 06:57:46 +00:00
Michael Vogel
b7b6fae389
Update src/Model/Verb.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2020-05-19 22:42:01 +02:00
Michael
eeda115e32 Adding some more verb handling 2020-05-19 20:32:15 +00:00
Michael
ef3dc72dca Ensure unified order of 'verb' records 2020-05-19 05:51:58 +00:00
Hypolite Petovan
3cc3bfe531
Merge pull request #8660 from annando/item-insert
Improved item insert functionality
2020-05-18 19:35:26 -04:00
Michael
e09965fcc5 Simplified code 2020-05-18 22:34:47 +00:00
Michael Vogel
e315bc3eae
Merge pull request #8657 from MrPetovan/bug/8653-catch-template-engine-errors
Catch template engine errors
2020-05-19 00:22:45 +02:00
Hypolite Petovan
8b05af176c Add detailed error messages for admin user in Core\Renderer and Render\FriendicaSmartyEngine 2020-05-18 18:10:21 -04:00
Michael
2a56370cf4 Merge remote-tracking branch 'upstream/develop' into annando/issue8514 2020-05-18 21:38:17 +00:00
Michael
2f8c6f00b5 Improved item insert functionality 2020-05-18 21:34:57 +00:00
Hypolite Petovan
64e89a516d Restore default parameter value in Core\Renderer::replaceMacros 2020-05-18 10:01:51 -04:00
Hypolite Petovan
ef9b51e631 Replace direct error output and exit by logger + exception in Core\Renderer
- Same in Render\FriendicaSmartyEngine
2020-05-18 01:21:58 -04:00
Hypolite Petovan
346f99b877 Add new TemplateEngine->testInstall method
- Add admin summary template engine error messages
2020-05-18 01:20:47 -04:00
Hypolite Petovan
c6ba92c43d Refactor template engine code
- Convert ITemplateEngine interface to abstract class
- Remove dependency to App in FriendicaSmarty and FriendicaSmartyEngine
- Normalize replaceMacro parameter behavior using Smarty template string prefixes
- Remove obsolete FriendicaSmarty->parsed method
- Update unused Smarty directory paths
2020-05-18 01:18:41 -04:00
Hypolite Petovan
75a0b80888 Add new Strings::startsWith method
- Move previous method to Strings::startsWithChars and update every known call
2020-05-18 01:05:38 -04:00
Michael
efb1c630fd Fix warnings ("Divide by zero" and "key parameter is not a valid public key") 2020-05-18 02:58:08 +00:00
Michael
e737eea17d Issue 8458-2: Now all unicode emojis should work 2020-05-17 21:46:54 +00:00
Michael
d7f0ffdbc1 Issue 8458: Display big emojis
Fixes #8458
2020-05-17 16:55:54 +00:00
Hypolite Petovan
db63d1d501
Merge pull request #8652 from annando/annando/issue8582
Issue 8582: "cid" in "network" is now "contactid"
2020-05-17 11:41:53 -04:00
Hypolite Petovan
8a96fe6d7f
Merge pull request #8648 from annando/annando/issue8565
Issue 8565: Sanitize  input data
2020-05-17 11:40:18 -04:00
Michael
3b1d89252a Issue 8582: "cid" in "network" is now "contactid"
Fixes #8582
2020-05-17 15:01:27 +00:00
Michael
bc26c980f0 Reverts test changes 2020-05-17 13:59:05 +00:00
Michael
a3c4021f12 Issue 8514: Make paging for searcg items work again
Fixes #8514
2020-05-17 13:51:56 +00:00
Hypolite Petovan
90b1355555
Merge pull request #8649 from annando/annando/issue8550
Issue 8550: New experimental database configurations
2020-05-17 09:11:30 -04:00
Michael
7ace1049bb Issue 8572: Ensure to log database errors 2020-05-17 10:56:19 +00:00
Michael
4d4678ceb6 New experimental database configurations 2020-05-17 09:03:56 +00:00
Michael
d771c50d63 Issue 8565: Sanitize input data
Fixes #8565
2020-05-17 06:13:58 +00:00
Michael
ecde6b0066 Issue 8635: Create foreign keys without constraint name 2020-05-16 20:57:04 +00:00
Michael
b625797591 issue 8642: Make hashtags more compatible 2020-05-16 18:38:50 +00:00
Hypolite Petovan
013d75c2ec
Merge pull request #8644 from annando/bbcode-constants
Use constants for the BBCode modes
2020-05-16 13:15:24 -04:00
Michael
b192810288 Still more missing places replaced 2020-05-16 16:41:37 +00:00
Michael
76d845a138 Found another occurence replaced with constants 2020-05-16 16:39:44 +00:00
Michael
0da0580a82 use "self" 2020-05-16 16:32:37 +00:00
Michael
0cf517ad76 Use constants for the BBCode modes 2020-05-16 16:28:15 +00:00
Michael
b8cf415f0d Issue 8635 - Handle weird default values
This handles an issue that occured in #8635 (But will not fix the issue behind this)
2020-05-16 14:23:17 +00:00
Michael
28e7564d79 Added some more sql commands to the list 2020-05-16 10:21:16 +00:00
Michael
8e12edc375 Improved code 2020-05-16 10:04:09 +00:00
Michael
4faef126ff Improved structure 2020-05-16 09:01:54 +00:00
Michael
4e1b1c0811 Issue 8635: Avoid concurrent database updates
Possibly helps with #8635
2020-05-16 08:15:51 +00:00
Michael
28e52f4db1 Fixed table name 2020-05-16 06:14:25 +00:00
Michael
14f814e6ba Issue 8636: Check and fix data before foreign key creation 2020-05-16 06:12:28 +00:00
Michael
ec3290da3b We already have got a function to check if a table exists 2020-05-15 18:32:53 +00:00
Michael
d70b77288d Call the initial value check in the test 2020-05-15 18:08:06 +00:00
Michael
e333f45d0f Ensure that the initial values are set 2020-05-15 17:49:07 +00:00
Michael
89b47afb09 Testmode added 2020-05-15 15:41:50 +00:00
Michael
d71c3e0812 Activate test mode for database 2020-05-15 15:05:17 +00:00
Michael
7a82171bfe The "term" table is removed 2020-05-15 06:50:20 +00:00
Hypolite Petovan
f58d42e317
Merge pull request #8632 from annando/fix-fatal
Fix a fatal error when an undo doesn't contain an object
2020-05-14 09:06:42 -04:00
Michael
079738a8b5 Fix a fatal error when an undo doesn't contain an object 2020-05-14 04:53:56 +00:00
Michael Vogel
cc8491223e
Merge pull request #8631 from MrPetovan/task/remove-item-tag-field
Remove references to obsolete virtual tag item.tag
2020-05-14 06:29:46 +02:00
Michael
3dc231ffd6 Code standards 2020-05-14 03:48:26 +00:00
Hypolite Petovan
c2a76db290 Add type filter parameter to Tag::getCSVByURIId 2020-05-13 22:35:39 -04:00
Hypolite Petovan
75977ee72b Remove remaining references to cirtual field item.tag 2020-05-13 22:35:13 -04:00
Michael
04005f2878 Added documentation 2020-05-13 19:26:59 +00:00
Michael
7ea40ea796 Rearranged calls 2020-05-13 18:45:31 +00:00
Michael
13bd43f3f6 Store the diaspora signature differently 2020-05-13 05:48:26 +00:00
Michael
c4062ddb3b Removed "insert" parameter 2020-05-12 21:49:12 +00:00
Michael
06da3084f5 Restructured item insert 2020-05-12 20:13:48 +00:00
Michael
cd82c527f5 Removed useless error handling 2020-05-12 09:05:37 +00:00
Michael
faaf3d89e3 The next boolean 2020-05-11 19:07:18 +00:00
Michael
c5be1092d0 Use "quoteIdentifier" 2020-05-11 18:59:36 +00:00
Michael
57b4c70f9e Merge remote-tracking branch 'upstream/develop' into dbstructure 2020-05-11 18:54:19 +00:00
Michael
ae2288bc7d Fix "Uncaught TypeError: Argument 1 passed to :incrementQueueDone()" 2020-05-11 18:28:41 +00:00
Michael
a7f777ee43 DBStructure is now using "q(" nevermore 2020-05-10 20:23:58 +00:00
Michael
7f55e1b2bc We now support real foreign keys 2020-05-10 14:55:03 +00:00
Hypolite Petovan
d35dc64660
Merge pull request #8611 from annando/issue-8610
Issue 8610: Implicit mentions work again
2020-05-09 16:03:45 -04:00
Hypolite Petovan
1e53f28b18
Merge pull request #8615 from annando/verb
We now store verbs in a new side table
2020-05-09 16:03:15 -04:00
Michael
258e9df064 Moved the check for a comment to a different place 2020-05-09 15:50:49 +00:00
Michael
19b5b83ac6 Forgotten "close" 2020-05-09 15:43:41 +00:00
Michael
5fe6a2dfcd We now store verbs in a new side table 2020-05-09 15:38:40 +00:00
Hypolite Petovan
184fa9f980 Skip user removal if it's already been removed in Console\User 2020-05-09 11:05:20 -04:00
Michael
9679fad5e2 Concentrating functionality 2020-05-09 08:55:10 +00:00
Michael
a1fda8f74a Dant try to add mentions on starting posts 2020-05-09 08:39:21 +00:00
Michael
eb4c14695c The implicit mentions are added in any case 2020-05-09 08:35:58 +00:00
Michael
556cc3fb13 Always mention the parent author 2020-05-09 08:08:33 +00:00
Michael
bebc6615fc Removed unneeded functionality 2020-05-09 06:51:13 +00:00
Michael
d5f64e1156 Issue 8610: Implicit mentions work again 2020-05-09 06:33:59 +00:00
Hypolite Petovan
55acb51148 Check $item_profile is populated in ActivityPub\Transmitter
- Address https://github.com/friendica/friendica/issues/8475#issuecomment-625716446
2020-05-08 09:31:36 -04:00
root
68b63ec647 avoid notice in probe.php 2020-05-08 13:06:40 +00:00
Michael
856cf7f664 Don't count and fetch "follow" activities 2020-05-07 18:39:39 +00:00
Hypolite Petovan
8abaac6d79 Account for missing location value in ActivityPub\Receiver 2020-05-07 10:14:38 -04:00
Michael Vogel
64f1bc8a68
Merge pull request #8589 from MrPetovan/task/8588-ap-contacts-endpoint
Only output ActivityPub contacts in /followers and /following AP endpoints
2020-05-07 10:37:46 +02:00
Hypolite Petovan
63e7996891 Improve formatting in ActivityPub\Transmitter 2020-05-07 03:47:45 -04:00
Hypolite Petovan
eb8dcd43f3
Merge pull request #8597 from annando/notice
Fixed notice because of missing field
2020-05-07 03:46:38 -04:00
Michael
e3c08215f6 Fixed notice because of missing field 2020-05-07 07:34:00 +00:00
Hypolite Petovan
3c0547c6e8 Ensure post location received through ActivityPub is in plaintext 2020-05-06 22:41:59 -04:00
Michael
065fad31f1 ignore "follow" activities that are not from the user 2020-05-06 21:19:48 +00:00
Michael
be9519708e Don't relay participation messages 2020-05-06 20:43:00 +00:00
Hypolite Petovan
4e579e77f5 Only output ActivityPub contacts in /followers and /following
- Join contact table with apcontact to weed out non-AP contacts
2020-05-06 15:29:35 -04:00
Michael
806f4a0142 Added logging 2020-05-06 19:00:56 +00:00
Michael
7dea1ff6bd Issue 8586 again: Don't transmit participations 2020-05-06 17:30:21 +00:00
Michael
b9ee46824f Added missing field 2020-05-06 15:37:04 +00:00
Michael
62a4638ea8 Don#t group 2020-05-06 15:27:13 +00:00
Michael
22be2cce8a Issue 8586: Reduce the amount of item receivers 2020-05-06 15:20:49 +00:00
Hypolite Petovan
36a7eceb89 Remove preemptive autolinker from Text\Markdown::toBBCode
- Autolinker is done centrally in Text\BBCode::convert
2020-05-05 23:41:35 -04:00
Hypolite Petovan
ccb69414d2 Combine getFollowers and getFollowing into getContacts in ActivityPub\Transmitter 2020-05-05 22:32:45 -04:00
Hypolite Petovan
f4083f6031
Merge pull request #8585 from annando/legacy-tag
Removed legacy usage of the "tag" field
2020-05-05 18:10:22 -04:00
Michael
d33f6fc167 Renamed function 2020-05-05 21:58:25 +00:00
Michael
0f042b064a Fix warning, notice and DB Error 2020-05-05 21:49:48 +00:00
Michael
980de37047 Removed legacy usage of the "tag" field 2020-05-05 19:54:25 +00:00
Hypolite Petovan
f7a45e4153
Merge pull request #8577 from annando/no-term2
File and category aren't using "term" anymore
2020-05-05 13:45:48 -04:00
Michael
3d4ace7a9d Merge branch 'no-term3' into no-term2 2020-05-05 16:09:50 +00:00
Michael
d67b9cb693 Formula according to documentation 2020-05-05 16:01:20 +00:00
Michael
7de6e60328 Merge remote-tracking branch 'upstream/develop' into issue-8550 2020-05-05 15:56:24 +00:00
Michael
5725784055 Update database definition, cleaned code 2020-05-05 15:47:35 +00:00
Michael
59675c4f0b Merge remote-tracking branch 'upstream/develop' into no-term2 2020-05-05 15:44:24 +00:00