Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-07-02 | 28 | -4377/+2399 |
|\ | |||||
| * | update bs-dev and min version bump | Mario Vavti | 2017-07-02 | 26 | -4374/+2392 |
| | | |||||
| * | add files and photos to featured apps by default | git-marijus | 2017-06-22 | 2 | -2/+2 |
| | | |||||
| * | fix post title radius | git-marijus | 2017-06-22 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-20 | 30 | -3220/+1395 |
|\| | |||||
| * | more anon comment fixes | zotlabs | 2017-06-20 | 3 | -15/+16 |
| | | |||||
| * | Remove important flag | git-marijus | 2017-06-20 | 1 | -1/+1 |
| | | |||||
| * | prevent likes/dislikes/etc. from anon commenters | zotlabs | 2017-06-20 | 1 | -4/+4 |
| | | |||||
| * | make bootstrap respect our radius setting | Mario Vavti | 2017-06-20 | 1 | -5/+9 |
| | | |||||
| * | version | Mario Vavti | 2017-06-20 | 1 | -1/+1 |
| | | |||||
| * | strings | Mario Vavti | 2017-06-20 | 1 | -651/+744 |
| | | |||||
| * | update bs4-dev and use min version of popper | Mario Vavti | 2017-06-20 | 12 | -2510/+351 |
| | | |||||
| * | minor cleanup of moderated comment feature | zotlabs | 2017-06-20 | 2 | -6/+9 |
| | | |||||
| * | allow moderated comments like wordpress if permissions are compatible | zotlabs | 2017-06-19 | 13 | -22/+222 |
| | | |||||
| * | brainstorming a comment moderation system | zotlabs | 2017-06-19 | 1 | -0/+7 |
| | | |||||
| * | testing mastodon boosts/reshares | zotlabs | 2017-06-19 | 2 | -14/+36 |
| | | |||||
| * | remove some duplicated code | zotlabs | 2017-06-15 | 1 | -13/+13 |
| | | |||||
| * | always transmit a valid uri | zotlabs | 2017-06-15 | 1 | -0/+4 |
| | | |||||
| * | use parent_mid | zotlabs | 2017-06-15 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-14 | 16 | -140/+447 |
|\| | |||||
| * | sigh... x-zot prefix slipped in again | Mario Vavti | 2017-06-15 | 1 | -1/+1 |
| | | |||||
| * | typo | Mario Vavti | 2017-06-15 | 1 | -1/+1 |
| | | |||||
| * | re-add type since the actual culprit was the X-ZOT prefix | Mario Vavti | 2017-06-14 | 1 | -1/+1 |
| | | |||||
| * | fix illegal offset type warning | Mario Vavti | 2017-06-14 | 1 | -2/+2 |
| | | |||||
| * | thr:in-reply-to seems to must not have a type set. there is no mention of ↵ | Mario Vavti | 2017-06-14 | 1 | -1/+1 |
| | | | | | | | | this in the spec and replies will be shown as replies in mastodon this way. | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-06-14 | 3 | -0/+132 |
| |\ | |||||
| | * | Merge pull request #815 from HaakonME/dev | git-marijus | 2017-06-14 | 3 | -0/+132 |
| | |\ | | | | | | | | | New portfolio widget (requires foundation library) | ||||
| | | * | Added Portfolio widget | Haakon Meland Eriksen | 2017-06-13 | 3 | -0/+132 |
| | |/ | |||||
| * | | support mastodon content warnings by converting into n-s-f-w tag | zotlabs | 2017-06-14 | 1 | -0/+8 |
| | | | |||||
| * | | more doco improvements | zotlabs | 2017-06-14 | 1 | -3/+3 |
| | | | |||||
| * | | add rel=noopener to all external target _blank links | zotlabs | 2017-06-14 | 3 | -19/+19 |
| | | | |||||
| * | | attempt to group gnu-social and mastodon conversations by ↵ | zotlabs | 2017-06-14 | 1 | -10/+25 |
| | | | | | | | | | | | | ostatus:conversation in addition to falling back on thr:in_reply_to | ||||
| * | | preserve the ostatus:conversation pointer also | zotlabs | 2017-06-14 | 1 | -1/+8 |
| | | | |||||
| * | | ostatus is almost unrecognisable these days from its former self. In this ↵ | zotlabs | 2017-06-14 | 1 | -3/+15 |
| | | | | | | | | | | | | case thr:in-reply-to has almost no meaning since it almost never refers to a top level post; which makes it quite difficult to preserve conversations | ||||
| * | | implement feed_get_reshare to extract shared post info from atom feed and ↵ | zotlabs | 2017-06-14 | 1 | -91/+170 |
| | | | | | | | | | | | | convert to bbcode | ||||
| * | | add 'can_comment_on_post' hook so we can better deal with the complications ↵ | zotlabs | 2017-06-14 | 3 | -0/+21 |
| | | | | | | | | | | | | of Diaspora policy | ||||
| * | | doco for the channel basic export api call | zotlabs | 2017-06-14 | 1 | -1/+14 |
| | | | |||||
| * | | add numbers to the techlevel descriptions because that's what we will use to ↵ | zotlabs | 2017-06-14 | 1 | -6/+6 |
| | | | | | | | | | | | | indicate a minimum level in documentation | ||||
| * | | more obsolete references in member guide | zotlabs | 2017-06-14 | 1 | -2/+3 |
| | | | |||||
| * | | another typo | zotlabs | 2017-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | remove some obsolete information from the member guide and expand on what a ↵ | zotlabs | 2017-06-14 | 1 | -4/+4 |
| | | | | | | | | | | | | connection is at a basic level. | ||||
| * | | typo | zotlabs | 2017-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | more stuff about connecting for the member guide | zotlabs | 2017-06-14 | 1 | -1/+3 |
| | | | |||||
| * | | Add a section on connecting to other networks and activating additional ↵ | zotlabs | 2017-06-14 | 1 | -1/+9 |
| | | | | | | | | | | | | protocols in the member guide - where it is needed the most. | ||||
| * | | missed this hook page when the hook was added | zotlabs | 2017-06-14 | 1 | -0/+9 |
| | | | |||||
| * | | api docs 'categories' -> 'category' | zotlabs | 2017-06-14 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-11 | 9 | -444/+453 |
|\| | |||||
| * | css fixes | Mario Vavti | 2017-06-10 | 2 | -102/+106 |
| | | |||||
| * | some more innodb mysql scheme adjustments | Mario Vavti | 2017-06-10 | 3 | -20/+10 |
| | | |||||
| * | give the item_obscured flag a new lease on life by using it to designate ↵ | zotlabs | 2017-06-10 | 3 | -9/+20 |
| | | | | | | | | third party client-side e2ee or binary content which can only be downloaded and not viewed directly on the web (as a side effect this also allows binary files to be submitted as activities/content). The content display is suppressed and replaced with a download button. This is unfinished but harmless to backport while work is in progress unless told otherwise. Future development will take care of the remaining loose ends. |