aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| * | 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 notific...Mario Vavti2018-01-276-48/+44
* | | | 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 ch...zotlabs2018-01-283-3/+7
* | | | Surface the ability to change the landing page after channel creation and cr...zotlabs2018-01-286-3/+93
* | | | Guranteed somebody will paste the verification link and not the token, especi...zotlabs2018-01-271-1/+1
| |_|/ |/| |
* | | registration testingzotlabs2018-01-273-5/+23
* | | typozotlabs2018-01-271-1/+1
| |/ |/|
* | Usability improvements to registration/verification workflow. This requires a...zotlabs2018-01-274-2/+106
* | typo from previous checkin and partial fix to hubzilla #965 - show any connec...zotlabs2018-01-262-2/+9
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-262-13/+19
|\|
| * preserve open state of notificationsMario Vavti2018-01-261-0/+10
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-261-14/+28
| |\
| * | move template out of #notifications and revert reset timer on manual triggerMario Vavti2018-01-252-9/+7
| * | reset timer on manual update triggerMario Vavti2018-01-251-6/+4
* | | Issue with configurable site age limit, vagueness when informing about email ...zotlabs2018-01-263-16/+49
| |/ |/|