Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
4 years ago
feld
6d902916dd
Merge branch 'features/mix-task-reset-mfa' into 'develop'
...
New mix task: pleroma.user reset_mfa <nickname>
See merge request pleroma/pleroma!2643
4 years ago
Mark Felder
e505e59d9c
Document new mix task feature to reset mfa
4 years ago
Mark Felder
c2048f75cd
Add changelog entry for emoji pack reload command
4 years ago
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard
4 years ago
lain
e213e31577
Changelog: Add chats to changelog.
4 years ago
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
Alex Gleason
d38f28870e
Add blob: to connect-src CSP
4 years ago
rinpatch
7bc2ec0aa2
Merge branch 'mastodon-migration-compat' into 'develop'
...
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
4 years ago
Roman Chvanikov
8eb1dfadca
Update CHANGELOG and docs
4 years ago
lain
3506e95499
Add Changelog
4 years ago
lain
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
4 years ago
lain
2a74565090
Changelog: Add background to instance
4 years ago
Stephanie Wilde-Hobbs
3eff542678
Add Changelog entry
4 years ago
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
4 years ago
rinpatch
0ad89762a1
insert skeletons migration: fix for non-local locals
...
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
4 years ago
rinpatch
30eaef9d61
healthcheck: report real amount of memory allocated by beam
...
as opposed to memory currently in use
4 years ago
rinpatch
f4d50fbd81
CHANGELOG.md: Add entries from 2.0.3
4 years ago
Maksim Pechnikov
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
4 years ago
lain
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
4 years ago
lain
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
4 years ago
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
4 years ago
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
4 years ago
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
Haelwenn (lanodan) Monnier
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
4 years ago
lain
7dd47bee82
Update changelog
4 years ago
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
4 years ago
rinpatch
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
rinpatch
d589f3dcfb
CHANGELOG.md: Add entry for re-registration ban
4 years ago
rinpatch
9a92e5a351
Reword changelog entry for follow relationship bug
4 years ago
eugenijm
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
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
4 years ago
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
Alexander Strizhakov
9855018425
changelog entry
4 years ago
Alexander Strizhakov
f3070ddae5
removing entry from changelog
4 years ago
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
4 years ago
lain
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
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration
4 years ago
lain
5a3a5abc0c
Changelog: Add info about `/api/v1/instance` changes
4 years ago
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
4 years ago
lain
e2f3030c86
Apply suggestion to CHANGELOG.md
4 years ago
Alexander
6e625a427c
reply filtering
4 years ago
Ivan Tashkinov
e7fb593d13
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
4 years ago
Egor Kislitsyn
771c1ad735
Update CHANGELOG
4 years ago
Ivan Tashkinov
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
4 years ago
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
4 years ago
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago