aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * more client-side mail privacy workzotlabs2017-06-093-52/+56
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-06-0923-466/+3428
| |\
| * | convert schema_mysql engine to InnoDB and charset utf8mb4git-marijus2017-06-091-267/+267
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-086-4/+52
|\ \ \ | | |/ | |/|
| * | bump std versionMario Vavti2017-06-081-1/+1
| * | fall back on feed logo if an author avatar cannot be foundzotlabs2017-06-081-0/+4
| * | it appears to also work a bit better if you don't use imaginary function nameszotlabs2017-06-081-1/+1
| * | partial fix for failure to sync photos - appears to be memory exhaustion and ...zotlabs2017-06-082-2/+38
| * | provide hook when deleting a connection - we need this to clean up dangling P...zotlabs2017-06-082-0/+8
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-0788-24063/+3588
|\| |
| * | update bs-devMario Vavti2017-06-0717-462/+3376
| |/
| * Fixed TEXT fields with default values (fixes #803) in mysql creation script.Manuel Tancoigne2017-06-071-6/+6
| * Merge pull request #809 from dawnbreak/QA_testinggit-marijus2017-06-072-11/+24
| |\
| | * :construction_worker::white_check_mark: Add MySQL 5.7 in TravisCI.Klaus Weidenbach2017-06-052-11/+24
| * | Looks like we need the mastodon feed check in core - grrr. Will do that for n...zotlabs2017-06-071-0/+3
| * | hubzilla issue #810zotlabs2017-06-072-2/+32
| * | whitespacezotlabs2017-06-071-3/+5
| * | always add a length to ostatus compat enclosures - even if unknown (0)zotlabs2017-06-071-1/+1
| * | ostatus feeds: extract photo information from posts and convert to enclosures...zotlabs2017-06-071-3/+42