Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
4 years ago |
|
Mark Felder
|
ed61002815
|
Undo API breaking changes
|
4 years ago |
|
Mark Felder
|
b001237b79
|
Finish undoing API breakage
|
4 years ago |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
4 years ago |
|
Mark Felder
|
4ead0d564f
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
Mark Felder
|
8bacdc3680
|
Change user.discoverable field to user.is_discoverable
|
4 years ago |
|
Mark Felder
|
9968b7efed
|
Change user.locked field to user.is_locked
|
4 years ago |
|
Alexander Strizhakov
|
1d0e130cb3
|
fixes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
4 years ago |
|
Alexander Strizhakov
|
011525a3d1
|
EnsurePublicOrAuthenticatedPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
a6d8cef33e
|
OAuthScopesPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
4b1863ca4e
|
RateLimiter module name
|
4 years ago |
|
Mark Felder
|
04b514c567
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
ed6511a086
|
Lint
|
4 years ago |
|
Mark Felder
|
636c00037d
|
Fix duplicate @doc entries
|
4 years ago |
|
Alex Gleason
|
3104367931
|
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
|
4 years ago |
|
Alex Gleason
|
23d5d7cf59
|
Fix #2172 HTTP error on password reset
|
4 years ago |
|
Ivan Tashkinov
|
60b025b782
|
[#2074] OAuth scope checking in Streaming API.
|
4 years ago |
|
rinpatch
|
608017b7df
|
Merge branch 'fix/streaming-termination-errors' into 'develop'
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
|
4 years ago |
|
Ivan Tashkinov
|
d9fb5bc08a
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
4 years ago |
|
Ivan Tashkinov
|
a781f41f96
|
[#2497] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
|
4 years ago |
|
Alex Gleason
|
9733c9d065
|
Merge remote-tracking branch 'upstream/develop' into chat-moderation
|
4 years ago |
|
Alex Gleason
|
f88dc1937e
|
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
|
4 years ago |
|
Ivan Tashkinov
|
0bda85857e
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
|
4 years ago |
|
Mark Felder
|
55562ca936
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
4 years ago |
|
rinpatch
|
01fa68fe45
|
Websocket handler: fix never matching code on failed auth
`:cowboy_req.reply` does not return tuples since 2.0, see
https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
|
4 years ago |
|
rinpatch
|
e16e8f9816
|
Websocket handler: do not raise if handler is terminated before switching protocols
Closes #2131
|
4 years ago |
|
rinpatch
|
cb06e98da2
|
websocket handler: Do not log client ping frames as errors
|
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 |
|
rinpatch
|
ea4b6c64d6
|
Merge branch 'feat/rich-media-improvements' into 'develop'
Rich media improvements
See merge request pleroma/pleroma!2944
|
4 years ago |
|
Ivan Tashkinov
|
60c925380d
|
[#2497] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).
|
4 years ago |
|
Mark Felder
|
85446cc30c
|
Merge branch 'develop' into media-preview-proxy
|
4 years ago |
|
feld
|
d1a6f67b1d
|
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 |
|
lain
|
119e11f455
|
Merge branch 'bugfix/mastoapi-lists' into 'develop'
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
|
4 years ago |
|
lain
|
581f382e71
|
ListController: DRY up stuff.
|
4 years ago |
|
Mark Felder
|
cbf7f0e029
|
Disallow password resets for deactivated accounts.
Ensure all responses to password reset events are identical.
|
4 years ago |
|
rinpatch
|
d48fc90978
|
StatusView: Start fetching rich media cards as soon as possible
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
d872858046
|
Fix removing an account from a list
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
|
4 years ago |
|
rinpatch
|
126461942b
|
User table: ensure bio is always a string
Gets rid of '|| ""' in multiple places and fixes #2067
|
4 years ago |
|
Mark Felder
|
3737f38432
|
Merge branch 'develop' into feld-2168-media-preview-proxy
|
4 years ago |
|
Mark Felder
|
67c79394e8
|
Support static avatars and header images with Mediaproxy Preview
|
4 years ago |
|
lain
|
cfc99fe05c
|
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
|
4 years ago |
|
Mark Felder
|
479578b148
|
Merge branch 'develop' into feld-2168-media-preview-proxy
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
36c125a071
|
Pipeline Ingestion: Event
|
4 years ago |
|
Ivan Tashkinov
|
27e7999a15
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
|
4 years ago |
