Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into dev | Manuel Jiménez Friaza | 2019-08-11 | 114 | -47354/+31617 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-10 | 1 | -12/+14 |
| |\ | | | | | | | | | | | | | Improve plink to share tag detection See merge request hubzilla/core!1704 | ||||
| | * | Improve plink to share tag detection | Max Kostikov | 2019-08-10 | 1 | -12/+14 |
| | | | |||||
| * | | use stripos() to match the body against terms in format_hashtags() | Mario Vavti | 2019-08-09 | 1 | -1/+1 |
| | | | |||||
| * | | update changelog | Mario Vavti | 2019-08-09 | 1 | -0/+55 |
| | | | |||||
| * | | make fetch logging less chatty | Mario Vavti | 2019-08-09 | 1 | -1/+1 |
| | | | | | | | | | (cherry picked from commit 130cfbf2317f1fce9cd73b40cf58a06180875c67) | ||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-08-09 | 1 | -4/+14 |
| |\| | | | | | | | | | | | | | Replace plink URL with 'share' tag if possible See merge request hubzilla/core!1703 | ||||
| | * | Replace plink URL with 'share' tag if possible | Max Kostikov | 2019-08-09 | 1 | -4/+14 |
| | | | |||||
| * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-09 | 1 | -3/+4 |
| |\| | | | | | | | | | | | | | More intelligent quotation shortening while link embedding See merge request hubzilla/core!1702 | ||||
| | * | More intelligent quotation shortening while link embedding | Max Kostikov | 2019-08-09 | 1 | -3/+4 |
| | | | |||||
| * | | 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-08-02 | 2 | -14062/+13989 |
| |\| | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1700 | ||||
| | * | Update hstrings.php | Max Kostikov | 2019-08-02 | 1 | -2741/+2746 |
| | | | |||||
| | * | Update hmessages.po | Max Kostikov | 2019-08-02 | 1 | -11321/+11243 |
| | | | |||||
| * | | version | Mario Vavti | 2019-08-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-08-01 | 4 | -10/+8 |
| |\ \ | |||||
| | * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-01 | 1 | -4/+2 |
| | |\| | | | | | | | | | | | | | | | | | Minor optimizations on static file serve See merge request hubzilla/core!1699 | ||||
| | | * | Minor optimizations on static file serve | Max Kostikov | 2019-08-01 | 1 | -4/+2 |
| | | | | |||||
| | * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-07-31 | 2 | -5/+5 |
| | |\| | | | | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1698 | ||||
| | | * | Update hstrings.php | Max Kostikov | 2019-07-31 | 1 | -2/+2 |
| | | | | |||||
| | | * | Update hmessages.po | Max Kostikov | 2019-07-31 | 1 | -3/+3 |
| | | | | |||||
| | * | | 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 |
| | | | | |||||
| * | | | update license | Mario Vavti | 2019-08-01 | 1 | -5/+6 |
| | | | | |||||
| * | | | update strings | Mario Vavti | 2019-08-01 | 2 | -480/+500 |
| |/ / | |||||
| * | | 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' into 'dev' | Mario | 2019-07-30 | 2 | -1/+10 |
| |\ \ | | |/ | |/| | | | | | | | fix urls on imported item taxonomy See merge request hubzilla/core!1695 | ||||
| | * | hz core issue #1386 - function name must be a string | zotlabs | 2019-07-28 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-07-28 | 24 | -338/+501 |
| | |\ | | |/ | |/| | |||||
| * | | Revert "Merge branch 'dev' into 'dev'" | Max Kostikov | 2019-07-25 | 4 | -6/+6 |
| | | | | | | | | | This reverts merge request !1694 | ||||
| * | | minor css adjustions | Mario Vavti | 2019-07-23 | 3 | -7/+7 |
| | | | |||||
| * | | pleroma uses slightly different URLs in body - also look for the string | Mario Vavti | 2019-07-22 | 1 | -1/+1 |
| | | | |||||
| * | | reflect repeats in notifications, use force flag for import_xchan_photo() in ↵ | Mario Vavti | 2019-07-22 | 3 | -7/+14 |
| | | | | | | | | | | | | cron | ||||
| * | | move image attachments to the top | Mario Vavti | 2019-07-19 | 1 | -2/+2 |
| | | | |||||
| * | | add hashtag to appschema and bump appschema rev | Mario Vavti | 2019-07-18 | 2 | -3/+5 |
| | | | |||||
| * | | fallback to id if href is not available | Mario Vavti | 2019-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | do not format hashtags with missing url | Mario Vavti | 2019-07-18 | 1 | -1/+3 |
| | | | |||||
| * | | fix issue with encoding hashtags and silence parent fetch logging | Mario Vavti | 2019-07-18 | 1 | -3/+3 |
| | | | |||||
| * | | streamline keyId and creator/actor | Mario Vavti | 2019-07-17 | 1 | -3/+3 |
| | | | |||||
| * | | minor css fix | Mario Vavti | 2019-07-17 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-07-16 | 4 | -6/+6 |
| |\ \ | | | | | | | | | | | | | | | | | Exclude trailing punctuations from URL See merge request hubzilla/core!1694 | ||||
| | * | | Exclude trailing punctuations from URL | Max Kostikov | 2019-07-16 | 4 | -6/+6 |
| |/ / |