aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #739 from zotlabs/mast35git-marijus2017-04-282-11/+22
|\ \
| * | update feedutils with as:author changes, also update testszotlabs2017-04-272-11/+22
|/ /
* | issues from hubzilla:#737zotlabs2017-04-274-7/+18
* | Merge pull request #736 from zotlabs/feedfckgit-marijus2017-04-273-2/+50
|\ \
| * | provide a broken feed as a separate modulezotlabs2017-04-263-2/+50
|/ /
* | make mastodon happy argsMario Vavti2017-04-263-3/+3
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-269-14/+43
|\ \
| * \ Merge pull request #733 from zotlabs/etwoeemailgit-marijus2017-04-266-14/+31
| |\ \
| | * | database support for client side e2ee for private mailzotlabs2017-04-256-14/+31
| * | | Merge pull request #731 from anaqreon/devgit-marijus2017-04-262-0/+10
| |\ \ \
| | * | | When template "none" is used in a webpage layout, then the contents of the pa...Andrew Manning2017-04-232-0/+10
| * | | | Merge pull request #734 from zotlabs/emojionelicensegit-marijus2017-04-261-0/+2
| |\ \ \ \
| | * | | | Attribution is requiredzotlabs2017-04-261-0/+2
| | | |/ / | | |/| |
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-250-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| | * | | 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
* | | | | The rest of the library and backend changes to support client-side e2ee and d...zotlabs2017-04-266-59/+20
* | | | | In the rare case where a default channel is not selected but channels actuall...zotlabs2017-04-261-78/+82
* | | | | support reverse magic-auth in oembed requests.zotlabs2017-04-261-2/+9
* | | | | provide a broken feed for services which require a broken feedzotlabs2017-04-266-70/+83
* | | | | make it easier to hook into feed headers in the futurezotlabs2017-04-261-13/+19
* | | | | smilies - add param to only list default emoticonszotlabs2017-04-261-1/+6
|/ / / /
* | / / 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
|/ /
* | 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
|/ /
* | 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
|/ /
* | 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
|\ \