Commit graph

2707 commits

Author SHA1 Message Date
nobody
a297ba266f updates 2021-10-05 15:09:27 -07:00
nobody
2b4b750fee version 2021-10-04 14:22:15 -07:00
nobody
2c1449ca51 Merge branch 'dev' of /home/macgirvin/z into dev 2021-10-03 19:32:34 -07:00
nobody
c9b4642039 update certs 2021-10-01 16:49:39 -07:00
nobody
8560e7f82b Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-29 03:38:18 -07:00
nobody
0535ef7579 version 2021-09-29 03:25:13 -07:00
nobody
fc80a1c63a Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-24 12:56:35 -07:00
nobody
40fd02c5e3 sync names with db update 2021-09-24 12:55:37 -07:00
nobody
b473b96527 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-23 16:39:33 -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
17105fcd15 more sitechan backend stuff 2021-09-23 15:26:31 -07:00
nobody
f99db54419 sitechan updates 2021-09-20 22:51:28 -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
0b8675a5b0 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-12 22:19:33 -07:00
nobody
2d12e04b8a social tag match (still testing) 2021-09-12 20:49:53 -07:00
nobody
0a69c8c535 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-08 01:39:37 -07:00
nobody
aeec0947f3 missing string translation - zap issue #40 2021-09-05 14:05:16 -07:00
nobody
95b99e5462 Merge branch 'dev' of /home/macgirvin/z into dev 2021-09-03 17:17:01 -07:00
nobody
fb33e94c6a revision 2021-09-02 20:31:40 -07:00
nobody
13ca3a64a6 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-29 17:21:32 -07:00
nobody
3012a3555d update 2021-08-29 17:19:23 -07:00
nobody
479f4145eb Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-28 20:37:55 -07:00
nobody
e78cf015ba update siteinfo.json 2021-08-28 18:56:37 -07:00
nobody
df28342043 Merge branch 'dev' of ../p3 into dev 2021-08-28 18:52:20 -07:00
nobody
8360aee13c code comments 2021-08-28 18:51:12 -07:00
nobody
0220ac5c2b Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-28 02:18:30 -07:00
nobody
2ea178e0c3 version 2021-08-28 02:15:53 -07:00
nobody
4549662535 Merge branch 'dev' of ../p3 into dev 2021-08-26 22:16:07 -07:00
nobody
8f7a5d2947 defer updates if comments in progress 2021-08-26 22:15:24 -07:00
nobody
db5ed04b9c revision 2021-08-26 03:05:49 -07:00
nobody
851a6ace41 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-24 23:06:40 -07:00
nobody
e30856393e version and strings (only one minor string change I'm aware of) 2021-08-24 23:03:44 -07:00
nobody
bc64bc334f Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-23 22:09:52 -07:00
nobody
afc0488beb Merge branch 'dev' of ../p3 into dev 2021-08-23 21:52:21 -07:00
nobody
0b0a6833de create alerttimer separate from notifications timer 2021-08-23 21:44:37 -07:00
nobody
095ebed632 change default update interval - 60 seconds is too long for error messages to appear. As mentioned in the issue report (zap:34) we should provide separate timers for warnings/notices which are in memory and counting unseen notifications across various SQL tables which can increase system load. 2021-08-23 20:18:56 -07:00
nobody
b946c62838 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-23 02:16:54 -07:00
nobody
33c1044ad1 rpost cleanup and version update 2021-08-23 00:41:27 -07:00
nobody
a6c0c3f580 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-23 00:11:17 -07:00
nobody
69df116cf7 more service worker stuff 2021-08-22 14:22:47 -07:00
nobody
d3f9a32def Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-19 18:08:05 -07:00
nobody
9b60285a03 version 2021-08-19 18:06:57 -07:00
nobody
386892171c Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-18 14:49:59 -07:00
nobody
b82a344681 typo 2021-08-16 15:02:39 -07:00
nobody
48381b6d70 service worker 2021-08-16 14:21:42 -07:00
nobody
786714d6b7 first attempt at a progressive web app. This will not yet upload files but should share other stuff, assuming the icon sizes are acceptable 2021-08-16 13:22:04 -07:00
nobody
5bbd75f0bb Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-14 14:17:58 -07:00
nobody
42a04a4bf8 update 2021-08-14 13:46:50 -07:00
nobody
50ac040704 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-12 13:19:02 -07:00
nobody
c112a95bb4 update 2021-08-12 13:14:11 -07:00
nobody
dcc6137ded Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-11 01:31:37 -07:00
nobody
8410397dcf version 2021-08-11 01:29:53 -07:00
nobody
11a324cda9 Merge branch 'dev' of /home/macgirvin/z into dev 2021-08-05 01:39:27 -07:00
nobody
29f6e7187f update 2021-08-05 01:38:38 -07:00
nobody
abbd73fcaf update 2021-08-04 00:27:46 -07:00
nobody
c1a3e42479 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-31 04:17:47 -07:00
nobody
686cbed2e5 more consistent text 2021-07-31 04:13:51 -07:00
nobody
e9f017ef38 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-28 02:44:55 -07:00
nobody
7cc0a2e695 dreport updates 2021-07-28 02:44:17 -07:00
nobody
7c449a0b6a Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-27 23:59:30 -07:00
nobody
003650f8cc Merge branch 'dev' of ../p3 into dev 2021-07-27 05:27:21 -07:00
nobody
0fd7ad5be0 dreport log 2021-07-27 05:26:47 -07:00
nobody
d2e4fd4151 updates 2021-07-26 15:41:19 -07:00
nobody
4b8de363f2 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-24 14:58:32 -07:00
nobody
869abbea59 Merge branch 'dev' of ../p3 into dev 2021-07-22 03:59:15 -07:00
nobody
955ae420b4 codecomments 2021-07-22 03:58:54 -07:00
nobody
4391f1eef6 refactor/simplify WebServer 2021-07-22 03:16:58 -07:00
nobody
1dcea2925a Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-21 18:11:25 -07:00
nobody
853ff59f0f php8 warnings, string and version update 2021-07-19 14:24:22 -07:00
nobody
83ddfb0dd3 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-13 22:36:01 -07:00
nobody
bf815fd4c6 remove the caldav app and make the caldav server headless 2021-07-13 22:22:27 -07:00
nobody
4c6c2c920d Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-12 23:52:52 -07:00
nobody
2de50fee75 strings and version 2021-07-12 23:48:00 -07:00
nobody
c333a4c5f2 bring back 'post_mail' permission, but remove PERMS_NETWORK as an option as it is ambiguous in Zap and derivatives 2021-07-12 17:24:49 -07:00
nobody
d1223caecc Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-12 00:33:22 -07:00
nobody
417733345d update 2021-07-12 00:31:12 -07:00
nobody
ac180a832a Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 00:19:22 -07:00
nobody
605d0435e5 change text on public stream notification setting, push new strings 2021-07-10 21:18:57 -07:00
nobody
d1c158eed2 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-10 20:03:42 -07:00
nobody
69649197d1 php error in log statement due to preformatting the date when errors occur 2021-07-08 16:18:53 -07:00
nobody
e6f302229e Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-02 01:06:11 -07:00
nobody
1594eb8d0b revision 2021-07-02 01:04:07 -07:00
nobody
45b22d9018 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-26 18:45:41 -07:00
nobody
5acae8d2a1 revision 2021-06-25 16:09:58 -07:00
nobody
7f1e3d4923 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-25 02:50:03 -07:00
nobody
798ba902cf update 2021-06-25 02:46:01 -07:00
nobody
80bb1e48d3 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-22 00:00:17 -07:00
nobody
c4319f43ed bump version 2021-06-21 23:55:22 -07:00
nobody
41f1159adc Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-21 00:38:33 -07:00
nobody
30f7a6c851 revision 2021-06-19 20:16:56 -07:00
nobody
5ea7105272 ongoing: fix a few more php 8.x warnings 2021-06-18 16:54:08 -07:00
nobody
35ea8d7d7e finish removal of deprecated server_role and sitelist 2021-06-17 14:54:15 -07:00
nobody
e72275ac39 revision 2021-06-17 14:10:32 -07:00
nobody
9b81ece263 naming 2021-06-17 13:51:45 -07:00
nobody
7689676e7d Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-12 14:59:51 -07:00
nobody
441261e2d8 updates 2021-06-12 14:57:46 -07:00
nobody
2aa8fab213 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-05 14:56:30 -07:00
nobody
ef62a54925 revision 2021-06-05 14:54:21 -07:00
nobody
462253d4aa Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-01 15:55:58 -07:00
nobody
5d38bd3b8d revision 2021-06-01 15:32:59 -07:00
nobody
0e30c992d1 Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-28 00:08:16 -07:00
nobody
2aa6b7fe92 revision, strings 2021-05-28 00:06:36 -07:00
nobody
d34998890e Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-27 04:19:27 -07:00
nobody
2c1f748347 revision 2021-05-27 04:17:19 -07:00
nobody
b5f57ad9db Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-27 04:10:08 -07:00
nobody
da6d8d8179 notification usability work 2021-05-27 04:04:16 -07:00
nobody
f529c7dc4b Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-20 18:54:27 -07:00
nobody
82eabd114b per module loadtime 2021-05-20 18:47:10 -07:00
nobody
ae6aa577e4 Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-19 15:51:45 -07:00
nobody
12d9796e8a use 'Ignore' for unfollowing threads instead of 'Unfollow' which isn't specified in the ActivityStreams vocabulary. This is low impact since these activities do not federate. Updates to previously unfollowed threads may show up after this change and may require unfollowing again since existing activities were not modified. 2021-05-17 14:14:57 -07:00
nobody
42c980ea01 Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-08 13:54:45 -07:00
nobody
837e686e92 update 2021-05-08 13:51:56 -07:00
nobody
92e471781d Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-02 18:54:41 -07:00
nobody
f611dd3334 update 2021-05-02 18:52:21 -07:00
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
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
nobody
6f8cfeb156 more unescaped quotes issues 2021-02-07 16:24:41 -08:00
nobody
a85cca8702 Merge branch 'dev' of /home/macgirvin/z into dev 2021-02-05 12:27:34 -08:00
nobody
373d3355b6 install issue (mysql schema) 2021-02-05 12:21:04 -08:00
nobody
f42be75870 updates 2021-02-03 18:07:23 -08:00
nobody
ddd15f0fff push 2021-01-29 12:40:10 -08:00
nobody
1c3c9ceeb9 Provide infrastructure for porting queueworker addon and fix some nasty queueworker bugs 2021-01-27 20:55:55 -08:00
nobody
db503f4af0 - disable Convo (fetches conversation children - the opposite of fetch_parents) because it simply isn't reliable (only implemented in Mastodon) and is also causing load issues on some sites.
- remove items in background from within channel_remove() due to load/memory issues
 - provide purge_all (Delete->Actor) messages over ActivityPub as this functionality was missing.
2021-01-26 11:29:34 -08:00
nobody
d59916e9a1 server_name issue 2021-01-25 13:56:45 -08:00
nobody
0e5994863e release 2021-01-25 11:45:43 -08:00
nobody
d0a18b30ae doco 2021-01-24 14:40:40 -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
9c65d28244 import/export issues 2021-01-08 13:53:28 -08:00