aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-152-4/+2
|\
| * provide option to block the public stream unless authenticated, since there c...zotlabs2018-02-142-4/+2
* | since we only save the parent mid in notify we must look for thr_parent when ...Mario Vavti2018-02-131-1/+1
* | fix parent id for likes in status notifications.Mario Vavti2018-02-131-2/+12
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-118-339/+74
|\
| * Merge pull request #976 from phellmes/time-ago-stringsgit-marijus2018-02-111-4/+10
| |\
| | * add flexibility to prefix/suffix string translations for jquery.timeagophellmes2018-02-111-4/+10
| * | this might seem rediculous but it helps mysql to find the better index for th...Mario Vavti2018-02-111-1/+1
| |/
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-092-10/+184
| |\
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-081-44/+0
| |\ \
| * | | do not spam the logMario Vavti2018-02-071-1/+1
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-02-075-333/+62
| |\ \ \
| | * \ \ Merge pull request #971 from dawnbreak/QA_testinggit-marijus2018-02-065-333/+62
| | |\ \ \
| | | * | | :white_check_mark: Add tests for non existent tables.Klaus Weidenbach2018-01-281-1/+2
| | | * | | :fire: Cleanup old database related files.Klaus Weidenbach2018-01-285-332/+60
* | | | | | hubzilla issue #972 - provide system toggle to allow/disallow anonymous commentszotlabs2018-02-111-1/+1
* | | | | | purify summaryzotlabs2018-02-111-0/+7
| |_|_|_|/ |/| | | |
* | | | | cosmeticzotlabs2018-02-081-2/+1
* | | | | turn the logs down againzotlabs2018-02-081-2/+1
* | | | | zot6 testingzotlabs2018-02-081-4/+8
* | | | | z6 testingzotlabs2018-02-082-4/+2
* | | | | encrypt the httpsig for zot6 transportzotlabs2018-02-072-4/+24
* | | | | compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is p...zotlabs2018-02-071-1/+1
* | | | | zot6 delivery workzotlabs2018-02-071-3/+3
* | | | | more zot6 delivery workzotlabs2018-02-072-11/+89
* | | | | Merge branch 'master' into z6zotlabs2018-02-074-228/+25
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | remove dead codezotlabs2018-02-071-44/+0
| |/ / /
| * / / slight improvement in ostatus protocol detection from xml feedzotlabs2018-02-061-7/+8
| |/ /
| * | code cleanupzotlabs2018-02-051-81/+16
| * | remove dead codezotlabs2018-02-051-96/+1
* | | Merge branch 'master' into z6zotlabs2018-02-0520-591/+452
|\| |
| * | feedutils: separate the parsing of author information from the parsing of ite...zotlabs2018-02-051-94/+126
| * | implode can take its arguments in either order, but let's try to be consistentzotlabs2018-02-041-26/+29
| * | decomplicate cont.zotlabs2018-02-031-0/+60
| * | provide summaries in feeds under very limited cases, but never in compat (GNU...zotlabs2018-02-011-3/+19
| * | some feed cleanupzotlabs2018-02-011-26/+9
| * | more generalisation of commonly used code constructszotlabs2018-02-012-15/+29
| * | more separation of complex code into separate functionszotlabs2018-02-011-0/+32
| * | redirect to the email_validation page if login was attempted after account cr...zotlabs2018-01-292-1/+2
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-282-0/+13
| |\|
| | * query optimisations for notifications - use a specific index onlyMario Vavti2018-01-282-0/+13
| * | provide a default video image if nothing else is available. Allow sites to ch...zotlabs2018-01-281-1/+5
| |/
| * typo from previous checkin and partial fix to hubzilla #965 - show any connec...zotlabs2018-01-262-2/+9
| * Issue with configurable site age limit, vagueness when informing about email ...zotlabs2018-01-261-11/+33
| * don't do any bbcode translation within code blocks (except baseurl, observer,...zotlabs2018-01-251-14/+28
| * improve browser language detection by offering fallback of (for instance) fr-...zotlabs2018-01-241-1/+34
| * remove unused prototype importer template and obsolete reflection cms importerzotlabs2018-01-242-365/+0
| * siteinfo embellishmentszotlabs2018-01-221-1/+3
| * ensure filter words are not emptyzotlabs2018-01-211-4/+7
| * zot api: provide channel list function (list all channel usernames [e.g. chan...zotlabs2018-01-181-0/+24