aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵zotlabs2018-02-051-94/+126
| | | | | | | | item/activity information
| * 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 ↵Mario Vavti2018-02-048-36/+59
| | | | | | | | | | | | right query execution plan in mysql and adjust some queries to optimze the result
| * | decomplicate cont.zotlabs2018-02-032-49/+61
| |/
| * provide summaries in feeds under very limited cases, but never in compat ↵zotlabs2018-02-011-3/+19
| | | | | | | | (GNU-Social) mode
| * 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.
| | | * | 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 details on connections.tpl
| | | * | small detailsmrjive2018-01-291-2/+2
| | |/ / | | | | | | | | Just changed the icon from sort to filter (it's what it does, it filters) and changed id to class in connection-wrapper clearfix (line 28)
| * | | don't show jot bb-edit buttons if a mimetype other than text/bbcode is ↵zotlabs2018-01-291-0/+11
| | | | | | | | | | | | | | | | selected (:todo: also disable bbcode autocomplete)
| * | | unable to delete accounts using tickboxes on admin/accounts - make all the ↵zotlabs2018-01-292-5/+8
| | | | | | | | | | | | | | | | action names consistent
| * | | redirect to the email_validation page if login was attempted after account ↵zotlabs2018-01-293-1/+3
| | |/ | |/| | | | | | | 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-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
| | |\
| | * | fix syntax errorMario Vavti2018-01-271-2/+2
| | | |
| | * | accidently reverted a fix from yesterday in ma previous commitMario Vavti2018-01-271-7/+7
| | | |
| | * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-277-19/+163
| | |\ \
| | * | | if startpage is /hq redirect all notifications links to /hq and minor ↵Mario Vavti2018-01-276-48/+44
| | | | | | | | | | | | | | | | | | | | notifications and hq fixes
| * | | | change the image - make it bland and neutralzotlabs2018-01-281-0/+0
| | | | |
| * | | | provide a default video image if nothing else is available. Allow sites to ↵zotlabs2018-01-283-3/+7
| | | | | | | | | | | | | | | | | | | | change it.
| * | | | Surface the ability to change the landing page after channel creation and ↵zotlabs2018-01-286-3/+93
| | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 23:38:24 +0000