aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-201-1/+1
|\
| * copy/paste error resulting in bad behaviourzotlabs2018-02-201-1/+1
| |
* | missing fileMario Vavti2018-02-201-0/+29
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-197-62/+84
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-191-1/+15
| |\
| * | updates 1201 and 1200 should return success for postgres. notifications: ↵Mario Vavti2018-02-193-8/+16
| | | | | | | | | | | | remove class show and session storage entry when we mark all notifications seen
| * | Merge pull request #980 from dawnbreak/devgit-marijus2018-02-193-53/+44
| |\ \ | | | | | | | | Refactor OAuth2Server a bit.
| | * | Refactor OAuth2Server a bit.Klaus Weidenbach2018-02-173-53/+44
| | | |
| * | | backport update 1201 to the new update system and move dummy update to 1202Mario Vavti2018-02-192-5/+28
| | | |
* | | | and fix the typozotlabs2018-02-191-1/+1
| | | |
* | | | fix the fix for precisionzotlabs2018-02-191-1/+1
| |_|/ |/| |
* | | target zot6 deliveries with more precision to ensure we handle a very ↵zotlabs2018-02-191-1/+15
|/ / | | | | | | precise type of content until the mechanism is extended to other types in the future
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-162-7/+7
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-164-54/+171
| |\
| * | some more DB tuning.Mario Vavti2018-02-152-7/+7
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-153-5/+15
| |\ \
* | | | refactor of the DB update system. Updates are now stored individually in ↵zotlabs2018-02-16204-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 tablezotlabs2018-02-154-54/+171
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-142-6/+17
|\| | | |/ |/|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-144-2/+162
| |\
| * | 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
* | | provide option to block the public stream unless authenticated, since there ↵zotlabs2018-02-143-5/+15
| |/ |/| | | | | could be legal issues with unmoderated content
* | 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
|/
* 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
| |