Commit graph

22899 commits

Author SHA1 Message Date
zotlabs
0563c714a7 infrastructure for resolving portable zot urls 2019-02-18 14:40:46 -08:00
zotlabs
e108b7c223 fixes from upstream 2019-02-17 21:45:31 -08:00
zotlabs
4b96c88e50 more removal of unnecessary legacy stuff, string update 2019-02-17 15:00:08 -08:00
zotlabs
7762053038 no delivery chains for forum tags 2019-02-14 21:06:09 -08:00
zotlabs
e3a5b2fdf8 php warnings 2019-02-14 20:44:34 -08:00
zotlabs
9b36994ef1 Merge ../p3 into dev 2019-02-14 17:08:44 -08:00
zotlabs
db9eae39b8 more string changes 2019-02-14 17:06:17 -08:00
zotlabs
a7ba84e6f2 fix forum detection 2019-02-14 16:25:06 -08:00
zotlabs
f25a48c54a accesscontrol rename 2019-02-14 16:01:40 -08:00
zotlabs
c8714bf9c2 wrong edit link 2019-02-14 15:33:51 -08:00
zotlabs
63a75cc7d5 rename privacy groups to access lists, forums to groups 2019-02-14 15:26:37 -08:00
zotlabs
c72d19dbf2 profile photo edit date weirdness 2019-02-13 21:07:27 -08:00
zotlabs
8b5bc7303f more work zot+ 2019-02-13 19:55:36 -08:00
zotlabs
154b0e96d5 start zot+/zap+ 2019-02-13 15:33:45 -08:00
zotlabs
92f3192dd9 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-12 18:05:30 -08:00
zotlabs
880579f249 change repo locations 2019-02-11 15:55:07 -08:00
zotlabs
5ddf47a294 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-11 15:52:22 -08:00
zotlabs
329f441fec remove hyperdrive setting as it does not work reliably in all cases 2019-02-11 15:15:12 -08:00
zotlabs
7dcfd5995b consistent file permissions 2019-02-07 21:34:55 -08:00
zotlabs
4bc9620597 expose setting to block public search 2019-02-07 21:05:42 -08:00
zotlabs
e1c82b4e99 suppress duplicates arriving via legacy zot (probably during polling) with legacy message-ids 2019-02-06 20:35:14 -08:00
zotlabs
2657bdb60b Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-05 21:00:20 -08:00
zotlabs
9e740c327f small change to notification behaviour 2019-02-05 21:00:00 -08:00
zotlabs
46b240a228 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-05 19:02:32 -08:00
zotlabs
23a67081d9 misc fixes from the logs and upstream 2019-02-05 19:01:17 -08:00
zotlabs
22f6ab103e Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-03 18:24:16 -08:00
zotlabs
af66054c1e tests updated for handle_tag() changes, Firefox slider no longer honours background color if proprietary foreground is unset. 2019-02-03 18:22:30 -08:00
zotlabs
da09048a7d linkify_tags fixes from upstream 2019-02-03 16:57:07 -08:00
zotlabs
362662751e Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-03 11:45:58 -08:00
zotlabs
25c160655f fix for missing authors and a permission fix from upstream 2019-02-03 11:45:29 -08:00
zotlabs
e0299d7023 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-03 11:21:55 -08:00
zotlabs
342f6effe1 regression in latest queue work 2019-02-03 11:21:25 -08:00
zotlabs
cd4f453c4c Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-01 13:12:01 -08:00
zotlabs
9c1159db0a missing paren 2019-02-01 13:11:20 -08:00
zotlabs
265406b91b Merge branch 'dev' of /home/macgirvin/osada into dev 2019-02-01 12:50:04 -08:00
zotlabs
ec88b2e1fa Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev 2019-02-01 12:48:25 -08:00
zotlabs
77e84a70a9 better handling of tombstones 2019-02-01 12:47:34 -08:00
zotlabs
d179a7694e Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-31 16:29:20 -08:00
zotlabs
f31749d4ec change privacy hover message when $privacy_warning in effect 2019-01-31 16:28:14 -08:00
zotlabs
0f2e991c56 rename the sharing options and update the license for 2019 2019-01-31 15:54:37 -08:00
Mike Macgirvin
002d900514 Merge branch 'patch-20190110a' into 'dev'
FIX: memory exhaustion on exceptionally large message queues & multiple...

See merge request macgirvin/osada!12
2019-01-31 01:31:32 +01:00
zotlabs
4dcad056f6 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-29 21:49:08 -08:00
zotlabs
ec6297c60b federation issues with embedded posts 2019-01-29 21:48:45 -08:00
zotlabs
6fd5bb36fb implement old-style share as a post embed 2019-01-29 21:34:26 -08:00
zotlabs
2f493466f9 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-29 21:27:14 -08:00
zotlabs
8f861659d2 post embed 2019-01-29 21:26:52 -08:00
zotlabs
a3a32d16aa Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-29 18:19:44 -08:00
zotlabs
9eb9e10712 cache embeds on storage 2019-01-29 15:18:35 -08:00
zotlabs
f5125b51f1 add ical link to activitystreams event objects 2019-01-28 14:58:18 -08:00
zotlabs
e8c935e6e7 Merge branch 'dev' of /home/macgirvin/osada into dev 2019-01-27 14:54:02 -08:00