aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-10-151-3/+7
|\ | | | | | | | | Better Opengraph image type detection See merge request hubzilla/core!1756
| * Update opengraph.phpMax Kostikov2019-10-151-2/+2
| |
| * Better Opengraph image type detectionMax Kostikov2019-10-151-3/+7
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-10-151-2/+1
|\| | | | | | | | | Dev See merge request hubzilla/core!1755
| * Fix cache-control syntax for photosMax Kostikov2019-10-151-2/+1
| |
| * Merge branch 'dev' into 'dev'Max Kostikov2019-10-153-5/+11
| |\ | |/ |/| | | | | Sync dev See merge request kostikov/core!3
* | Merge branch 'patch-20191014' into 'dev'Max Kostikov2019-10-143-5/+11
|\ \ | | | | | | | | | | | | Updates to zcard/profile images and other public images to account for infrastructure caches (CDN) See merge request hubzilla/core!1754
| * | Updates to zcard/profile images and other public images to account for ↵M. Dent2019-10-143-5/+11
|/ / | | | | | | infrastructure caches (CDN)
* | Merge branch 'dev' into 'dev'Max Kostikov2019-10-141-1/+1
|\| | | | | | | | | Better plural function detection See merge request hubzilla/core!1753
| * Merge branch 'dev' into 'dev'Max Kostikov2019-10-141-3/+7
| |\ | |/ |/| | | | | Dev See merge request kostikov/core!2
* | Merge branch 'dev' into 'dev'Mario2019-10-133-18/+86
|\ \ | | | | | | | | | | | | Better Opengraph markup See merge request hubzilla/core!1751
| * | Revert "Remove visible channels list from pubstream tags cloud creation ↵Max Kostikov2019-10-133-18/+86
|/ / | | | | | | | | | | procedure" This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853
* | Merge branch 'cherry-pick-cac0672a' into 'dev'M. Dent2019-10-081-3/+7
|\ \ | | | | | | | | | | | | issue #1401 See merge request hubzilla/core!1750
| * | issue #1401Mario Vavti2019-10-081-3/+7
|/ / | | | | (cherry picked from commit cac0672a49cd710b3eced1d66f1bfb18747ddbf8)
| * Better plural function detectionMax Kostikov2019-10-141-1/+1
| |
| * Add Opengraph image type detectionMax Kostikov2019-10-121-1/+5
| |
| * Update opengraph.phpMax Kostikov2019-10-121-2/+1
| |
| * Update Channel.phpMax Kostikov2019-10-121-3/+3
| |
| * Add Opengraph markup for articlesMax Kostikov2019-10-121-4/+8
| |
| * Move Opengraph functions to common librariesMax Kostikov2019-10-121-40/+2
| |
| * Add Opengraph functionMax Kostikov2019-10-121-0/+68
| |
| * Minor Opengraph improvementsMax Kostikov2019-10-111-3/+5
| |
| * Add Opengraph og:type objectMax Kostikov2019-10-111-0/+2
| |
| * Better Opengraph markup for channelMax Kostikov2019-10-111-11/+38
| |
| * Merge branch 'dev' into 'dev'Max Kostikov2019-10-063-3/+16
| |\ | |/ |/| | | | | Dev sync See merge request kostikov/core!1
* | Merge branch 'cherry-pick-d8b8d8ce' into 'dev'Max Kostikov2019-10-061-1/+2
|\ \ | | | | | | | | | | | | fix zap->hubzlla event title compatibility See merge request hubzilla/core!1749
| * | fix zap->hubzlla event title compatibilityMario Vavti2019-10-051-1/+2
|/ / | | | | (cherry picked from commit d8b8d8ceb5cc9d701f91dac26834af15f3257cce)
* | Merge branch 'dev' into 'dev'Mario2019-10-052-7/+4
|\ \ | | | | | | | | | | | | Allow addons to process forum posts published through mentions See merge request hubzilla/core!1745
| * | Allow addons to process forum posts published through mentionsMax Kostikov2019-10-052-7/+4
|/ /
* | Merge branch 'cherry-pick-79bcc157' into 'dev'Mario2019-10-052-0/+7
|\ \ | | | | | | | | | | | | fix bbcode event reshare timezone issue See merge request hubzilla/core!1747
| * | fix bbcode event reshare timezone issueMario Vavti2019-10-042-0/+7
| | | | | | | | | (cherry picked from commit 79bcc157bf8f0c67a8ee41ae9c53a9dec969f8d1)
* | | Merge branch 'dev' into 'dev'Mario2019-10-051-2/+7
|\ \ \ | |/ / |/| | | | | | | | another timezone fix See merge request hubzilla/core!1748
| * | another timezone fixZot2019-10-051-2/+7
|/ /
| * Revert "Remove visible channels list from pubstream tags cloud creation ↵Max Kostikov2019-10-061-3/+2
| | | | | | | | | | procedure" This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853
| * Remove visible channels list from pubstream tags cloud creation procedureMax Kostikov2019-10-061-2/+3
| |
| * Allow processing of forum posts through mentions in addonsMax Kostikov2019-10-031-1/+1
| |
| * Get extended channel info using channelx_by_hash()Max Kostikov2019-10-031-5/+2
| |
| * Allow processing of forum posts through mentions in addonsMax Kostikov2019-10-031-1/+1
|/
* Merge branch 'cherry-pick-2c7ed093' into 'dev'Max Kostikov2019-10-021-3/+2
|\ | | | | | | | | fix missing summary in mod article_edit See merge request hubzilla/core!1744
| * fix missing summary in mod article_editMario Vavti2019-10-021-3/+2
|/ | | (cherry picked from commit 2c7ed093699ea0c0f68068fdd8a035454b9a76a3)
* Merge branch 'dev' into 'dev'Mario2019-10-014-13941/+14039
|\ | | | | | | | | Add 'Connect' button for not connected at this location channels See merge request hubzilla/core!1743
| * Add 'Connect' button for not connected at this location channelsMax Kostikov2019-10-014-13941/+14039
|/
* Merge branch 'dev' into 'dev'Max Kostikov2019-09-301-8/+10
|\ | | | | | | | | Fix empty string quotation; remove trailing spaces See merge request hubzilla/core!1742
| * Fix empty string quotation; remove trailing spaces Max Kostikov2019-09-301-8/+10
|/
* Merge branch 'dev' into 'dev'Mario2019-09-302-8/+19
|\ | | | | | | | | Sync private items with clones; avoid sync if no local connection with thread owner See merge request hubzilla/core!1739
| * Sync private items with clones; avoid sync if no local connection with ↵Max Kostikov2019-09-302-8/+19
|/ | | | thread owner
* Merge branch 'dev' into 'dev'Mario2019-09-281-0/+1
|\ | | | | | | | | issue with bearcap tests See merge request hubzilla/core!1738
| * issue with bearcap testszotlabs2019-09-261-0/+1
| |
* | Merge branch 'admindoc' into 'dev'M. Dent2019-09-243-9/+36
|\ \ | | | | | | | | | | | | Improve admin documentation See merge request hubzilla/core!1737
| * | Improve admin documentationAle Abdo2019-09-243-9/+36
|/ /