aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* missing quotezotlabs2018-02-081-1/+1
* loggingzotlabs2018-02-081-1/+3
* z6 testingzotlabs2018-02-083-5/+3
* debug the crypto functionzotlabs2018-02-071-0/+3
* 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-073-13/+91
* Merge branch 'master' into z6zotlabs2018-02-0713-536/+39
|\
| * 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
| * remove mobile_detect (outdated and unmaintainable)zotlabs2018-02-058-307/+13
| * fix manual queue invocation (was using the web argc/argv from the cli)zotlabs2018-02-051-3/+3
* | Merge branch 'master' into z6zotlabs2018-02-05260-11512/+37046
|\|
| * 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-042-32/+35
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-0410-45/+73
| |\
| | * this will fix the cards query and keep the rest intactMario Vavti2018-02-045-7/+19
| | * superfluous ,Mario Vavti2018-02-041-1/+1
| | * remove indices from mysql schema fileMario Vavti2018-02-041-7/+0
| | * remove some never used indices which prevented our item queries to find the r...Mario Vavti2018-02-048-36/+59
| * | decomplicate cont.zotlabs2018-02-032-49/+61
| |/
| * provide summaries in feeds under very limited cases, but never in compat (GNU...zotlabs2018-02-011-3/+19
| * document the tag changeszotlabs2018-02-011-3/+5
| * some feed cleanupzotlabs2018-02-013-35/+19
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-011-0/+8
| |\
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-012-4/+4
| | |\
| | * | we need to manualy take care to mark the notification read in this caseMario Vavti2018-01-311-0/+8
| * | | more generalisation of commonly used code constructszotlabs2018-02-012-15/+29
| * | | more separation of complex code into separate functionszotlabs2018-02-012-20/+35
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-300-0/+0
| |\| | | | |/ | |/|
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-306-6/+20
| | |\
| | * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-2910-7/+110
| | |\ \
| * | | | cosmetic readme changes, code cleanupzotlabs2018-01-302-4/+4
| | |_|/ | |/| |
| * | | remove loggingzotlabs2018-01-291-2/+0
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-292-40/+43
| |\| |
| | * | Merge pull request #967 from dawnbreak/devgit-marijus2018-01-291-38/+41
| | |\ \
| | | * | Fix a PHP7.2 warning when a channel has no cards.Klaus Weidenbach2018-01-281-38/+41
| | * | | Merge pull request #970 from mrjive/patch-1git-marijus2018-01-291-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | small detailsmrjive2018-01-291-2/+2
| | |/ /
| * | | don't show jot bb-edit buttons if a mimetype other than text/bbcode is select...zotlabs2018-01-291-0/+11
| * | | unable to delete accounts using tickboxes on admin/accounts - make all the ac...zotlabs2018-01-292-5/+8
| * | | redirect to the email_validation page if login was attempted after account cr...zotlabs2018-01-293-1/+3
| | |/ | |/|
| * | fix workflow for form based email validation when auto_channel_create is in e...zotlabs2018-01-291-0/+9
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-2810-49/+61
| |\|
| | * do not always look first in chache when receiving the *open* status from cacheMario Vavti2018-01-281-2/+2
| | * query optimisations for notifications - use a specific index onlyMario Vavti2018-01-285-7/+23
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-283-5/+23
| | |\