aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dspr' into redzotlabs2017-03-0911-7395/+7326
|\
| * move all the diaspora content hacks to the diaspora pluginzotlabs2017-03-081-408/+9
| * DCV stuffzotlabs2017-03-071-20/+6
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-073-10/+10
| |\
| | * allow post_activity_item to be passed an empty ACL without resetting to chann...zotlabs2017-03-061-1/+2
| | * add public_policy to the nwiki container also. This should not affect the rec...zotlabs2017-03-061-0/+2
| | * correct fix for wiki anonymous read issue (items_permissions_sql checks item....zotlabs2017-03-062-9/+6
| * | Big 2.2 string update Dutchjeroenpraat2017-03-072-6864/+7305
| |/
| * allow unauthenticated access to public wiki pagesMario Vavti2017-03-061-2/+10
| * do not collapse long nsfw contentMario Vavti2017-03-061-1/+1
| * remove include/probe.php which has never completed development and has never ...zotlabs2017-03-054-106/+1
* | go back to where the problem startedzotlabs2017-03-092-600/+13
* | Merge branch 'dev' into redzotlabs2017-03-051824-18/+2
|\|
| * move emoji emoticons (not reactions) to pluginzotlabs2017-03-051824-18/+2
* | some event workzotlabs2017-03-052-0/+5
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-0522-4756/+5247
|\
| * Merge pull request #689 from mjfriaza/devzotlabs2017-03-052-2329/+2378
| |\
| | * Translated the last strings into Spanish versionManuel Jiménez Friaza2017-03-052-2329/+2378
| * | Merge pull request #688 from dawnbreak/markdownzotlabs2017-03-0520-2427/+2869
| |\ \
| | * | :arrow_up: :hammer: Upgrade Markdownify library.Klaus Weidenbach2017-03-0520-2427/+2869
| |/ /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-042-1/+2
|\| |
| * | update changelogMario Vavti2017-03-041-0/+1
| * | we need item edited for wiki page history, not item createdMario Vavti2017-03-041-1/+1
* | | minor feed issuezotlabs2017-03-041-0/+8
|/ /
* | string updatezotlabs2017-03-031-887/+910
* | fix badge position for narrow navbarMario Vavti2017-03-031-4/+0
* | reverse sort orderzotlabs2017-03-021-1/+1
* | activity widget - turns out the owner is not relevant.zotlabs2017-03-021-9/+5
* | document the activity widgetzotlabs2017-03-021-0/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-029-28/+23
|\ \
| * | provide info if there are no sche,es availableMario Vavti2017-03-021-4/+9
| * | reset schema value after we empty and repopulate it. second half of fix for #624Mario Vavti2017-03-022-2/+2
| * | reset schema value after we empty and repopulate it. first half of fix for #624Mario Vavti2017-03-021-0/+2
| * | setting top position of contextual-help in schemes does not work with narrow ...Mario Vavti2017-03-024-5/+0
| * | add title to connect buttonMario Vavti2017-03-011-1/+1
| * | minor template fixesMario Vavti2017-03-013-19/+12
* | | activity widget - like the forum widget but represents unseen activity by aut...zotlabs2017-03-029-4/+97
* | | make system.expire_delivery_reports default setting consistent (10 days)zotlabs2017-03-011-1/+1
|/ /
* | cleaner integration between the headers and session options of z_fetch_url()zotlabs2017-02-281-7/+26
* | expire unread system notifications after a year. It would provide a better ex...zotlabs2017-02-281-0/+7
* | Merge pull request #686 from dawnbreak/markdownzotlabs2017-03-0128-3075/+7787
|\ \
| * | :arrow_up: :hammer: Upgrade PHP Markdown library.Klaus Weidenbach2017-02-2727-2420/+7132
| * | Move library/markdown.php to keep history.Klaus Weidenbach2017-02-271-0/+0
* | | missing css classMario Vavti2017-02-281-1/+1
* | | provide 'session' option to z_fetch_url to assist with remote fetches requiri...zotlabs2017-02-272-1/+5
* | | make magic-auth work with profile vcard fetchzotlabs2017-02-271-1/+2
* | | remove loggingzotlabs2017-02-271-1/+1
* | | fetch profile vcard for connectionzotlabs2017-02-272-1/+50
* | | string updatezotlabs2017-02-271-1424/+1442
* | | a bit more DAV doco improvementzotlabs2017-02-271-1/+1