aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/zot/core into devzotlabs2019-08-211-1/+9
|\
| * show correct profile photo when previewing and editing profileszotlabs2019-08-151-1/+9
| |
* | possible for DB to return hublocs with no sitekeyzotlabs2019-08-211-1/+1
|/
* illegal offset warning (prevents encrypted signatures from being used for ↵zotlabs2019-08-131-1/+1
| | | | encrypted messages). Not fatal but can leak metadata.
* use stripos() to match the body against terms in format_hashtags()Mario Vavti2019-08-091-1/+1
|
* Merge branch 'dev' into 'dev'Max Kostikov2019-08-081-14/+19
|\ | | | | | | | | Catch and exclude trailing punctuation while URL embedding See merge request hubzilla/core!1701
| * Remove conditionMax Kostikov2019-08-081-2/+2
| |
| * Update zid.phpMax Kostikov2019-08-081-5/+5
| |
| * Update zid.phpMax Kostikov2019-08-081-13/+13
| |
| * FormattingMax Kostikov2019-08-081-1/+1
| |
| * Catch and exclude trailing punctuation while URL embeddingMax Kostikov2019-08-081-2/+7
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-07-311-1/+1
|\| | | | | | | | | Do not limit channel if service class property value set with 0 See merge request hubzilla/core!1697
| * Update account.phpMax Kostikov2019-07-311-1/+1
| |
| * Do not limit channel if service class property value set with 0Max Kostikov2019-07-311-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2019-07-301-0/+2
|\| | | | | | | | | Do not control limits on service class settings with 0 values See merge request hubzilla/core!1696
| * Update account.phpMax Kostikov2019-07-301-1/+3
| |
| * Do not control limits on service class settings with 0 valuesMax Kostikov2019-07-301-1/+1
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-07-283-13/+15
|\|
| * Revert "Merge branch 'dev' into 'dev'"Max Kostikov2019-07-254-6/+6
| | | | | | This reverts merge request !1694
| * pleroma uses slightly different URLs in body - also look for the stringMario Vavti2019-07-221-1/+1
| |
| * do not format hashtags with missing urlMario Vavti2019-07-181-1/+3
| |
| * Exclude trailing punctuations from URLMax Kostikov2019-07-164-6/+6
| |
| * stringify_array_elms() could return weird results if the initial array key ↵Mario Vavti2019-07-151-2/+2
| | | | | | | | was not zero. this could trigger obscure bugs e.g. adding an empty string value to the recipients array in the notifier which could then select some broken hubloc/xchan entries.
| * admin should be allowed to delete any itemMario Vavti2019-07-131-5/+4
| |
| * webfinger: better handling of URLs that contain a @Mario Vavti2019-07-121-5/+6
| |
* | fix urls on imported item taxonomyzotlabs2019-07-281-0/+9
|/
* zot_finger() and Zotlabs\Zot\Finger::run() have different output. Adjusted ↵zotlabs2019-06-281-5/+2
| | | | accordingly.
* I wonder how long zot_finger() has been missing and how this may have ↵zotlabs2019-06-281-1/+1
| | | | affected the directory servers.
* minor fixzotlabs2019-06-281-1/+1
|
* begin directory migration to zot6, see the code commentszotlabs2019-06-281-0/+26
|
* photo objects: incorrect media type on linkszotlabs2019-06-271-4/+4
|
* support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-271-2/+19
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-269-91/+96
|\
| * Merge branch 'dev' into 'dev'Mario2019-06-261-1/+5
| |\ | | | | | | | | | | | | provide auto redirect from zot6 /item permalinks See merge request hubzilla/core!1684
| * \ Merge branch 'fix-item_export-api-path' into 'dev'Mario2019-06-261-2/+2
| |\ \ | | | | | | | | | | | | | | | | Make export_page API endpoint match ZAP See merge request hubzilla/core!1683
| | * | Make export_page API endpoint match ZAPDM42.Net (Matt Dent)2019-06-231-2/+2
| | | |
| * | | Merge branch 'export_items-export_all' into 'dev'Mario2019-06-261-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Export items export all See merge request hubzilla/core!1680
| | * | | export all items except photosDM42.Net (Matt Dent)2019-06-211-2/+2
| | |/ /
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-211-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | Fix thumbnails processing logic on files sync See merge request hubzilla/core!1682
| | * | Fix thumbnails processing logic on files syncMax Kostikov2019-06-211-1/+1
| | | |
| | * | Revert "Respect photo thumbnails storage in import"Max Kostikov2019-06-211-3/+5
| | | | | | | | | | | | This reverts commit e8918ca149f9eb0ea4148431772b9e5090f3ea7f
| | * | Respect photo thumbnails storage in importMax Kostikov2019-06-211-5/+3
| | | |
| * | | fix mid not dbesc'd. the comment was no longer true. this fixes an issue ↵Mario Vavti2019-06-211-2/+2
| | | | | | | | | | | | | | | | with mid's that contain single quotes
| * | | Merge branch 'dev' into 'dev'Mario2019-06-201-7/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | changes to support direct messages in zot6 (set item.item_private = 2 when... See merge request hubzilla/core!1679
| * | | Update zid.phpMax Kostikov2019-06-191-1/+1
| | | |
| * | | Include Zot6 hubs in the Grid scopeMax Kostikov2019-06-181-1/+1
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2019-06-181-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671
| * | | | update feature setMario Vavti2019-06-171-14/+0
| | | | |
| * | | | FormattingMax Kostikov2019-06-141-1/+1
| | | | |
| * | | | Add signatures processing for private messagesMax Kostikov2019-06-141-0/+4
| | | | |