Commit graph

2420 commits

Author SHA1 Message Date
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
nobody
0df2af96a7 Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-07 18:48:53 -08:00
nobody
94945376ea release 2021-03-07 18:44:48 -08:00
nobody
49987c3e07 Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-04 19:56:05 -08:00
nobody
52314eda78 markdown and help stuff 2021-03-04 19:52:58 -08:00
nobody
7eca830839 Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-01 21:41:07 -08:00
nobody
2536884466 version 2021-03-01 21:37:17 -08:00
nobody
aa556fa290 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-28 16:43:41 -08:00
nobody
11de7c31da cleanup gprobe, update strings and version 2021-02-28 16:33:20 -08:00
nobody
542dbde03c Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-24 15:17:34 -08:00
nobody
aaaab46790 plural string issue 2021-02-24 14:28:35 -08:00
nobody
5aa15eb757 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-22 18:38:59 -08:00
nobody
28f697d22b release 2021-02-22 18:38:05 -08:00
nobody
646536e986 low hanging php8 stuff 2021-02-22 18:36:54 -08:00
nobody
07ef41ab00 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-21 15:38:08 -08:00
nobody
9d6e8dcb64 release 2021-02-21 15:34:47 -08:00
nobody
1e2307a9c7 I'm hesitant to merge pull request 20 for a number of reasons, but the Accept-header based module handlers have to be re-ordered in any case so the wrong one doesn't answer prematurely if a request contains more than one of Zot6 or ActivityPub in the Accept headers. So we'll do that while I'm thinking about the best way forward. This creates a policy mess because in this case AP has to have priority over Zot. Elsewhere, we always prioritise Zot first.
The problem will always be future developers who don't understand that the precise order of Accept-header based module handlers in the code will be critical to proper functioning if I let this go forward.
2021-02-16 19:10:47 -08:00
nobody
844b181dd7 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-14 14:41:45 -08:00
nobody
5bf308f750 another release(?) 2021-02-14 14:28:37 -08:00
nobody
925e9f5e66 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-10 18:07:38 -08:00
nobody
2324795b39 bugfix release 2021-02-10 18:04:47 -08:00
nobody
b941f2ef02 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-07 16:29:26 -08:00