ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
3 years ago
07fed0fda2
Switch to aliasing `Router.Helpers` instead of importing
3 years ago
8afa3f2d1b
Remove no longer necessary unit tests for MastoFE
3 years ago
4f55d5123b
Remove MastoFE-related backend code and frontend pieces
3 years ago
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
4 years ago
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
4 years ago
7f8785fd9b
[ #3213 ] Performance optimization of filtering by hashtags ("any" condition).
4 years ago
92ab72dbbb
Update OpenApiSpex dependency
4 years ago
7dac83eb6e
Linting.
4 years ago
024c11c18d
StatusController: Deactivate application support for now.
...
Some more things to discuss about, so we'll remove it from 2.3.0
4 years ago
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
b1e1db82bc
Store application details in the object under the generator key, not application key
4 years ago
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
4 years ago
d35b6254b4
Store the client application data in ActivityStreams format
4 years ago
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
4 years ago
63739c5a58
Tests to validate client disclosure obeys user setting
4 years ago
d5ef02c7a7
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
4 years ago
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
4 years ago
cf6d3db58f
Add API endpoint to remove a conversation
4 years ago
9b61df1fb6
App is already preloaded into the token, so avoid an extra query
4 years ago
c1d78328ee
Consistency
4 years ago
6dc0b13cf8
Revert to original formatting for these function defs
4 years ago
7c508319a5
Prefer naming this put_application because we're putting it into the params map
4 years ago
09b8378646
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
4 years ago
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
4 years ago
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
4 years ago
3dc7e89c54
Ensure we capture the application details into the object
4 years ago
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
4 years ago
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
4 years ago
2cb6dc5a3a
list timeline filtration by params
4 years ago
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
4 years ago
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
4 years ago
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
4 years ago
875fbaae35
support for expires_in/expires_at in filters
4 years ago
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
c9d73af74d
Cachex: Unify arity of callback function
4 years ago
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
4 years ago
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
4 years ago
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
4 years ago
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
2013705690
Merge branch 'feature/gen-magic' into 'develop'
...
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
4 years ago
ed61002815
Undo API breaking changes
4 years ago
b001237b79
Finish undoing API breakage
4 years ago
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
6734abcbd4
Add pagination for Mutes
4 years ago
33f4f39b1c
Add pagination for Blocks
4 years ago
b738f70953
Merge branch 'develop' into feature/gen-magic
4 years ago
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
4 years ago
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
4 years ago
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
8bacdc3680
Change user.discoverable field to user.is_discoverable
4 years ago
9968b7efed
Change user.locked field to user.is_locked
4 years ago
1d0e130cb3
fixes after rebase
4 years ago
9f4fe5485b
alias alphabetically order
4 years ago
011525a3d1
EnsurePublicOrAuthenticatedPlug module name
4 years ago
a6d8cef33e
OAuthScopesPlug module name
4 years ago
4b1863ca4e
RateLimiter module name
4 years ago
04b514c567
Merge branch 'develop' into feature/gen-magic
4 years ago
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
4 years ago
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
ed6511a086
Lint
4 years ago
636c00037d
Fix duplicate @doc entries
4 years ago
8f5589cf66
Merge develop
4 years ago
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
4 years ago
23d5d7cf59
Fix #2172 HTTP error on password reset
4 years ago
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
91b9985e1c
Pass expires_in param from status controller
4 years ago
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
c56e3d4f3b
Add expires_in param for account mutes
4 years ago
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
581f382e71
ListController: DRY up stuff.
4 years ago
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
4 years ago
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
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
4 years ago
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
4 years ago
4af1b80381
Clean up account aliases
4 years ago
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
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
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
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
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
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
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
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
bdb3375933
Allow unblocking a domain via query params
4 years ago
afa8b469ed
Allow restricting public timeline by instance
4 years ago
Alex Gleason