Commit graph

24212 commits

Author SHA1 Message Date
zotlabs
9212e6036a Merge branch 'dev' into release 2020-07-15 16:57:40 -07:00
zotlabs
4c69a7f376 now socgraph is looping 2020-07-15 16:57:16 -07:00
zotlabs
afb936081e Merge branch 'dev' into release 2020-07-15 16:31:55 -07:00
zotlabs
cffed6a665 release 2020-07-15 16:31:35 -07:00
zotlabs
737659f70f prevent discovery loops 2020-07-15 16:29:17 -07:00
zotlabs
8c21cb1677 Merge branch 'dev' into release 2020-07-15 12:52:31 -07:00
zotlabs
f974510fa3 missing call 2020-07-15 12:52:08 -07:00
zotlabs
d3f409c282 Merge branch 'dev' of ../p3 into release 2020-07-15 04:35:36 -07:00
zotlabs
423f54503c missed this one 2020-07-15 04:35:00 -07:00
zotlabs
543027dc42 Merge branch 'dev' into release 2020-07-15 04:16:29 -07:00
zotlabs
f1593477c4 hubloc confusion 2020-07-15 04:10:02 -07:00
zotlabs
8d89acee7a Merge branch 'dev' into release 2020-07-14 18:49:25 -07:00
zotlabs
e07a92a4d5 connect issue and pubstream localhost delivery issue 2020-07-14 18:47:23 -07:00
zotlabs
3d945d7387 Merge branch 'dev' into release 2020-07-14 17:25:42 -07:00
zotlabs
95dd75e813 version 2020-07-14 17:25:14 -07:00
zotlabs
54623e5cc0 double posts in mod_pubstream 2020-07-14 17:24:34 -07:00
zotlabs
552a1d8120 Merge branch 'dev' of ../p3 into dev 2020-07-12 21:18:49 -07:00
zotlabs
73f38477cf assure correct operator precedence 2020-07-12 21:17:53 -07:00
zotlabs
270ee436fe util/phplogtime: use '-' to read from stdin 2020-07-08 17:00:41 -07:00
zotlabs
c44f3c1bdd add util/phplogtime - this converts the timestamps from the PHP error log into UTC so that the events contained therein can be cross-referenced with the application logfile. 2020-07-07 21:58:19 -07:00
zotlabs
1a181fd543 second attempt to handle Pleroma's "source" field correctly in the cases where it has no mediatype and content elements 2020-07-07 17:54:08 -07:00
Mike Macgirvin
ac7bd1371d composer updates 2020-07-07 15:25:01 +10:00
Mike Macgirvin
8d64aa1084 composer update 2020-07-07 15:21:11 +10:00
zotlabs
151a5f22e4 Merge branch 'dev' into release 2020-07-06 21:06:40 -07:00
zotlabs
61953c11ca check array path 2020-07-06 21:05:31 -07:00
zotlabs
71244d4129 Merge branch 'dev' into release 2020-07-06 18:51:31 -07:00
zotlabs
48f97a5044 revision, strings 2020-07-06 18:51:10 -07:00
zotlabs
562253d038 testing permissions on complex group deliveries 2020-07-06 18:48:02 -07:00
zotlabs
cd6f240e05 further qualify 2020-07-06 01:33:33 -07:00
zotlabs
8895267f48 string change 2020-07-05 23:37:30 -07:00
zotlabs
1aebf6a856 edit and delete group posts 2020-07-05 23:18:31 -07:00
zotlabs
a9bdd411f8 cleanup permit_all_mentions 2020-07-03 19:36:46 -07:00
zotlabs
107f057ff1 undocumented feature 2020-07-03 15:48:58 -07:00
zotlabs
87bfe83fd4 cleanup of really old and obsolete stuff from util 2020-07-01 23:03:34 -07:00
zotlabs
e3055ac410 code cleanup 2020-07-01 22:21:30 -07:00
zotlabs
8cf089e2d9 timestamp 2020-07-01 18:09:24 -07:00
zotlabs
13edcdbc3a some minor cleanup while code reviewing mod_inbox. 2020-06-30 21:30:03 -07:00
zotlabs
099cf05935 consult blocked channels prior to storage 2020-06-30 17:47:31 -07:00
zotlabs
2fd886303f Merge branch 'dev' into release 2020-06-28 20:26:46 -07:00
zotlabs
595f186906 release 2020-06-28 20:26:20 -07:00
zotlabs
23af3b36a1 Merge branch 'dev' of ../p3 into dev 2020-06-28 20:25:31 -07:00
zotlabs
558d38375e generalise the rmagic login form so we can re-use it for remote follows and stuff 2020-06-28 20:24:36 -07:00
zotlabs
f469f14166 add fakelink class to stream filter dropdown arrow 2020-06-28 20:23:38 -07:00
zotlabs
e663267843 Update repository links to point to codeberg. Framagit can still be used for as long as the server keeps running. 2020-06-28 16:37:21 -07:00
zotlabs
b8d98e61e2 Merge branch 'dev' into release 2020-06-27 15:07:55 -07:00
zotlabs
f3031e0515 strings 2020-06-27 15:04:27 -07:00
zotlabs
01901ac3a9 collapse the activity_filter widget to reduce clutter 2020-06-27 14:50:15 -07:00
zotlabs
886031dacf prevent chanview from being used as an anonymous redirect by spammers 2020-06-23 17:45:27 -07:00
Zot
bf0209a6bd Merge branch 'dev' into 'dev'
Update Spanish translation

See merge request zot/zap!33
2020-06-22 01:39:13 +02:00
mjfriaza
425b158c80 Update Spanish translation 2020-06-21 13:53:41 +02:00