Commit graph

25872 commits

Author SHA1 Message Date
nobody
9a6ee51687 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-27 12:10:21 -08:00
nobody
a1992593cc Merge branch 'dev' of ../p3 into dev 2021-12-27 12:09:52 -08:00
nobody
66e05d4a5c rpost dm issue 2021-12-27 12:09:15 -08:00
nobody
75b66f3b62 Merge branch 'dev' of https://codeberg.org/zot/zap into dev 2021-12-25 14:54:13 -08:00
nobody
a5f394bfe1 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-25 14:46:13 -08:00
nobody
1816d1d1ce Merge branch 'dev' of ../p3 into dev 2021-12-25 14:45:31 -08:00
nobody
3d121cb54d remote dm 2021-12-25 14:45:01 -08:00
zot
499a380400 Merge pull request 'Polish translation: update to v.21.12.24' (#64) from astabski/zap:ab-dev into dev
Reviewed-on: https://codeberg.org/zot/zap/pulls/64
2021-12-24 21:42:26 +01:00
Andrzej Budziński
d59cac6dc8 Polish translation: update to v.21.12.24 2021-12-24 18:32:59 +01:00
nobody
212c8c09c3 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-23 19:13:02 -08:00
nobody
7bad967149 fix some notification anomalies 2021-12-23 19:11:56 -08:00
nobody
9fa59f825b revision 2021-12-23 13:06:08 -08:00
nobody
c4f488c668 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-23 12:10:09 -08:00
nobody
77f2764652 more lockview cleanup 2021-12-23 12:09:15 -08:00
nobody
2f626de5f0 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-23 01:53:35 -08:00
nobody
d53f9643f6 task complete regression 2021-12-23 01:50:41 -08:00
nobody
942ddeea4d fix DM (audience) icon on previews. 2021-12-22 20:02:43 -08:00
zot
bfb1c1de6f Merge pull request 'Polish translation: update to v. 21.12.22' (#63) from astabski/zap:ab-dev into dev
Reviewed-on: https://codeberg.org/zot/zap/pulls/63
2021-12-22 23:11:22 +01:00
astabski
43f8ad6b34 Merge branch 'dev' into ab-dev 2021-12-22 23:09:00 +01:00
Andrzej Budziński
700ee5b9b8 Polish translation: update to v. 21.12.22 2021-12-22 23:01:45 +01:00
nobody
713e92d70e Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-22 13:19:00 -08:00
nobody
1c9b46986e provide html renderings of followers/following endpoints 2021-12-22 13:15:45 -08:00
nobody
b0970193bd Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-21 14:19:20 -08:00
nobody
0b25c06301 revision 2021-12-21 14:06:29 -08:00
nobody
d238d73b30 re-factor lockview 2021-12-21 14:03:17 -08:00
nobody
654000ed28 warnings 2021-12-15 00:36:57 -08:00
nobody
7631722d16 bring back dm author link. Move forward on the ability to realistically delete system apps. 2021-12-15 00:32:39 -08:00
nobody
c0f3eea774 extend ActivityStreams::is_an_actor() to check against type arrays as well as strings and return true if any of the array members are an actor type 2021-12-09 12:22:26 -08:00
nobody
2464878064 more fixes from upstream merge 2021-12-05 18:01:10 -08:00
nobody
ed51015ff7 fixes 2 significant merge issues from upstream 2021-12-05 17:45:20 -08:00
nobody
8c66c8e305 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-05 16:49:55 -08:00
nobody
eb0edce54d rewrite fixes 2021-12-04 13:00:06 -08:00
nobody
afa8dad055 allow save/star of pubstream items 2021-12-04 12:43:53 -08:00
nobody
92fef72e8d comment control link/button missing on small screens 2021-12-04 11:53:53 -08:00
nobody
253bb5b2c7 reformatter error 2021-12-03 21:25:17 -08:00
nobody
1ec5e61d88 profile_photo folder fix from hz 2021-12-03 13:14:55 -08:00
nobody
ce7f49dc6d Merge branch 'psr12' into dev 2021-12-03 12:52:41 -08:00
nobody
ebb1b0b83f Merge branch 'psr12' of https://codeberg.org/zot/zap into psr12 2021-12-03 12:45:02 -08:00
nobody
c5f213e9d8 Merge branch 'psr12' into dev 2021-12-03 12:28:45 -08:00
nobody
6698c6df84 change default language detect length to 64 2021-12-03 12:27:35 -08:00
nobody
d46dd6aeb8 psr12 rewrites, continued 2021-12-03 14:01:39 +11:00
nobody
f602a393a5 psr12 updates 2021-12-03 10:02:31 +11:00
nobody
389b2e5b17 initial psr12 conversion 2021-12-03 09:33:36 +11:00
nobody
d471be81c9 Merge branch 'dev' of /home/macgirvin/z into dev 2021-12-01 11:51:51 -08:00
nobody
f901b43cdc version 2021-12-01 11:51:10 -08:00
nobody
d59bf76bfd Merge branch 'dev' of ../p3 into dev 2021-12-01 11:48:49 -08:00
nobody
457c9707e3 perform plugin deliveries even if no other recipients 2021-12-01 11:48:01 -08:00
nobody
3afba5f697 Merge branch 'dev' of /home/macgirvin/z into dev 2021-11-29 15:59:47 -08:00
nobody
a58f8a038a version 2021-11-29 15:58:52 -08:00
nobody
55fce1c3c3 fix comment that was checked into wrong branch 2021-11-29 14:30:42 -08:00