Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | logging | zotlabs | 2018-02-08 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | z6 testing | zotlabs | 2018-02-08 | 3 | -5/+3 | |
| | | | | | ||||||
* | | | | | debug the crypto function | zotlabs | 2018-02-07 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | encrypt the httpsig for zot6 transport | zotlabs | 2018-02-07 | 2 | -4/+24 | |
| | | | | | ||||||
* | | | | | compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is ↵ | zotlabs | 2018-02-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | present | |||||
* | | | | | zot6 delivery work | zotlabs | 2018-02-07 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | more zot6 delivery work | zotlabs | 2018-02-07 | 3 | -13/+91 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into z6 | zotlabs | 2018-02-07 | 13 | -536/+39 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | remove dead code | zotlabs | 2018-02-07 | 1 | -44/+0 | |
| |/ / / | ||||||
| * / / | slight improvement in ostatus protocol detection from xml feed | zotlabs | 2018-02-06 | 1 | -7/+8 | |
| |/ / | ||||||
| * | | code cleanup | zotlabs | 2018-02-05 | 1 | -81/+16 | |
| | | | ||||||
| * | | remove dead code | zotlabs | 2018-02-05 | 1 | -96/+1 | |
| | | | ||||||
| * | | remove mobile_detect (outdated and unmaintainable) | zotlabs | 2018-02-05 | 8 | -307/+13 | |
| | | | ||||||
| * | | fix manual queue invocation (was using the web argc/argv from the cli) | zotlabs | 2018-02-05 | 1 | -3/+3 | |
| | | | ||||||
* | | | Merge branch 'master' into z6 | zotlabs | 2018-02-05 | 260 | -11512/+37046 | |
|\| | | ||||||
| * | | feedutils: separate the parsing of author information from the parsing of ↵ | zotlabs | 2018-02-05 | 1 | -94/+126 | |
| | | | | | | | | | | | | item/activity information | |||||
| * | | implode can take its arguments in either order, but let's try to be consistent | zotlabs | 2018-02-04 | 2 | -32/+35 | |
| | | | ||||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-04 | 10 | -45/+73 | |
| |\ \ | ||||||
| | * | | this will fix the cards query and keep the rest intact | Mario Vavti | 2018-02-04 | 5 | -7/+19 | |
| | | | | ||||||
| | * | | superfluous , | Mario Vavti | 2018-02-04 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | remove indices from mysql schema file | Mario Vavti | 2018-02-04 | 1 | -7/+0 | |
| | | | | ||||||
| | * | | remove some never used indices which prevented our item queries to find the ↵ | Mario Vavti | 2018-02-04 | 8 | -36/+59 | |
| | | | | | | | | | | | | | | | | right query execution plan in mysql and adjust some queries to optimze the result | |||||
| * | | | decomplicate cont. | zotlabs | 2018-02-03 | 2 | -49/+61 | |
| |/ / | ||||||
| * | | provide summaries in feeds under very limited cases, but never in compat ↵ | zotlabs | 2018-02-01 | 1 | -3/+19 | |
| | | | | | | | | | | | | (GNU-Social) mode | |||||
| * | | document the tag changes | zotlabs | 2018-02-01 | 1 | -3/+5 | |
| | | | ||||||
| * | | some feed cleanup | zotlabs | 2018-02-01 | 3 | -35/+19 | |
| | | | ||||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-01 | 1 | -0/+8 | |
| |\ \ | ||||||
| | * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-01 | 2 | -4/+4 | |
| | |\ \ | ||||||
| | * | | | we need to manualy take care to mark the notification read in this case | Mario Vavti | 2018-01-31 | 1 | -0/+8 | |
| | | | | | ||||||
| * | | | | more generalisation of commonly used code constructs | zotlabs | 2018-02-01 | 2 | -15/+29 | |
| | | | | | ||||||
| * | | | | more separation of complex code into separate functions | zotlabs | 2018-02-01 | 2 | -20/+35 | |
| | | | | | ||||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-30 | 0 | -0/+0 | |
| |\| | | | | |/ / | |/| | | ||||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-30 | 6 | -6/+20 | |
| | |\ \ | ||||||
| | * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-29 | 10 | -7/+110 | |
| | |\ \ \ | ||||||
| * | | | | | cosmetic readme changes, code cleanup | zotlabs | 2018-01-30 | 2 | -4/+4 | |
| | |_|/ / | |/| | | | ||||||
| * | | | | remove logging | zotlabs | 2018-01-29 | 1 | -2/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-29 | 2 | -40/+43 | |
| |\| | | | ||||||
| | * | | | Merge pull request #967 from dawnbreak/dev | git-marijus | 2018-01-29 | 1 | -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 Weidenbach | 2018-01-28 | 1 | -38/+41 | |
| | | | |/ | | | |/| | ||||||
| | * | | | Merge pull request #970 from mrjive/patch-1 | git-marijus | 2018-01-29 | 1 | -2/+2 | |
| | |\ \ \ | | | |/ / | | |/| | | small details on connections.tpl | |||||
| | | * | | small details | mrjive | 2018-01-29 | 1 | -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 ↵ | zotlabs | 2018-01-29 | 1 | -0/+11 | |
| | | | | | | | | | | | | | | | | selected (:todo: also disable bbcode autocomplete) | |||||
| * | | | unable to delete accounts using tickboxes on admin/accounts - make all the ↵ | zotlabs | 2018-01-29 | 2 | -5/+8 | |
| | | | | | | | | | | | | | | | | action names consistent | |||||
| * | | | redirect to the email_validation page if login was attempted after account ↵ | zotlabs | 2018-01-29 | 3 | -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 ↵ | zotlabs | 2018-01-29 | 1 | -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_merge | zotlabs | 2018-01-28 | 10 | -49/+61 | |
| |\| | ||||||
| | * | do not always look first in chache when receiving the *open* status from cache | Mario Vavti | 2018-01-28 | 1 | -2/+2 | |
| | | | ||||||
| | * | query optimisations for notifications - use a specific index only | Mario Vavti | 2018-01-28 | 5 | -7/+23 | |
| | | | ||||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-28 | 3 | -5/+23 | |
| | |\ | ||||||
| | * | | fix syntax error | Mario Vavti | 2018-01-27 | 1 | -2/+2 | |
| | | | |