Commit graph

25333 commits

Author SHA1 Message Date
nobody
21290566a0 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-12 01:56:53 -07:00
nobody
4461aa4404 chanview: don't fetch any additional profile info if we're going to redirect. 2021-07-12 01:54:36 -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
63d9629163 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 23:18:37 -07:00
nobody
06ad713d0c addd followers/following counts to chanview 2021-07-11 23:17:40 -07:00
nobody
879af8a750 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 22:37:54 -07:00
nobody
f7790c7b75 incorrect xprof column name 2021-07-11 19:43:48 -07:00
nobody
ec74318ff0 php8 undefined warnings, cont. 2021-07-11 16:46:03 -07:00
nobody
83fe677e9e typos 2021-07-11 15:32:09 -07:00
nobody
28ad858121 chanview ui improvements 2021-07-11 14:41:51 -07:00
nobody
4d8ea8f02e chanview ui updates 2021-07-11 14:05:22 -07:00
nobody
d0dd93b184 subdue video search header 2021-07-11 01:26:00 -07:00
nobody
967ce88415 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 00:34:18 -07:00
nobody
9bea09b31e improve video stream filter, update strings 2021-07-11 00:33:14 -07:00
nobody
ac180a832a Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 00:19:22 -07:00
nobody
70b280b756 Add videos to stream filter widget 2021-07-11 00:18:05 -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
ed2246c7bd more consolidation of stream and channel notification resets - as stream is a superset of channel 2021-07-09 17:10:41 -07:00
nobody
3baa2ef430 clear home notifications when clearing stream notifications, but not the other way around. 2021-07-09 17:06:23 -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
39342526d4 more tweaks to remote profile photo cache storage function 2021-07-03 19:33:21 -07:00
nobody
95dbb252b9 ...or I suppose we could just make it work correctly 2021-07-02 15:47:50 -07:00
nobody
9c601e8160 import_remote_xchan_photo(): modified check was incorrect ($outfile undefined), but it just adds complexity - so just fetch the photo. 2021-07-02 15:13:38 -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
44f9e8c683 cleanup 2021-07-02 01:03:31 -07:00
nobody
8f7900d63c temporary fix for duplicated comments on private threads 2021-07-02 00:58:53 -07:00
nobody
0841603bd1 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-30 14:02:11 -07:00
nobody
1afb16c9bf Merge branch 'dev' of https://codeberg.org/zot/zap into dev 2021-06-30 13:59:23 -07:00
zot
cad13bb548 Merge pull request 'Fixes to the Polish translation' (#32) from astabski/zap:ab-dev into dev
Reviewed-on: https://codeberg.org/zot/zap/pulls/32
2021-06-28 02:06:43 +02:00
nobody
45b22d9018 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-26 18:45:41 -07:00
nobody
7624107adf re-enable 'supress_duplicates' 2021-06-26 18:44:46 -07:00
Andrzej Budziński
83855f4592 Fixes to the Polish translation 2021-06-27 03:42:29 +02:00
nobody
7afd23edc7 cleanup mod_setup, change variable named $item_id to $item_uuid to avoid confusion 2021-06-26 14:25:55 -07:00
nobody
5acae8d2a1 revision 2021-06-25 16:09:58 -07:00
nobody
38e012179a rework setup and include wording fix from zap pull #30 which could not be merged due to conflicts. 2021-06-25 15:40:15 -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
d2df20e41e Hide original group DM from the group owner. We only keep it as a reference and its presence in the group owner's stream is confusing. 2021-06-25 01:32:57 -07:00
nobody
23f254091e fine tuning group comments 2021-06-24 13:54:33 -07:00
nobody
d0925fec2d mastogroups: provide a normal 'Announce' body if we have enough information to do so. 2021-06-24 00:44:41 -07:00
nobody
4fb318a92e let people know they shouldn't block shares from groups because that kinda' keeps the group from working correctly. 2021-06-24 00:16:17 -07:00
nobody
38e5b8d107 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-23 21:30:30 -07:00
nobody
8f26551fc8 fine tuning mastgroups 2021-06-23 21:26:53 -07:00
nobody
633cadbf4e provide full object if available 2021-06-23 17:13:10 -07:00
nobody
722bce13f8 Merge branch 'dev' of ../p3 into dev 2021-06-23 16:57:46 -07:00
nobody
ef95335e7e don't deliver/accept group boosted comments 2021-06-23 16:56:49 -07:00
nobody
01c3c68b2c more syntax issues from having a string item['obj'] 2021-06-23 16:54:26 -07:00