Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-15 | 1 | -2/+1 |
|\ | | | | | | | | | Dev See merge request hubzilla/core!1755 | ||||
| * | Fix cache-control syntax for photos | Max Kostikov | 2019-10-15 | 1 | -2/+1 |
| | | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-15 | 3 | -5/+11 |
| |\ | |/ |/| | | | | | Sync dev See merge request kostikov/core!3 | ||||
* | | Merge branch 'patch-20191014' into 'dev' | Max Kostikov | 2019-10-14 | 3 | -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. Dent | 2019-10-14 | 3 | -5/+11 |
|/ / | | | | | | | infrastructure caches (CDN) | ||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-14 | 1 | -1/+1 |
|\| | | | | | | | | | Better plural function detection See merge request hubzilla/core!1753 | ||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-14 | 1 | -3/+7 |
| |\ | |/ |/| | | | | | Dev See merge request kostikov/core!2 | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-10-13 | 3 | -18/+86 |
|\ \ | | | | | | | | | | | | | Better Opengraph markup See merge request hubzilla/core!1751 | ||||
| * | | Revert "Remove visible channels list from pubstream tags cloud creation ↵ | Max Kostikov | 2019-10-13 | 3 | -18/+86 |
|/ / | | | | | | | | | | | procedure" This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853 | ||||
* | | Merge branch 'cherry-pick-cac0672a' into 'dev' | M. Dent | 2019-10-08 | 1 | -3/+7 |
|\ \ | | | | | | | | | | | | | issue #1401 See merge request hubzilla/core!1750 | ||||
| * | | issue #1401 | Mario Vavti | 2019-10-08 | 1 | -3/+7 |
|/ / | | | | | (cherry picked from commit cac0672a49cd710b3eced1d66f1bfb18747ddbf8) | ||||
| * | Better plural function detection | Max Kostikov | 2019-10-14 | 1 | -1/+1 |
| | | |||||
| * | Add Opengraph image type detection | Max Kostikov | 2019-10-12 | 1 | -1/+5 |
| | | |||||
| * | Update opengraph.php | Max Kostikov | 2019-10-12 | 1 | -2/+1 |
| | | |||||
| * | Update Channel.php | Max Kostikov | 2019-10-12 | 1 | -3/+3 |
| | | |||||
| * | Add Opengraph markup for articles | Max Kostikov | 2019-10-12 | 1 | -4/+8 |
| | | |||||
| * | Move Opengraph functions to common libraries | Max Kostikov | 2019-10-12 | 1 | -40/+2 |
| | | |||||
| * | Add Opengraph function | Max Kostikov | 2019-10-12 | 1 | -0/+68 |
| | | |||||
| * | Minor Opengraph improvements | Max Kostikov | 2019-10-11 | 1 | -3/+5 |
| | | |||||
| * | Add Opengraph og:type object | Max Kostikov | 2019-10-11 | 1 | -0/+2 |
| | | |||||
| * | Better Opengraph markup for channel | Max Kostikov | 2019-10-11 | 1 | -11/+38 |
| | | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-06 | 3 | -3/+16 |
| |\ | |/ |/| | | | | | Dev sync See merge request kostikov/core!1 | ||||
* | | Merge branch 'cherry-pick-d8b8d8ce' into 'dev' | Max Kostikov | 2019-10-06 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | fix zap->hubzlla event title compatibility See merge request hubzilla/core!1749 | ||||
| * | | fix zap->hubzlla event title compatibility | Mario Vavti | 2019-10-05 | 1 | -1/+2 |
|/ / | | | | | (cherry picked from commit d8b8d8ceb5cc9d701f91dac26834af15f3257cce) | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-10-05 | 2 | -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 mentions | Max Kostikov | 2019-10-05 | 2 | -7/+4 |
|/ / | |||||
* | | Merge branch 'cherry-pick-79bcc157' into 'dev' | Mario | 2019-10-05 | 2 | -0/+7 |
|\ \ | | | | | | | | | | | | | fix bbcode event reshare timezone issue See merge request hubzilla/core!1747 | ||||
| * | | fix bbcode event reshare timezone issue | Mario Vavti | 2019-10-04 | 2 | -0/+7 |
| | | | | | | | | | (cherry picked from commit 79bcc157bf8f0c67a8ee41ae9c53a9dec969f8d1) | ||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-10-05 | 1 | -2/+7 |
|\ \ \ | |/ / |/| | | | | | | | | another timezone fix See merge request hubzilla/core!1748 | ||||
| * | | another timezone fix | Zot | 2019-10-05 | 1 | -2/+7 |
|/ / | |||||
| * | Revert "Remove visible channels list from pubstream tags cloud creation ↵ | Max Kostikov | 2019-10-06 | 1 | -3/+2 |
| | | | | | | | | | | procedure" This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853 | ||||
| * | Remove visible channels list from pubstream tags cloud creation procedure | Max Kostikov | 2019-10-06 | 1 | -2/+3 |
| | | |||||
| * | Allow processing of forum posts through mentions in addons | Max Kostikov | 2019-10-03 | 1 | -1/+1 |
| | | |||||
| * | Get extended channel info using channelx_by_hash() | Max Kostikov | 2019-10-03 | 1 | -5/+2 |
| | | |||||
| * | Allow processing of forum posts through mentions in addons | Max Kostikov | 2019-10-03 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'cherry-pick-2c7ed093' into 'dev' | Max Kostikov | 2019-10-02 | 1 | -3/+2 |
|\ | | | | | | | | | fix missing summary in mod article_edit See merge request hubzilla/core!1744 | ||||
| * | fix missing summary in mod article_edit | Mario Vavti | 2019-10-02 | 1 | -3/+2 |
|/ | | | (cherry picked from commit 2c7ed093699ea0c0f68068fdd8a035454b9a76a3) | ||||
* | Merge branch 'dev' into 'dev' | Mario | 2019-10-01 | 4 | -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 channels | Max Kostikov | 2019-10-01 | 4 | -13941/+14039 |
|/ | |||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-30 | 1 | -8/+10 |
|\ | | | | | | | | | Fix empty string quotation; remove trailing spaces See merge request hubzilla/core!1742 | ||||
| * | Fix empty string quotation; remove trailing spaces | Max Kostikov | 2019-09-30 | 1 | -8/+10 |
|/ | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2019-09-30 | 2 | -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 Kostikov | 2019-09-30 | 2 | -8/+19 |
|/ | | | | thread owner | ||||
* | Merge branch 'dev' into 'dev' | Mario | 2019-09-28 | 1 | -0/+1 |
|\ | | | | | | | | | issue with bearcap tests See merge request hubzilla/core!1738 | ||||
| * | issue with bearcap tests | zotlabs | 2019-09-26 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'admindoc' into 'dev' | M. Dent | 2019-09-24 | 3 | -9/+36 |
|\ \ | | | | | | | | | | | | | Improve admin documentation See merge request hubzilla/core!1737 | ||||
| * | | Improve admin documentation | Ale Abdo | 2019-09-24 | 3 | -9/+36 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | M. Dent | 2019-09-23 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Update plink type for MySQL schema See merge request hubzilla/core!1736 | ||||
| * | | Update schema_mysql.sql | Max Kostikov | 2019-09-23 | 1 | -1/+1 |
| | | | |||||
| * | | Update plink type for MySQL | Max Kostikov | 2019-09-23 | 1 | -1/+1 |
| | | |