aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-144-2/+162
|\
| * Merge branch 'share'zotlabs2018-02-133-1/+161
| |\
| | * turn shares into activities - make certain to pull addons or JSON-LD will ↵zotlabs2018-02-133-4/+149
| | | | | | | | | | | | chuck a wobbly
| | * initial share refactorzotlabs2018-02-121-1/+16
| | |
| * | defperms: bad queryzotlabs2018-02-131-1/+1
| |/
* | fix item link in fsprintMario Vavti2018-02-131-1/+1
| |
* | match against item verbMario Vavti2018-02-131-4/+4
| |
* | since we only save the parent mid in notify we must look for thr_parent when ↵Mario Vavti2018-02-131-1/+12
|/ | | | dealing with likes
* if always_show_in_notices is set to 1 also show likes and dislikesMario Vavti2018-02-121-15/+28
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-113-21/+21
|\
| * finally fix channel queryMario Vavti2018-02-091-4/+4
| |
| * use distinct in channel item query and minor notification cache improvementMario Vavti2018-02-091-5/+5
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-092-5/+20
| |\
| * | wrong linkMario Vavti2018-02-081-1/+1
| | |
| * | more db and queries finetuningMario Vavti2018-02-081-13/+13
| | |
* | | second part of hubzilla issue #972zotlabs2018-02-111-5/+4
| | |
* | | hubzilla issue #972 - provide system toggle to allow/disallow anonymous commentszotlabs2018-02-111-1/+3
| | |
* | | use new forum tag style in forum search postingszotlabs2018-02-111-1/+1
| | |
* | | hubzilla issue #975 (searching for title as well as body could present a ↵zotlabs2018-02-091-1/+1
| |/ |/| | | | | performance issue, so perhaps the tradeoffs should be debated)
* | zot6 testingzotlabs2018-02-081-6/+1
| |
* | missing quotezotlabs2018-02-081-1/+1
| |
* | loggingzotlabs2018-02-081-1/+3
| |
* | z6 testingzotlabs2018-02-081-1/+1
| |
* | debug the crypto functionzotlabs2018-02-071-0/+3
| |
* | more zot6 delivery workzotlabs2018-02-071-2/+2
| |
* | Merge branch 'master' into z6zotlabs2018-02-075-52/+9
|\|
| * remove mobile_detect (outdated and unmaintainable)zotlabs2018-02-054-51/+8
| |
| * fix manual queue invocation (was using the web argc/argv from the cli)zotlabs2018-02-051-3/+3
| |
* | Merge branch 'master' into z6zotlabs2018-02-0534-247/+460
|\|
| * implode can take its arguments in either order, but let's try to be consistentzotlabs2018-02-041-6/+6
| |
| * this will fix the cards query and keep the rest intactMario Vavti2018-02-042-2/+2
| |
| * remove some never used indices which prevented our item queries to find the ↵Mario Vavti2018-02-046-33/+39
| | | | | | | | right query execution plan in mysql and adjust some queries to optimze the result
| * some feed cleanupzotlabs2018-02-011-8/+9
| |
| * more separation of complex code into separate functionszotlabs2018-02-011-20/+3
| |
| * remove loggingzotlabs2018-01-291-2/+0
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-291-38/+41
| |\
| | * Fix a PHP7.2 warning when a channel has no cards.Klaus Weidenbach2018-01-281-38/+41
| | |
| * | unable to delete accounts using tickboxes on admin/accounts - make all the ↵zotlabs2018-01-291-3/+6
| | | | | | | | | | | | action names consistent
| * | redirect to the email_validation page if login was attempted after account ↵zotlabs2018-01-291-0/+1
| | | | | | | | | | | | creation but prior to successful verification. This presents the link to resend the verification email and/or allows you to enter it.
| * | fix workflow for form based email validation when auto_channel_create is in ↵zotlabs2018-01-291-0/+9
| | | | | | | | | | | | effect. Eventually we will need to rework the workflow logic because it is getting a bit tangled.
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-284-7/+16
| |\|
| | * query optimisations for notifications - use a specific index onlyMario Vavti2018-01-282-4/+10
| | |
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-281-3/+1
| | |\
| | * | fix syntax errorMario Vavti2018-01-271-2/+2
| | | |
| | * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-273-6/+100
| | |\ \
| | * | | if startpage is /hq redirect all notifications links to /hq and minor ↵Mario Vavti2018-01-272-1/+4
| | | | | | | | | | | | | | | | | | | | notifications and hq fixes
| * | | | provide a default video image if nothing else is available. Allow sites to ↵zotlabs2018-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | change it.
| * | | | Surface the ability to change the landing page after channel creation and ↵zotlabs2018-01-283-3/+70
| | | | | | | | | | | | | | | | | | | | create a 'go' module to present several possible things to do at this point. Change the default from 'settings' to 'profiles' so that the focus is more on you rather than the software configuration.
| * | | | Guranteed somebody will paste the verification link and not the token, ↵zotlabs2018-01-271-1/+1
| | |_|/ | |/| | | | | | | | | | especially before all the translations are completed. But even then...
| * | | registration testingzotlabs2018-01-271-3/+1
| | | |