lain
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
Egor Kislitsyn
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
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
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Egor Kislitsyn
6734abcbd4
Add pagination for Mutes
4 years ago
Egor Kislitsyn
33f4f39b1c
Add pagination for Blocks
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
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
4 years ago
Mark Felder
ed6511a086
Lint
4 years ago
Mark Felder
636c00037d
Fix duplicate @doc entries
4 years ago
Roman Chvanikov
8f5589cf66
Merge develop
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
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
Roman Chvanikov
91b9985e1c
Pass expires_in param from status controller
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
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
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
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
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
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
4 years ago
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
4 years ago
Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Ivan Tashkinov
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
4 years ago
Haelwenn
87fe31fb5c
Merge branch '1993-confirm-users-on-registration' into 'develop'
...
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
4 years ago
lain
c25c21dd22
AccountController: Don't explicitly ask to keep users unconfirmed.
...
Confirmation is set in User.register_changeset based on the config
settings.
4 years ago
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
feld
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
4 years ago
Mark Felder
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
Ivan Tashkinov
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
4 years ago
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
4 years ago