Commit graph

1845 commits

Author SHA1 Message Date
Mario Vavti
85a6dd6031 Merge remote-tracking branch 'mike/master' into dev 2018-02-20 23:58:17 +01:00
zotlabs
b4dad81767 copy/paste error resulting in bad behaviour 2018-02-20 14:41:46 -08:00
Mario Vavti
93d4a16017 missing file 2018-02-20 10:29:22 +01:00
zotlabs
76b5c68646 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-19 16:19:14 -08:00
zotlabs
331fe92b9e and fix the typo 2018-02-19 14:14:45 -08:00
zotlabs
f0d68a1a25 fix the fix for precision 2018-02-19 14:13:44 -08:00
Mario Vavti
66309a3fea Merge remote-tracking branch 'mike/master' into dev 2018-02-19 22:21:50 +01:00
zotlabs
04185b05ab target zot6 deliveries with more precision to ensure we handle a very precise type of content until the mechanism is extended to other types in the future 2018-02-19 11:57:47 -08:00
Mario Vavti
2047801b85 updates 1201 and 1200 should return success for postgres. notifications: remove class show and session storage entry when we mark all notifications seen 2018-02-19 20:23:13 +01:00
git-marijus
b56633e1d6
Merge pull request #980 from dawnbreak/dev
Refactor OAuth2Server a bit.
2018-02-19 11:11:08 +01:00
Mario Vavti
1732ffed7a backport update 1201 to the new update system and move dummy update to 1202 2018-02-19 10:59:21 +01:00
Klaus Weidenbach
4a5d1076ed Refactor OAuth2Server a bit. 2018-02-17 01:49:01 +01:00
zotlabs
4e6072fb29 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-16 16:42:45 -08:00
zotlabs
f492f808f4 refactor of the DB update system. Updates are now stored individually in 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. 2018-02-16 12:42:02 -08:00
Mario Vavti
547ef772ab Merge remote-tracking branch 'mike/master' into dev 2018-02-16 20:47:20 +01:00
zotlabs
27cd26ec1e extend the oauth2 storage driver so that we can use our own channel table 2018-02-15 18:47:56 -08:00
Mario Vavti
9e251a1abc some more DB tuning. 2018-02-15 19:24:15 +01:00
Mario Vavti
45b42cbc1c Merge remote-tracking branch 'mike/master' into dev 2018-02-15 09:00:52 +01:00
zotlabs
c11ebd12d5 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-14 15:37:35 -08:00
zotlabs
465d89129c provide option to block the public stream unless authenticated, since there could be legal issues with unmoderated content 2018-02-14 15:32:33 -08:00
Mario Vavti
0336082920 Merge remote-tracking branch 'mike/master' into dev 2018-02-14 10:29:36 +01:00
zotlabs
24da5d82db Merge branch 'share' 2018-02-13 20:09:55 -08:00
zotlabs
64809dd277 turn shares into activities - make certain to pull addons or JSON-LD will chuck a wobbly 2018-02-13 20:07:57 -08:00
zotlabs
6ca3442ba3 defperms: bad query 2018-02-13 12:13:37 -08:00
Mario Vavti
27baf46eb5 fix item link in fsprint 2018-02-13 12:33:49 +01:00
Mario Vavti
d2dcb93866 match against item verb 2018-02-13 12:04:48 +01:00
Mario Vavti
d826515ba8 since we only save the parent mid in notify we must look for thr_parent when dealing with likes 2018-02-13 11:01:58 +01:00
zotlabs
fd81a4bdc4 initial share refactor 2018-02-12 21:43:04 -08:00
Mario Vavti
b7fb78245a if always_show_in_notices is set to 1 also show likes and dislikes 2018-02-12 22:48:53 +01:00
zotlabs
0f8d2d4e58 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-11 19:36:37 -08:00
zotlabs
63107f5b2f second part of hubzilla issue #972 2018-02-11 18:17:17 -08:00
zotlabs
a31331bfd9 hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments 2018-02-11 18:02:28 -08:00
zotlabs
07d33a1183 use new forum tag style in forum search postings 2018-02-11 15:34:34 -08:00
zotlabs
5a9ea29614 hubzilla issue #975 (searching for title as well as body could present a performance issue, so perhaps the tradeoffs should be debated) 2018-02-09 14:08:29 -08:00
Mario Vavti
6cc3294395 finally fix channel query 2018-02-09 20:36:14 +01:00
Mario Vavti
5f229d81e9 use distinct in channel item query and minor notification cache improvement 2018-02-09 14:06:59 +01:00
Mario Vavti
2227de5f65 Merge remote-tracking branch 'mike/master' into dev 2018-02-09 06:58:12 +01:00
zotlabs
cd1e5d4171 zot6 testing 2018-02-08 16:22:10 -08:00
zotlabs
beec49847f missing quote 2018-02-08 15:45:33 -08:00
zotlabs
e4503f743e logging 2018-02-08 15:36:22 -08:00
zotlabs
635c5e532b z6 testing 2018-02-08 15:32:54 -08:00
Mario Vavti
384cb215be wrong link 2018-02-08 10:26:49 +01:00
Mario Vavti
661c20e452 more db and queries finetuning 2018-02-08 09:47:49 +01:00
zotlabs
4c27fa5c37 debug the crypto function 2018-02-07 22:04:53 -08:00
zotlabs
3a0db39fa0 more zot6 delivery work 2018-02-07 18:38:10 -08:00
zotlabs
1d8d2c6e55 Merge branch 'master' into z6 2018-02-07 17:54:21 -08:00
zotlabs
cadd958339 remove mobile_detect (outdated and unmaintainable) 2018-02-05 18:06:25 -08:00
zotlabs
b06c52553d fix manual queue invocation (was using the web argc/argv from the cli) 2018-02-05 16:08:01 -08:00
zotlabs
b41c5f3497 Merge branch 'master' into z6 2018-02-05 15:58:28 -08:00
zotlabs
f15fd93f90 implode can take its arguments in either order, but let's try to be consistent 2018-02-04 17:01:59 -08:00