2441 commits

Author	SHA1	Message	Date
nobody	46260ac1cc	Merge branch 'dev' of /home/macgirvin/z into dev	2021-05-02 16:43:33 -07:00
nobody	a105ee45b1	string update, check to see if activity target is already json_decoded	2021-04-29 22:37:19 -07:00
nobody	fea4181a22	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-27 20:19:04 -07:00
nobody	90e8b47077	revision	2021-04-27 20:16:54 -07:00
nobody	597fa375d7	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-20 16:34:33 -07:00
nobody	ab469245e3	revision	2021-04-20 16:29:32 -07:00
nobody	c3616bcc0f	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-18 13:19:26 -07:00
nobody	eb394e6b42	make FLoC participation configurable - opt-out by default	2021-04-15 16:12:13 -07:00
nobody	b255b26a3b	disable floc by default	2021-04-15 13:43:46 -07:00
nobody	41927d89d6	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-14 17:41:53 -07:00
nobody	c9d4f3d0d0	revision	2021-04-14 17:37:59 -07:00
nobody	2aa84260cc	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-13 21:21:54 -07:00
nobody	3a51efd9bf	revision	2021-04-13 21:16:05 -07:00
nobody	112a3463c1	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-13 18:46:54 -07:00
nobody	0f62a46844	cleanup	2021-04-12 20:49:58 -07:00
nobody	97945304f6	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-11 20:40:43 -07:00
nobody	d9d40daec9	revision	2021-04-11 20:36:12 -07:00
nobody	3fca2da820	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-11 19:35:26 -07:00
nobody	06d70288ef	porting access tokens and making them generally more useful by adding them to connections	2021-04-10 15:32:14 -07:00
nobody	89d2c293e7	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-07 19:13:13 -07:00
nobody	d57da14fee	revision	2021-04-07 19:12:41 -07:00
nobody	486197c88e	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-07 18:03:38 -07:00
nobody	9c4c7524a9	revision	2021-04-05 19:23:04 -07:00
nobody	886c7337df	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-01 17:04:24 -07:00
nobody	26eb01dc39	Merge branch 'dev' of ../p3 into dev	2021-04-01 15:23:12 -07:00
nobody	d24b9a9544	disable file activities until a few more things are fixed.	2021-04-01 15:21:19 -07:00
nobody	bbc466c7a8	Merge branch 'dev' of /home/macgirvin/z into dev	2021-04-01 14:47:39 -07:00
nobody	eb8db87fe6	issue with siteinfo	2021-04-01 14:46:50 -07:00
nobody	d08053b74a	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-30 19:38:16 -07:00
nobody	85ad834aae	revision	2021-03-30 19:37:10 -07:00
nobody	8dcdba5f40	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-29 19:28:36 -07:00
nobody	474f4726cd	revision	2021-03-29 19:06:02 -07:00
nobody	b7a91ba9fb	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-23 17:18:49 -07:00
nobody	955a767db6	release	2021-03-23 17:13:54 -07:00
nobody	0f64263315	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-21 22:34:18 -07:00
nobody	28f500e93e	strings and stuff	2021-03-21 22:33:52 -07:00
nobody	a90d957bef	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-17 22:41:31 -07:00
nobody	89e48f8de3	updates	2021-03-17 22:37:47 -07:00
nobody	8510a0eb3b	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-15 16:58:14 -07:00
nobody	6fbd31cbc3	start the next push; also try to work around multiple zot hublocs from sites that were over-written and started fresh with the same username	2021-03-15 16:56:03 -07:00
nobody	f6428e2b60	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-11 18:05:27 -08:00
nobody	2eb779b121	release	2021-03-11 18:03:37 -08:00
nobody	157aca4c3b	php8 cont.	2021-03-10 21:31:13 -08:00
nobody	7ef8ffb5e3	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-10 18:06:05 -08:00
nobody	dca6b026ff	release	2021-03-10 17:55:42 -08:00
nobody	e190f23f24	php8 cont.	2021-03-10 16:51:42 -08:00
nobody	5d07b426e7	Merge branch 'dev' of /home/macgirvin/z into dev	2021-03-09 19:18:14 -08:00
nobody	59a85734a1	php8 cont.	2021-03-09 15:36:07 -08:00
nobody	b334f0931b	php8 stuff	2021-03-08 19:54:24 -08:00
nobody	ad3f33d69f	php8 stuff	2021-03-08 17:51:41 -08:00