25595 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
nobody	b473b96527	Merge branch 'dev' of /home/macgirvin/z into dev	2021-09-23 16:39:33 -07:00
nobody	18b250582e	superfluous comma	2021-09-23 16:37:38 -07:00
nobody	d12e4ef092	be extra paranoid about pubstream content	2021-09-23 16:33:31 -07:00
nobody	3a862cb6c8	Merge branch 'dev' of ../z into sitechan	2021-09-23 16:33:09 -07:00
nobody	82533f602b	update	2021-09-23 16:32:44 -07:00
nobody	1c70859010	remove a number of sys channel prohibitions since it is now an active and fully functional channel	2021-09-23 15:47:58 -07:00
nobody	17105fcd15	more sitechan backend stuff	2021-09-23 15:26:31 -07:00
nobody	319f3ce5e3	more work on site chan	2021-09-23 13:35:35 -07:00
nobody	409ce40bcf	Merge branch 'dev' of ../p3 into dev	2021-09-21 00:50:26 -07:00
nobody	87e9a7ec26	Add drafts to activity_filter widget since this is where one might first look ffor them.	2021-09-21 00:48:52 -07:00
nobody	f99db54419	sitechan updates	2021-09-20 22:51:28 -07:00
nobody	97239639d3	Merge branch 'dev' of ../z into sitechan	2021-09-20 22:47:35 -07:00
nobody	0d20f67beb	prepare for sitechan to land	2021-09-20 22:44:03 -07:00
nobody	41de2d93d0	only include the ability to switch to the sys channel if the logged in user is admin	2021-09-17 14:19:59 -07:00
nobody	3f4d8d4ac8	Merge branch 'dev' into sitechan	2021-09-17 14:13:17 -07:00
nobody	e7ca478998	Merge branch 'dev' of /home/macgirvin/z into dev	2021-09-17 13:43:08 -07:00
nobody	b483da46dc	version	2021-09-17 05:52:44 -07:00
nobody	a7f41a00c2	sql: sprintf arg count incorrect	2021-09-17 05:49:32 -07:00
nobody	4cb775bccc	lockview improvements	2021-09-17 05:35:29 -07:00
nobody	7462d334a0	Merge branch 'dev' into lockview	2021-09-17 05:00:38 -07:00
nobody	e764dc78be	fix modal() with empty args	2021-09-17 00:02:02 -07:00
nobody	4327c7844c	mod_ap_probe: return curl error info if fetch fails	2021-09-16 21:16:08 -07:00
nobody	cea5b03abc	lockview updates	2021-09-16 20:31:39 -07:00
nobody	04a4818640	Merge branch 'dev' of /home/macgirvin/z into dev	2021-09-16 16:24:41 -07:00
nobody	009e457f36	guest pass issue	2021-09-16 16:12:44 -07:00
nobody	4f9cd8dfed	Merge branch 'dev' of /home/macgirvin/z into dev	2021-09-16 01:30:10 -07:00
nobody	bd6a4ec0e4	Merge branch 'dev' of ../p3 into dev	2021-09-16 01:29:37 -07:00
nobody	d1a5bdd9aa	privacy warnings revisited	2021-09-16 01:28:17 -07:00
nobody	9962e45b84	threaditem: shareable incorrectly calculated	2021-09-15 22:34:00 -07:00
nobody	e529688be8	better check for missing author; add code comments that custom emojis inside code blocks are currently replaced with img bbcode inside the codeblock and this might be unexpected. This also might be difficult to fix.	2021-09-15 15:06:11 -07:00
nobody	7aabd06a4d	reject zot activities with no actor array after parse	2021-09-15 03:16:48 -07:00
nobody	2b9d57f9f5	Merge branch 'dev' into sitechan	2021-09-14 19:36:45 -07:00
nobody	305fd0fa30	add profile information to actor record	2021-09-14 19:35:39 -07:00
nobody	fe78110c4b	sitechan work to new branch	2021-09-14 00:58:36 -07:00
nobody	1e46a311aa	Merge branch 'dev' of /home/macgirvin/z into dev	2021-09-13 21:46:01 -07:00
nobody	01bd8da6f9	bug: missing namespace get_actor_hublocs()	2021-09-13 21:45:05 -07:00
nobody	0107e5f245	Merge branch 'dev' of /home/macgirvin/z into dev	2021-09-13 17:46:24 -07:00
nobody	b47f10d106	Merge branch 'dev' of ../p3 into dev	2021-09-13 17:45:47 -07:00
nobody	47d1d464de	wrong param	2021-09-13 17:45:27 -07:00
nobody	bb7fb78b5e	Merge branch 'dev' of /home/macgirvin/z into dev	2021-09-13 04:29:29 -07:00
nobody	0a3a6a880b	Merge branch 'dev' of ../p3 into dev	2021-09-13 04:28:37 -07:00
nobody	c4d52b0a69	missing comma	2021-09-13 04:28:17 -07:00
nobody	8e059b0015	Merge branch 'dev' of ../p3 into dev	2021-09-13 01:47:58 -07:00
nobody	69a3ca4619	more work on site actor + sys channel merge	2021-09-13 01:46:50 -07:00
nobody	be41b4d120	suggestions: combine scores for social distance and keyword matches	2021-09-12 22:59:35 -07:00
nobody	a7a23260da	remove python cache from git	2021-09-12 22:38:02 -07:00
nobody	0b8675a5b0	Merge branch 'dev' of /home/macgirvin/z into dev	2021-09-12 22:19:33 -07:00
nobody	6233709cd6	add doc/site to gitignore	2021-09-12 21:24:23 -07:00
nobody	64e95d33dd	python cache updates	2021-09-12 21:21:15 -07:00
nobody	3a6bb2ab2a	corrections to tag matching part of suggestion query	2021-09-12 21:20:42 -07:00