aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* issues from hubzilla:#737zotlabs2017-04-264-7/+18
* provide a broken feed for services which require a broken feedzotlabs2017-04-256-70/+83
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-250-0/+0
|\
| * Revert "fix the query of last pullrequest"Mario Vavti2017-04-241-1/+1
| * fix the query of last pullrequestMario Vavti2017-04-231-1/+1
| * Revert "Revert "if there is no site record, site_dead won't be 0, in a left j...Mario Vavti2017-04-231-1/+1
| * Revert "if there is no site record, site_dead won't be 0, in a left join it w...Mario Vavti2017-04-231-1/+1
| * Merge pull request #730 from zotlabs/nullsitegit-marijus2017-04-231-1/+1
| |\
| | * if there is no site record, site_dead won't be 0, in a left join it will in f...zotlabs2017-04-221-1/+1
| |/
| * Merge pull request #728 from zotlabs/typo1git-marijus2017-04-211-1/+1
| |\
| | * typo - this time the correct repozotlabs2017-04-201-1/+1
| | * Revert "typo" - wrong repozotlabs2017-04-201-1/+1
| | * typozotlabs2017-04-201-1/+1
| |/
| * Merge pull request #723 from zotlabs/followfeedgit-marijus2017-04-202-2/+2
| |\
| | * follow_from_feed issue when called from pushzotlabs2017-04-192-2/+2
| |/
* | mostly text formatting changeszotlabs2017-04-251-64/+66
* | smilies - add param to only list default emoticonszotlabs2017-04-251-1/+6
* | database upgradezotlabs2017-04-233-216/+214
* | if there is no site record, site_dead won't be 0, in a left join it will in f...zotlabs2017-04-231-1/+1
* | make it easier to hook into feed headers in the futurezotlabs2017-04-201-14/+20
* | The rest of the library and backend changes to support client-side e2ee and d...zotlabs2017-04-206-59/+20
* | In the rare case where a default channel is not selected but channels actuall...zotlabs2017-04-201-78/+82
* | support reverse magic-auth in oembed requests.zotlabs2017-04-191-2/+9
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-191-1/+1
|\|
| * order wiki pages by creation dateMario Vavti2017-04-191-1/+1
| * typozotlabs2017-04-191-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-191-31/+29
| |\
| | * Merge pull request #722 from zotlabs/env_prvgit-marijus2017-04-191-31/+29
| | |\
| | | * envelope privacyzotlabs2017-04-181-31/+29
| | |/
| * | backend infrastructure for 'channel protection password'; which will be used ...zotlabs2017-04-191-1/+1
| * | don't allow any null fields in notify creationzotlabs2017-04-191-2/+3
| * | webfinger cleanupzotlabs2017-04-191-20/+23
| |/
* | follow_from_feed issue when called from pushzotlabs2017-04-192-2/+2
* | give the item_obscured flag a new lease on life by using it to designate thir...zotlabs2017-04-183-9/+20
* | oembed cache: don't store the url (which may need to be truncated), store a h...zotlabs2017-04-181-6/+6
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-1817-77/+42
|\|
| * more lock caretsMario Vavti2017-04-184-4/+4
| * update to bs-gitMario Vavti2017-04-1810-70/+35
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-181-1/+10
| |\
| | * Merge pull request #721 from zotlabs/client_e2eegit-marijus2017-04-181-1/+10
| | |\
| | | * allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
| | |/
| * / the caret beside the lock seems a little overkillMario Vavti2017-04-183-3/+3
| |/
* | envelope privacyzotlabs2017-04-181-31/+29
* | allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
* | include attach.php here (boot.php) instead of each file that uses it. Eventua...zotlabs2017-04-171-0/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-1782-28317/+32300
|\|
| * missing clearfixMario Vavti2017-04-161-1/+1
| * css fixesMario Vavti2017-04-161-4/+4
| * Merge pull request #717 from dawnbreak/simplepiegit-marijus2017-04-1559-15887/+21031
| |\
| | * We do not parse the body in discover_by_url(), so no need to preserve iframes...Klaus Weidenbach2017-04-151-7/+1