Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-16 | 2 | -7/+7 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-16 | 4 | -54/+171 |
| |\ | |||||
| * | | some more DB tuning. | Mario Vavti | 2018-02-15 | 2 | -7/+7 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-15 | 3 | -5/+15 |
| |\ \ | |||||
* | | | | refactor of the DB update system. Updates are now stored individually in ↵ | zotlabs | 2018-02-16 | 204 | -99/+4585 |
| |_|/ |/| | | | | | | | | Zotlabs/Update/_nnnn.php and are objects; so only the pending updates need to be loaded and executed rather than all historical updates. There is one single number (DB_UPDATE_VERSION) representing the current version and it is EQUAL TO the last known update. A dummy update _1201 was created to address the difference in counting behaviour; it will be executed on the next change of DB_UPDATE_VERSION as well as the next update. The database config values are also loaded from disk on every update immediately before setting the update lock in order to reduce timing conflicts and race conditions. | ||||
* | | | extend the oauth2 storage driver so that we can use our own channel table | zotlabs | 2018-02-15 | 4 | -54/+171 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-14 | 2 | -6/+17 |
|\| | | |/ |/| | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-14 | 4 | -2/+162 |
| |\ | |||||
| * | | fix item link in fsprint | Mario Vavti | 2018-02-13 | 1 | -1/+1 |
| | | | |||||
| * | | match against item verb | Mario Vavti | 2018-02-13 | 1 | -4/+4 |
| | | | |||||
| * | | since we only save the parent mid in notify we must look for thr_parent when ↵ | Mario Vavti | 2018-02-13 | 1 | -1/+12 |
| | | | | | | | | | | | | dealing with likes | ||||
* | | | provide option to block the public stream unless authenticated, since there ↵ | zotlabs | 2018-02-14 | 3 | -5/+15 |
| |/ |/| | | | | | could be legal issues with unmoderated content | ||||
* | | Merge branch 'share' | zotlabs | 2018-02-13 | 3 | -1/+161 |
|\ \ | |||||
| * | | turn shares into activities - make certain to pull addons or JSON-LD will ↵ | zotlabs | 2018-02-13 | 3 | -4/+149 |
| | | | | | | | | | | | | chuck a wobbly | ||||
| * | | initial share refactor | zotlabs | 2018-02-12 | 1 | -1/+16 |
| |/ | |||||
* / | defperms: bad query | zotlabs | 2018-02-13 | 1 | -1/+1 |
|/ | |||||
* | if always_show_in_notices is set to 1 also show likes and dislikes | Mario Vavti | 2018-02-12 | 1 | -15/+28 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-11 | 3 | -21/+21 |
|\ | |||||
| * | finally fix channel query | Mario Vavti | 2018-02-09 | 1 | -4/+4 |
| | | |||||
| * | use distinct in channel item query and minor notification cache improvement | Mario Vavti | 2018-02-09 | 1 | -5/+5 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-09 | 2 | -5/+20 |
| |\ | |||||
| * | | wrong link | Mario Vavti | 2018-02-08 | 1 | -1/+1 |
| | | | |||||
| * | | more db and queries finetuning | Mario Vavti | 2018-02-08 | 1 | -13/+13 |
| | | | |||||
* | | | second part of hubzilla issue #972 | zotlabs | 2018-02-11 | 1 | -5/+4 |
| | | | |||||
* | | | hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments | zotlabs | 2018-02-11 | 1 | -1/+3 |
| | | | |||||
* | | | use new forum tag style in forum search postings | zotlabs | 2018-02-11 | 1 | -1/+1 |
| | | | |||||
* | | | hubzilla issue #975 (searching for title as well as body could present a ↵ | zotlabs | 2018-02-09 | 1 | -1/+1 |
| |/ |/| | | | | | performance issue, so perhaps the tradeoffs should be debated) | ||||
* | | zot6 testing | zotlabs | 2018-02-08 | 1 | -6/+1 |
| | | |||||
* | | missing quote | zotlabs | 2018-02-08 | 1 | -1/+1 |
| | | |||||
* | | logging | zotlabs | 2018-02-08 | 1 | -1/+3 |
| | | |||||
* | | z6 testing | zotlabs | 2018-02-08 | 1 | -1/+1 |
| | | |||||
* | | debug the crypto function | zotlabs | 2018-02-07 | 1 | -0/+3 |
| | | |||||
* | | more zot6 delivery work | zotlabs | 2018-02-07 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into z6 | zotlabs | 2018-02-07 | 5 | -52/+9 |
|\| | |||||
| * | remove mobile_detect (outdated and unmaintainable) | zotlabs | 2018-02-05 | 4 | -51/+8 |
| | | |||||
| * | 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 | 34 | -247/+460 |
|\| | |||||
| * | implode can take its arguments in either order, but let's try to be consistent | zotlabs | 2018-02-04 | 1 | -6/+6 |
| | | |||||
| * | this will fix the cards query and keep the rest intact | Mario Vavti | 2018-02-04 | 2 | -2/+2 |
| | | |||||
| * | remove some never used indices which prevented our item queries to find the ↵ | Mario Vavti | 2018-02-04 | 6 | -33/+39 |
| | | | | | | | | right query execution plan in mysql and adjust some queries to optimze the result | ||||
| * | some feed cleanup | zotlabs | 2018-02-01 | 1 | -8/+9 |
| | | |||||
| * | more separation of complex code into separate functions | zotlabs | 2018-02-01 | 1 | -20/+3 |
| | | |||||
| * | 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 | 1 | -38/+41 |
| |\ | |||||
| | * | Fix a PHP7.2 warning when a channel has no cards. | Klaus Weidenbach | 2018-01-28 | 1 | -38/+41 |
| | | | |||||
| * | | unable to delete accounts using tickboxes on admin/accounts - make all the ↵ | zotlabs | 2018-01-29 | 1 | -3/+6 |
| | | | | | | | | | | | | action names consistent | ||||
| * | | redirect to the email_validation page if login was attempted after account ↵ | zotlabs | 2018-01-29 | 1 | -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 ↵ | 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 | 4 | -7/+16 |
| |\| | |||||
| | * | query optimisations for notifications - use a specific index only | Mario Vavti | 2018-01-28 | 2 | -4/+10 |
| | | |