lain
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
4 years ago
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
4 years ago
feld
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
4 years ago
eugenijm
8e41baff40
Add idempotency_key to the chat_message entity.
4 years ago
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Alibek Omarov
5591dc0248
Add entry in changelog
4 years ago
minibikini
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
4 years ago
feld
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
4 years ago
Egor Kislitsyn
75d131ba18
Add documentation and update CHANGELOG
4 years ago
Egor Kislitsyn
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
4 years ago
Ivan Tashkinov
ba50dc05a8
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# CHANGELOG.md
4 years ago
Egor Kislitsyn
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
feld
1204aaa2e3
Merge branch 'feature/autofollowing' into 'develop'
...
autofollowing_nicknames
See merge request pleroma/pleroma!3087
4 years ago
Haelwenn
d8d4bd15d0
Merge branch '2236-no-name' into 'develop'
...
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
4 years ago
feld
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
4 years ago
minibikini
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
291189357b
Merge branch 'develop' into feature/account-export
4 years ago
Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
4 years ago
feld
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
4 years ago
feld
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
a999e8b0b7
Changelog: Add info about whitespace name remote users.
4 years ago
lain
3fdc2a0d1e
Changelog: Add information about self-chats
4 years ago
Maksim Pechnikov
add26817e3
update changelog
4 years ago
rinpatch
fb0e340363
Rip out fedsockets from the release branch
4 years ago
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
4 years ago
Ivan Tashkinov
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
4 years ago
Mark Felder
d16336e7fb
Document autofollowing_nicknames
4 years ago
Mark Felder
cb3ee4d543
Fix duplicate Added sections in the changelog
4 years ago
Ivan Tashkinov
049ece1ef3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
4 years ago
rinpatch
6c1bc9ca39
CHANGELOG.md: prepare 2.2.0 changelog
4 years ago
Egor Kislitsyn
a598d5baab
Update CHANGELOG
4 years ago
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
4 years ago
Egor Kislitsyn
2b58b0dbce
Update CHANGELOG
4 years ago
Ivan Tashkinov
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Ivan Tashkinov
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
4 years ago
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
4 years ago
Alex Gleason
9c672ecbb5
Remote Timeline: add Streaming support
4 years ago
Egor Kislitsyn
563801716a
Update changelog
4 years ago
Mark Felder
21a73ce9f2
Document the NSFW link preview change
4 years ago
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
4 years ago
rinpatch
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
4 years ago
rinpatch
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
4 years ago
lain
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
4 years ago
Ivan Tashkinov
ae26284638
[ #3031 ] Adjusted changelog entry.
4 years ago
lain
a24f80badf
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
9a56ec25cb
Changelog: Add info about relay unfollowing
4 years ago
feld
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
4 years ago
Ivan Tashkinov
7cd662f18c
Added documentation on installation of `ffmpeg` and `ImageMagick` dependencies.
4 years ago
lain
defca4a8b1
Changelog: Add info about user search.
4 years ago
Alexander Strizhakov
3f201475e0
changelog entry
4 years ago
Alexander Strizhakov
958008cc14
changelog entry
4 years ago
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
4 years ago
lain
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Roman Chvanikov
8f5589cf66
Merge develop
4 years ago
lain
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
518c0f2962
Changelog: Add info about emoji zip import feature
4 years ago
lain
9d6415de15
Changelog: Info about email fix.
4 years ago
lain
df1eb5cf7e
Changelog: Add info about chat pagination fix.
4 years ago
Roman Chvanikov
b0bd81ef71
Update CHANGELOG
4 years ago
Maksim Pechnikov
ed3bc53fa1
Merge branch 'develop' into issue/2099
4 years ago
feld
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
4 years ago
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
4 years ago
Maksim Pechnikov
2159daa9af
update changelog
4 years ago
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
4 years ago
rinpatch
065a4dddfd
Merge branch 'stable' into stable-sync/2.1.2
4 years ago
Haelwenn (lanodan) Monnier
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
4 years ago
rinpatch
b751c5babc
CHANGELOG.md: Add 2.1.2 entry
4 years ago
Haelwenn
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
4 years ago
feld
608824b97e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
4 years ago
rinpatch
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
4 years ago
stwf
dfc621a529
add test and changelog entry
4 years ago
lain
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
4 years ago
stwf
f58262c673
add description to changelog
4 years ago
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
Ivan Tashkinov
a781f41f96
[ #2497 ] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
4 years ago
eugenijm
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
4 years ago
Haelwenn
5c4ff5c73c
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
4 years ago
Mark Felder
0b66e806e3
Move changelog entry to next patch
4 years ago
Mark Felder
118bf6e92b
Fixed Welcome chats with MRF Simple applied locally
4 years ago
Mark Felder
25d1caf1dd
Merge duplicate Changed sections
4 years ago
rinpatch
0b5e72ecf0
Remove `:managed_config` option.
...
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
4 years ago
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
rinpatch
82b56cdb9b
CHANGELOG.md: clarify that the functionality is not removed, just the config options
4 years ago
rinpatch
a098e10fd6
Document ephemeral activity changes better
...
Also remove the example from the cheatsheet, there is no need for it
when the types are simple
4 years ago
Alexander Strizhakov
4954667fb2
changelog
4 years ago
Alexander Strizhakov
c6647c08e1
migration and changelog
4 years ago
Mark Felder
34d7e864db
New mix tasks for controlling user confirmation status and sending confirmation mails
4 years ago
rinpatch
5ef840ed9c
Merge branch 'stable' into stable-sync/2.1.1
4 years ago
Mark Felder
549c895d80
Document breaking change for metadata providers
4 years ago
Mark Felder
ff07014b26
Disable providers of user and status metadata when instance is private
4 years ago
rinpatch
7490b76bbf
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
4 years ago
rinpatch
e430e98e7d
CHANGELOG.md: Add 2.1.1 entry
4 years ago
Mark Felder
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
4 years ago
rinpatch
0a05670b44
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
4 years ago
Alibek Omarov
5d814f739c
changelog: add ForceBotUnlistedPolicy
4 years ago
lain
9b85592b8b
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
4 years ago
feld
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
4 years ago