aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-1125-405/+516
|\
| * Merge pull request #976 from phellmes/time-ago-stringsgit-marijus2018-02-113-34/+40
| |\
| | * update DE translation strings for new relative date/time optionsphellmes2018-02-112-30/+30
| | * 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
| |/
| * finally fix channel queryMario Vavti2018-02-091-4/+4
| * use distinct in channel item query and minor notification cache improvementMario Vavti2018-02-092-5/+7
| * bump versionMario Vavti2018-02-091-1/+1
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-094-15/+204
| |\
| * | wrong linkMario Vavti2018-02-081-1/+1
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-081-44/+0
| |\ \
| * | | more db and queries finetuningMario Vavti2018-02-084-18/+32
| * | | do not spam the logMario Vavti2018-02-071-1/+1
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-02-0713-343/+432
| |\ \ \
| | * \ \ Merge pull request #971 from dawnbreak/QA_testinggit-marijus2018-02-0613-343/+432
| | |\ \ \
| | | * | | Make it little bit less likely to erase a real database.Klaus Weidenbach2018-01-294-21/+23
| | | * | | :white_check_mark: Add tests for non existent tables.Klaus Weidenbach2018-01-282-1/+24
| | | * | | :fire: Cleanup old database related files.Klaus Weidenbach2018-01-285-332/+60
| | | * | | :white_check_mark: Unit Test for dba_pdo driver class.Klaus Weidenbach2018-01-287-4/+273
| | | * | | :white_check_mark: Unit Test for \DBA factory.Klaus Weidenbach2018-01-281-0/+67
* | | | | | second part of hubzilla issue #972zotlabs2018-02-111-5/+4
* | | | | | hubzilla issue #972 - provide system toggle to allow/disallow anonymous commentszotlabs2018-02-112-2/+4
* | | | | | use new forum tag style in forum search postingszotlabs2018-02-111-1/+1
* | | | | | purify summaryzotlabs2018-02-111-0/+7
* | | | | | hubzilla issue #975 (searching for title as well as body could present a perf...zotlabs2018-02-091-1/+1
| |_|_|_|/ |/| | | |
* | | | | cosmeticzotlabs2018-02-081-2/+1
* | | | | turn the logs down againzotlabs2018-02-081-2/+1
* | | | | zot6 testingzotlabs2018-02-082-10/+9
* | | | | 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