Commit graph

23103 commits

Author SHA1 Message Date
zotlabs
0bee1bdb49 missing file 2019-01-23 17:55:39 -08:00
zotlabs
ab9f1ae33c wordsmithing 2019-01-23 16:18:05 -08:00
zotlabs
a20c94b041 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-23 14:38:20 -08:00
zotlabs
ad8c634b33 Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev 2019-01-23 14:29:01 -08:00
zotlabs
045debd26f issues with autoperms, rewrite owa, upstream fixes to main.js 2019-01-23 14:27:51 -08:00
Mike Macgirvin
c0ea15c6e2 Merge branch 'dev' into 'dev'
Update colorbox.css to be slightly lighter

See merge request macgirvin/osada!13
2019-01-23 23:22:20 +01:00
Marek Lach
f35cc32bf3 Update colorbox.css to be slightly lighter 2019-01-23 20:53:12 +01:00
zotlabs
ea9c4572fb Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-22 19:13:14 -08:00
zotlabs
a4f638124b content filter app 2019-01-22 19:11:53 -08:00
zotlabs
01d9f1154d Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-21 21:47:52 -08:00
zotlabs
56d61ae89b disable online presence indication until there is a viable realtime chat 2019-01-21 21:47:16 -08:00
zotlabs
8e01d651d0 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-21 21:20:35 -08:00
zotlabs
df5e298628 remove backtrace on zlib/webfinger, no longer needed for troubleshooting 2019-01-21 21:19:41 -08:00
zotlabs
760ba24945 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-21 17:32:54 -08:00
zotlabs
1d3540ac6c refactor include/follow (Connect::connect()) and update strings 2019-01-21 17:31:24 -08:00
zotlabs
1719986ba0 add spec directory 2019-01-21 15:56:07 -08:00
zotlabs
29a907c697 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-21 15:06:52 -08:00
zotlabs
cfd8209f0d add "smoothed" koala artwork and change affinitiy slider background colour to match conversations 2019-01-21 15:06:21 -08:00
zotlabs
ca3b993e85 add "smoothed" koala artwork and change affinitiy slider background colour to match conversations 2019-01-21 15:05:06 -08:00
zotlabs
a2a57eb8ff Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-20 21:42:32 -08:00
zotlabs
8aa200df86 more work on cross-protocol follows with multiple xchans/hublocs 2019-01-20 21:42:04 -08:00
zotlabs
76d66184fc more work on cross-protocol follows with multiple xchans/hublocs 2019-01-20 21:41:19 -08:00
zotlabs
e9c7e8ab04 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-20 19:40:38 -08:00
zotlabs
c40a502b0c provide tracking for errant double json encoding on zot6 transmissions (infrequent) 2019-01-20 19:37:39 -08:00
zotlabs
35f1cee50b more comment policy work 2019-01-20 15:52:44 -08:00
zotlabs
35fb50ace6 more comment policy work 2019-01-20 15:52:02 -08:00
zotlabs
b42f453f10 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-20 15:01:01 -08:00
zotlabs
714227c630 Merge branch 'dev' 2019-01-20 15:00:17 -08:00
zotlabs
4350a64f8d be more specific about hubloc_network 2019-01-20 14:59:43 -08:00
zotlabs
67e868c425 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-20 14:41:23 -08:00
zotlabs
3239695ec3 Merge branch 'dev' 2019-01-20 14:40:44 -08:00
zotlabs
1bdd8b6c52 comment perm issue 2019-01-20 14:39:52 -08:00
zotlabs
cd664bfeac Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-20 14:13:25 -08:00
zotlabs
75cb386eb6 rev update 2019-01-18 13:18:47 -08:00
zotlabs
1677853900 v2.2 2019-01-18 13:17:43 -08:00
zotlabs
ab2a3aae2e Merge branch 'dev' 2019-01-18 13:17:11 -08:00
zotlabs
289150a21a updates 2019-01-18 13:04:05 -08:00
zotlabs
f81d2f08d1 cleanup 2019-01-17 15:12:58 -08:00
zotlabs
bf39206518 store item_level to avoid a lot of recursion during rendering 2019-01-14 14:47:05 -08:00
zotlabs
40eb338db5 move ActivityStreams::fetch to Activity::fetch as it now has structural platform dependencies and may require porting. 2019-01-13 21:22:45 -08:00
zotlabs
a611a1cecc send signed fetches over AP, requeue (queue::update) AP messages on fail, set ajaxasync flag on updates, upstream fixes to mail import 2019-01-13 16:08:26 -08:00
M. Dent
366f7c3fe6 use db_getfunc(). 2019-01-11 14:13:56 +01:00
DM42.Net (Matt Dent)
2003e0dbdc Fix for difference between PGSQL and MYSQL 2019-01-10 15:23:22 -05:00
ZotSocial Admin
35a7fe1994 FIX: memory exhaustion on exceptionally large message queues & multiple Queue.php invocations duplicate work 2019-01-10 13:38:14 -05:00
zotlabs
d3121763f3 make base apps pluggable 2019-01-08 20:34:39 -08:00
zotlabs
e0ac0e4050 allow notification updates when commenting 2019-01-05 16:50:33 -08:00
zotlabs
66e0c61ebb separate blacklisting availability for public streams and general communications 2019-01-05 14:47:21 -08:00
zotlabs
7d3c1bd947 wrong variable 2019-01-05 12:46:20 -08:00
zotlabs
64462c9d0d enable activitypub for encoding collections 2019-01-05 12:42:41 -08:00
zotlabs
c3ab068607 comment policy work 2019-01-05 12:39:19 -08:00