Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
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
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
