aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* oopsyzotlabs2017-06-212-2/+2
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-06-2016-2517/+363
|\
| * more anon comment fixeszotlabs2017-06-203-15/+16
| * Remove important flaggit-marijus2017-06-201-1/+1
| * prevent likes/dislikes/etc. from anon commenterszotlabs2017-06-201-4/+4
| * make bootstrap respect our radius settingMario Vavti2017-06-201-5/+9
| * versionMario Vavti2017-06-201-1/+1
| * stringsMario Vavti2017-06-201-651/+744
| * update bs4-dev and use min version of popperMario Vavti2017-06-2012-2510/+351
| * minor cleanup of moderated comment featurezotlabs2017-06-202-6/+9
| * allow moderated comments like wordpress if permissions are compatiblezotlabs2017-06-1913-22/+222
| * brainstorming a comment moderation systemzotlabs2017-06-191-0/+7
| * testing mastodon boosts/reshareszotlabs2017-06-192-14/+36
| * remove some duplicated codezotlabs2017-06-151-13/+13
| * always transmit a valid urizotlabs2017-06-151-0/+4
| * use parent_midzotlabs2017-06-151-2/+2
* | explain what is happening herezotlabs2017-06-201-0/+3
* | more import_author_zot fixeszotlabs2017-06-201-2/+9
* | still an issue with caching import_author_zotzotlabs2017-06-201-0/+4
* | remove deprecated app parameter from conversation()zotlabs2017-06-208-11/+10
* | more anon comment fixeszotlabs2017-06-203-15/+16
* | prevent likes/dislikes/etc. from anon commenterszotlabs2017-06-201-4/+4
* | minor cleanup of moderated comment featurezotlabs2017-06-182-6/+9
* | allow moderated comments like wordpress if permissions are compatiblezotlabs2017-06-1813-22/+221
* | brainstorming a comment moderation systemzotlabs2017-06-171-0/+7
* | testing mastodon boosts/reshareszotlabs2017-06-162-8/+17
* | some logic cleanup in feed_get_resharezotlabs2017-06-161-7/+14
* | remove some duplicated codezotlabs2017-06-141-13/+13
* | always transmit a valid urizotlabs2017-06-141-0/+4
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-06-144-1/+134
|\|
| * sigh... x-zot prefix slipped in againMario Vavti2017-06-151-1/+1
| * typoMario Vavti2017-06-151-1/+1
| * re-add type since the actual culprit was the X-ZOT prefixMario Vavti2017-06-141-1/+1
| * fix illegal offset type warningMario Vavti2017-06-141-2/+2
| * thr:in-reply-to seems to must not have a type set. there is no mention of thi...Mario Vavti2017-06-141-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-06-143-0/+132
| |\
| | * Merge pull request #815 from HaakonME/devgit-marijus2017-06-143-0/+132
| | |\
| | | * Added Portfolio widgetHaakon Meland Eriksen2017-06-133-0/+132
| | |/
| * | support mastodon content warnings by converting into n-s-f-w tagzotlabs2017-06-141-0/+8
| * | more doco improvementszotlabs2017-06-141-3/+3
| * | add rel=noopener to all external target _blank linkszotlabs2017-06-143-19/+19
| * | attempt to group gnu-social and mastodon conversations by ostatus:conversatio...zotlabs2017-06-141-10/+25
| * | preserve the ostatus:conversation pointer alsozotlabs2017-06-141-1/+8
| * | ostatus is almost unrecognisable these days from its former self. In this cas...zotlabs2017-06-141-3/+15
| * | implement feed_get_reshare to extract shared post info from atom feed and con...zotlabs2017-06-141-91/+170
| * | add 'can_comment_on_post' hook so we can better deal with the complications o...zotlabs2017-06-143-0/+21
| * | doco for the channel basic export api callzotlabs2017-06-141-1/+14
| * | add numbers to the techlevel descriptions because that's what we will use to ...zotlabs2017-06-141-6/+6
| * | more obsolete references in member guidezotlabs2017-06-141-2/+3
| * | another typozotlabs2017-06-141-1/+1