nobody
|
83ddfb0dd3
|
Merge branch 'dev' of /home/macgirvin/z into dev
|
2021-07-13 22:36:01 -07:00 |
|
nobody
|
fe5c4528fc
|
php8 warnings
|
2021-07-13 22:31:46 -07:00 |
|
nobody
|
bf815fd4c6
|
remove the caldav app and make the caldav server headless
|
2021-07-13 22:22:27 -07:00 |
|
nobody
|
f6fb939478
|
fix edge cases in our implementation of Mastodon's undocumented remote comment over OStatus follow.
|
2021-07-13 18:09:30 -07:00 |
|
nobody
|
fc5c4760f3
|
missing summary in embedded shares
|
2021-07-13 13:34:07 -07:00 |
|
nobody
|
9259223eca
|
manuallyapprovesfollowers
|
2021-07-13 01:30:55 -07:00 |
|
nobody
|
4c6c2c920d
|
Merge branch 'dev' of /home/macgirvin/z into dev
|
2021-07-12 23:52:52 -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
|
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
|
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
|
e6f302229e
|
Merge branch 'dev' of /home/macgirvin/z into dev
|
2021-07-02 01:06:11 -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
|
45b22d9018
|
Merge branch 'dev' of /home/macgirvin/z into dev
|
2021-06-26 18:45:41 -07: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
|
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
|
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
|
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
|
73a6e614a8
|
syntax
|
2021-06-23 16:48:19 -07:00 |
|
nobody
|
88cbfaee67
|
filter group comment boosts from zot6 deliveries.
|
2021-06-23 13:30:23 -07:00 |
|
nobody
|
91f32b11ca
|
mastogroups - support moderation
|
2021-06-23 00:19:51 -07:00 |
|
nobody
|
a3c866768b
|
Merge branch 'dev' of /home/macgirvin/z into dev
|
2021-06-22 14:26:06 -07:00 |
|
Andrzej Budziński
|
b7d079651d
|
Fixes:
1) fixed bug in Zotlabs/Module/Setup.php#788
2) generated new util/messages.po file
3) fixes to Polish translation
|
2021-06-22 21:41:57 +02:00 |
|
nobody
|
a84c1cd7ab
|
Merge branch 'dev' of /home/macgirvin/z into dev
|
2021-06-21 23:34:18 -07:00 |
|
zot
|
f7ca1d1709
|
Merge pull request 'A few fixes' (#28) from astabski/zap:ab-dev into dev
Reviewed-on: https://codeberg.org/zot/zap/pulls/28
|
2021-06-22 07:41:25 +02:00 |
|
nobody
|
fa95483172
|
remove debugging
|
2021-06-21 22:13:23 -07:00 |
|
nobody
|
129ab00406
|
port photo edit changes to roadhouse
|
2021-06-21 22:10:44 -07:00 |
|
nobody
|
0a34b71a46
|
Merge branch 'dev' of /home/macgirvin/z into dev
|
2021-06-21 22:08:01 -07:00 |
|
nobody
|
cabed0682c
|
improved photo editing and alt text support
|
2021-06-21 22:03:11 -07:00 |
|