aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-07-0228-4377/+2399
|\
| * update bs-dev and min version bumpMario Vavti2017-07-0226-4374/+2392
| * add files and photos to featured apps by defaultgit-marijus2017-06-222-2/+2
| * fix post title radiusgit-marijus2017-06-221-1/+5
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-2030-3220/+1395
|\|
| * 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
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-1416-140/+447
|\|
| * 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
| * | remove some obsolete information from the member guide and expand on what a c...zotlabs2017-06-141-4/+4
| * | typozotlabs2017-06-141-1/+1
| * | more stuff about connecting for the member guidezotlabs2017-06-141-1/+3
| * | Add a section on connecting to other networks and activating additional proto...zotlabs2017-06-141-1/+9
| * | missed this hook page when the hook was addedzotlabs2017-06-141-0/+9
| * | api docs 'categories' -> 'category'zotlabs2017-06-141-1/+1
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-119-444/+453
|\|
| * css fixesMario Vavti2017-06-102-102/+106
| * some more innodb mysql scheme adjustmentsMario Vavti2017-06-103-20/+10
| * give the item_obscured flag a new lease on life by using it to designate thir...zotlabs2017-06-103-9/+20