aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-20191014' into 'dev'Max Kostikov2019-10-143-5/+11
|\
| * Updates to zcard/profile images and other public images to account for infras...M. Dent2019-10-143-5/+11
|/
* Merge branch 'dev' into 'dev'Max Kostikov2019-10-141-1/+1
|\
| * Merge branch 'dev' into 'dev'Max Kostikov2019-10-141-3/+7
| |\ | |/ |/|
* | Merge branch 'dev' into 'dev'Mario2019-10-133-18/+86
|\ \
| * | Revert "Remove visible channels list from pubstream tags cloud creation proce...Max Kostikov2019-10-133-18/+86
|/ /
* | Merge branch 'cherry-pick-cac0672a' into 'dev'M. Dent2019-10-081-3/+7
|\ \
| * | issue #1401Mario Vavti2019-10-081-3/+7
|/ /
| * 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
| |\ | |/ |/|
* | Merge branch 'cherry-pick-d8b8d8ce' into 'dev'Max Kostikov2019-10-061-1/+2
|\ \
| * | fix zap->hubzlla event title compatibilityMario Vavti2019-10-051-1/+2
|/ /
* | Merge branch 'dev' into 'dev'Mario2019-10-052-7/+4
|\ \
| * | 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 issueMario Vavti2019-10-042-0/+7
* | | Merge branch 'dev' into 'dev'Mario2019-10-051-2/+7
|\ \ \ | |/ / |/| |
| * | another timezone fixZot2019-10-051-2/+7
|/ /
| * Revert "Remove visible channels list from pubstream tags cloud creation proce...Max Kostikov2019-10-061-3/+2
| * 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_editMario Vavti2019-10-021-3/+2
|/
* Merge branch 'dev' into 'dev'Mario2019-10-014-13941/+14039
|\
| * 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 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...Max Kostikov2019-09-302-8/+19
|/
* Merge branch 'dev' into 'dev'Mario2019-09-281-0/+1
|\
| * issue with bearcap testszotlabs2019-09-261-0/+1
* | Merge branch 'admindoc' into 'dev'M. Dent2019-09-243-9/+36
|\ \
| * | Improve admin documentationAle Abdo2019-09-243-9/+36
|/ /
* | Merge branch 'dev' into 'dev'M. Dent2019-09-231-1/+1
|\ \
| * | Update schema_mysql.sqlMax Kostikov2019-09-231-1/+1
| * | Update plink type for MySQLMax Kostikov2019-09-231-1/+1
* | | Merge branch 'cherry-pick-9aa928ec' into 'dev'M. Dent2019-09-236-21/+55
|\ \ \
| * | | composer update simplepie/simplepieMario Vavti2019-09-236-21/+55
* | | | Merge branch 'cherry-pick-e4336578' into 'dev'M. Dent2019-09-237-25/+56
|\ \ \ \