aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into devManuel Jiménez Friaza2019-08-11114-47354/+31617
|\
| * Merge branch 'dev' into 'dev'Max Kostikov2019-08-101-12/+14
| |\ | | | | | | | | | | | | Improve plink to share tag detection See merge request hubzilla/core!1704
| | * Improve plink to share tag detectionMax Kostikov2019-08-101-12/+14
| | |
| * | use stripos() to match the body against terms in format_hashtags()Mario Vavti2019-08-091-1/+1
| | |
| * | update changelogMario Vavti2019-08-091-0/+55
| | |
| * | make fetch logging less chattyMario Vavti2019-08-091-1/+1
| | | | | | | | | (cherry picked from commit 130cfbf2317f1fce9cd73b40cf58a06180875c67)
| * | Merge branch 'dev' into 'dev'Mario2019-08-091-4/+14
| |\| | | | | | | | | | | | | Replace plink URL with 'share' tag if possible See merge request hubzilla/core!1703
| | * Replace plink URL with 'share' tag if possibleMax Kostikov2019-08-091-4/+14
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-08-091-3/+4
| |\| | | | | | | | | | | | | More intelligent quotation shortening while link embedding See merge request hubzilla/core!1702
| | * More intelligent quotation shortening while link embeddingMax Kostikov2019-08-091-3/+4
| | |
| * | 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-08-022-14062/+13989
| |\| | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1700
| | * Update hstrings.phpMax Kostikov2019-08-021-2741/+2746
| | |
| | * Update hmessages.poMax Kostikov2019-08-021-11321/+11243
| | |
| * | versionMario Vavti2019-08-011-1/+1
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-08-014-10/+8
| |\ \
| | * | Merge branch 'dev' into 'dev'Max Kostikov2019-08-011-4/+2
| | |\| | | | | | | | | | | | | | | | | Minor optimizations on static file serve See merge request hubzilla/core!1699
| | | * Minor optimizations on static file serveMax Kostikov2019-08-011-4/+2
| | | |
| | * | Merge branch 'dev' into 'dev'Max Kostikov2019-07-312-5/+5
| | |\| | | | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1698
| | | * Update hstrings.phpMax Kostikov2019-07-311-2/+2
| | | |
| | | * Update hmessages.poMax Kostikov2019-07-311-3/+3
| | | |
| | * | 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
| | | |
| * | | update licenseMario Vavti2019-08-011-5/+6
| | | |
| * | | update stringsMario Vavti2019-08-012-480/+500
| |/ /
| * | 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' into 'dev'Mario2019-07-302-1/+10
| |\ \ | | |/ | |/| | | | | | | fix urls on imported item taxonomy See merge request hubzilla/core!1695
| | * hz core issue #1386 - function name must be a stringzotlabs2019-07-281-1/+1
| | |
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-07-2824-338/+501
| | |\ | | |/ | |/|
| * | Revert "Merge branch 'dev' into 'dev'"Max Kostikov2019-07-254-6/+6
| | | | | | | | | This reverts merge request !1694
| * | minor css adjustionsMario Vavti2019-07-233-7/+7
| | |
| * | pleroma uses slightly different URLs in body - also look for the stringMario Vavti2019-07-221-1/+1
| | |
| * | reflect repeats in notifications, use force flag for import_xchan_photo() in ↵Mario Vavti2019-07-223-7/+14
| | | | | | | | | | | | cron
| * | move image attachments to the topMario Vavti2019-07-191-2/+2
| | |
| * | add hashtag to appschema and bump appschema revMario Vavti2019-07-182-3/+5
| | |
| * | fallback to id if href is not availableMario Vavti2019-07-181-1/+1
| | |
| * | do not format hashtags with missing urlMario Vavti2019-07-181-1/+3
| | |
| * | fix issue with encoding hashtags and silence parent fetch loggingMario Vavti2019-07-181-3/+3
| | |
| * | streamline keyId and creator/actorMario Vavti2019-07-171-3/+3
| | |
| * | minor css fixMario Vavti2019-07-171-0/+1
| | |
| * | Merge branch 'dev' into 'dev'Mario2019-07-164-6/+6
| |\ \ | | | | | | | | | | | | | | | | Exclude trailing punctuations from URL See merge request hubzilla/core!1694
| | * | Exclude trailing punctuations from URLMax Kostikov2019-07-164-6/+6
| |/ /