2392 commits

Author	SHA1	Message	Date
nobody	43b7cecc19	Merge branch 'dev' of /home/macgirvin/z into dev	2021-01-24 16:28:17 -08:00
nobody	d0a18b30ae	doco	2021-01-24 14:40:40 -08:00
nobody	f5878c5181	Merge branch 'dev' of /home/macgirvin/z into dev	2021-01-19 18:26:15 -08:00
nobody	7eef0f8002	release	2021-01-19 18:23:19 -08:00
nobody	6e6840a96a	fixes from upstream	2021-01-19 18:21:48 -08:00
nobody	d0fe0d6da9	Merge branch 'dev' of /home/macgirvin/z into dev	2021-01-08 13:56:06 -08:00
nobody	9c65d28244	import/export issues	2021-01-08 13:53:28 -08:00
nobody	f60b3e7a21	Merge branch 'dev' of /home/macgirvin/z into dev	2020-12-23 15:29:43 -08:00
nobody	9ab4781af1	release	2020-12-23 15:25:56 -08:00
nobody	65c16f93e1	Merge branch 'dev' of /home/macgirvin/z into dev	2020-12-22 15:32:20 -08:00
nobody	7ba5ca606c	little tweaks	2020-12-22 15:30:52 -08:00
nobody	0ca5b575b3	Merge branch 'dev' of /home/macgirvin/z into dev	2020-12-20 18:14:22 -08:00
nobody	f175695944	revision	2020-12-20 15:39:47 -08:00
nobody	ed2826abb6	owa clarify which key to use	2020-12-19 13:10:59 -08:00
nobody	0da2b9bf90	backout community restrictions	2020-12-17 18:36:47 -08:00
nobody	2d7716a3dc	Merge branch 'dev' of /home/macgirvin/z into dev	2020-12-14 21:54:34 -08:00
nobody	f424676d03	revision	2020-12-14 17:53:18 -08:00
nobody	d2c49fa8e6	Merge branch 'dev' of /home/macgirvin/z into dev	2020-12-10 18:06:53 -08:00
nobody	585438222c	revision	2020-12-10 17:36:09 -08:00
nobody	694c23e6d6	Merge branch 'dev' of /home/macgirvin/z into dev	2020-12-07 17:37:44 -08:00
nobody	8e3d6671ce	app documentation	2020-12-06 18:42:28 -08:00
nobody	e5313d0d69	Merge branch 'dev' of /home/macgirvin/z into dev	2020-12-01 17:30:20 -08:00
nobody	72074fca2b	wrong sort function	2020-12-01 17:27:13 -08:00
nobody	79015c3834	Merge branch 'dev' of /home/macgirvin/z into dev	2020-11-30 21:49:04 -08:00
nobody	71918340af	remove more deprecated apps	2020-11-30 11:09:14 -08:00
nobody	21d1bec13c	Merge branch 'dev' of /home/macgirvin/z into dev	2020-11-30 10:45:15 -08:00
nobody	f4eee222db	revision	2020-11-29 21:34:45 -08:00
nobody	d76e5b1983	revision	2020-11-28 02:20:51 -08:00
nobody	55657cd3ce	revision	2020-11-26 17:01:21 -08:00
nobody	7ca480f231	provide a global project default setting for whether or not ActivityPub is enabled. It can still be toggled at the site level and (if enabled at the system level) toggled at the channel level.	2020-11-26 16:17:07 -08:00
nobody	732a2ef195	Merge branch 'dev' of /home/macgirvin/z into dev	2020-11-25 20:59:20 -08:00
nobody	fe8db82c6e	revision	2020-11-25 17:39:28 -08:00
nobody	a752db34c7	more work on comment control	2020-11-24 19:22:59 -08:00
nobody	ef7b3a338d	Merge branch 'dev' of /home/macgirvin/z into dev	2020-11-22 14:22:33 -08:00
nobody	74ebbdf3b4	revision	2020-11-22 14:18:25 -08:00
nobody	a8fbb086e4	whitespace	2020-11-19 18:42:11 -08:00
nobody	ec9996e66a	add xchan_created, quote message blocks added to (mostly) invisible activities	2020-11-18 20:09:05 -08:00
nobody	911f3ca47b	Merge branch 'dev' of ../p3 into dev	2020-11-14 16:13:54 -08:00
nobody	04817523cc	tagging issues	2020-11-14 16:13:23 -08:00
nobody	bfb0a52ca8	revision	2020-11-14 12:02:10 -08:00
nobody	50c7dd18be	Merge branch 'dev' of /home/macgirvin/z into dev	2020-11-10 18:52:23 -08:00
nobody	8aa0e232a7	Merge branch 'dev' of ../p3 into dev	2020-11-10 17:12:48 -08:00
nobody	0f696c6d19	revision	2020-11-10 17:12:30 -08:00
nobody	2d6db55961	federate categories	2020-11-10 17:11:19 -08:00
nobody	eaa2675a1a	version	2020-11-06 13:03:52 -08:00
nobody	89776640e7	revision	2020-11-01 15:25:36 -08:00
nobody	a246942ea5	Issue with pleroma unfollow and follow again, wherein using the same id as last time for follow and accept (based on abook_id) is ignored as a duplicate.	2020-10-29 19:41:00 -07:00
nobody	a3ba276728	Merge branch 'dev' of /home/macgirvin/z into dev	2020-10-27 18:04:54 -07:00
nobody	3232b245ba	Merge branch 'dev' of ../p3 into dev	2020-10-26 19:54:43 -07:00
nobody	6fd6bf0701	cleanup deprecated directory code	2020-10-26 19:51:59 -07:00