Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://framagit.org/zot/core into dev | zotlabs | 2019-08-21 | 1 | -1/+9 |
|\ | |||||
| * | show correct profile photo when previewing and editing profiles | zotlabs | 2019-08-15 | 1 | -1/+9 |
| | | |||||
* | | possible for DB to return hublocs with no sitekey | zotlabs | 2019-08-21 | 1 | -1/+1 |
|/ | |||||
* | illegal offset warning (prevents encrypted signatures from being used for ↵ | zotlabs | 2019-08-13 | 1 | -1/+1 |
| | | | | encrypted messages). Not fatal but can leak metadata. | ||||
* | use stripos() to match the body against terms in format_hashtags() | Mario Vavti | 2019-08-09 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-08 | 1 | -14/+19 |
|\ | | | | | | | | | Catch and exclude trailing punctuation while URL embedding See merge request hubzilla/core!1701 | ||||
| * | Remove condition | Max Kostikov | 2019-08-08 | 1 | -2/+2 |
| | | |||||
| * | Update zid.php | Max Kostikov | 2019-08-08 | 1 | -5/+5 |
| | | |||||
| * | Update zid.php | Max Kostikov | 2019-08-08 | 1 | -13/+13 |
| | | |||||
| * | Formatting | Max Kostikov | 2019-08-08 | 1 | -1/+1 |
| | | |||||
| * | Catch and exclude trailing punctuation while URL embedding | Max Kostikov | 2019-08-08 | 1 | -2/+7 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-07-31 | 1 | -1/+1 |
|\| | | | | | | | | | Do not limit channel if service class property value set with 0 See merge request hubzilla/core!1697 | ||||
| * | Update account.php | Max Kostikov | 2019-07-31 | 1 | -1/+1 |
| | | |||||
| * | Do not limit channel if service class property value set with 0 | Max Kostikov | 2019-07-31 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-07-30 | 1 | -0/+2 |
|\| | | | | | | | | | Do not control limits on service class settings with 0 values See merge request hubzilla/core!1696 | ||||
| * | Update account.php | Max Kostikov | 2019-07-30 | 1 | -1/+3 |
| | | |||||
| * | Do not control limits on service class settings with 0 values | Max Kostikov | 2019-07-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-07-28 | 3 | -13/+15 |
|\| | |||||
| * | Revert "Merge branch 'dev' into 'dev'" | Max Kostikov | 2019-07-25 | 4 | -6/+6 |
| | | | | | | This reverts merge request !1694 | ||||
| * | pleroma uses slightly different URLs in body - also look for the string | Mario Vavti | 2019-07-22 | 1 | -1/+1 |
| | | |||||
| * | do not format hashtags with missing url | Mario Vavti | 2019-07-18 | 1 | -1/+3 |
| | | |||||
| * | Exclude trailing punctuations from URL | Max Kostikov | 2019-07-16 | 4 | -6/+6 |
| | | |||||
| * | stringify_array_elms() could return weird results if the initial array key ↵ | Mario Vavti | 2019-07-15 | 1 | -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 item | Mario Vavti | 2019-07-13 | 1 | -5/+4 |
| | | |||||
| * | webfinger: better handling of URLs that contain a @ | Mario Vavti | 2019-07-12 | 1 | -5/+6 |
| | | |||||
* | | fix urls on imported item taxonomy | zotlabs | 2019-07-28 | 1 | -0/+9 |
|/ | |||||
* | zot_finger() and Zotlabs\Zot\Finger::run() have different output. Adjusted ↵ | zotlabs | 2019-06-28 | 1 | -5/+2 |
| | | | | accordingly. | ||||
* | I wonder how long zot_finger() has been missing and how this may have ↵ | zotlabs | 2019-06-28 | 1 | -1/+1 |
| | | | | affected the directory servers. | ||||
* | minor fix | zotlabs | 2019-06-28 | 1 | -1/+1 |
| | |||||
* | begin directory migration to zot6, see the code comments | zotlabs | 2019-06-28 | 1 | -0/+26 |
| | |||||
* | photo objects: incorrect media type on links | zotlabs | 2019-06-27 | 1 | -4/+4 |
| | |||||
* | support zot and zot6 in social graph operations (suggestions, common friends) | zotlabs | 2019-06-27 | 1 | -2/+19 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-06-26 | 9 | -91/+96 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2019-06-26 | 1 | -1/+5 |
| |\ | | | | | | | | | | | | | provide auto redirect from zot6 /item permalinks See merge request hubzilla/core!1684 | ||||
| * \ | Merge branch 'fix-item_export-api-path' into 'dev' | Mario | 2019-06-26 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Make export_page API endpoint match ZAP See merge request hubzilla/core!1683 | ||||
| | * | | Make export_page API endpoint match ZAP | DM42.Net (Matt Dent) | 2019-06-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'export_items-export_all' into 'dev' | Mario | 2019-06-26 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Export items export all See merge request hubzilla/core!1680 | ||||
| | * | | | export all items except photos | DM42.Net (Matt Dent) | 2019-06-21 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-21 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Fix thumbnails processing logic on files sync See merge request hubzilla/core!1682 | ||||
| | * | | Fix thumbnails processing logic on files sync | Max Kostikov | 2019-06-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | Revert "Respect photo thumbnails storage in import" | Max Kostikov | 2019-06-21 | 1 | -3/+5 |
| | | | | | | | | | | | | This reverts commit e8918ca149f9eb0ea4148431772b9e5090f3ea7f | ||||
| | * | | Respect photo thumbnails storage in import | Max Kostikov | 2019-06-21 | 1 | -5/+3 |
| | | | | |||||
| * | | | fix mid not dbesc'd. the comment was no longer true. this fixes an issue ↵ | Mario Vavti | 2019-06-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | with mid's that contain single quotes | ||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-20 | 1 | -7/+8 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | changes to support direct messages in zot6 (set item.item_private = 2 when... See merge request hubzilla/core!1679 | ||||
| * | | | Update zid.php | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Include Zot6 hubs in the Grid scope | Max Kostikov | 2019-06-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-18 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671 | ||||
| * | | | | update feature set | Mario Vavti | 2019-06-17 | 1 | -14/+0 |
| | | | | | |||||
| * | | | | Formatting | Max Kostikov | 2019-06-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -0/+4 |
| | | | | |