3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
4 years ago
d589f3dcfb
CHANGELOG.md: Add entry for re-registration ban
4 years ago
9a92e5a351
Reword changelog entry for follow relationship bug
4 years ago
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
4 years ago
92efb888c7
Made follow request notifications non-optional (removed config switch).
4 years ago
9855018425
changelog entry
4 years ago
f3070ddae5
removing entry from changelog
4 years ago
5839e67eb8
return data only for updated emoji
4 years ago
4c4344b7b1
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
...
[#1364 ] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367
4 years ago
5a3a5abc0c
Changelog: Add info about `/api/v1/instance` changes
4 years ago
e2f3030c86
Apply suggestion to CHANGELOG.md
4 years ago
6e625a427c
reply filtering
4 years ago
e7fb593d13
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
4 years ago
771c1ad735
Update CHANGELOG
4 years ago
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
4 years ago
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
4 years ago
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
4 years ago
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
4 years ago
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
4 years ago
4d22b100b7
move changelogs entries to unreleased section
4 years ago
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
0cda80f266
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
5 years ago
650853fc89
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
dc2637c188
[ #2342 ] Removed changelog entry for temporary configuration option.
5 years ago
de34c4ee6b
changelog entry
5 years ago
88b16fdfb7
[ #1364 ] Disabled notifications on activities from blocked domains.
5 years ago
6ff8812ea3
Add a section for changelog entries that pertain to the next patch release.
...
This will make it easier to keep changelogs synced between develop and stable branches.
5 years ago
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
9abf13abe0
CHANGELOG.md: update 2.0.2 release date
5 years ago
adeb82e496
CHANGELOG.md: add 2.0.2 update notes
5 years ago
0b8f9a66ae
CHANGELOG.md: add entries for funkwhale-related changes
5 years ago
7306d2d069
CHANGELOG.md: Add 2.0.2 entry
5 years ago
2a08f44b02
CHANGELOG.md: Add upgrade notes for 2.0.1
5 years ago
781ac28859
changelog.md: add 2.0.1 entry
5 years ago
c826d5195f
Update CHANGELOG
5 years ago
73134e248a
no changelog entry - bug fixed only in develop
5 years ago
5739c498c0
fix for gun connections pool
5 years ago
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
5 years ago
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
5 years ago
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
rinpatch