Haelwenn
|
a2aa309496
|
Merge branch 'update_open_api_spex' into 'develop'
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
|
4 years ago |
|
Ivan Tashkinov
|
7f8785fd9b
|
[#3213] Performance optimization of filtering by hashtags ("any" condition).
|
4 years ago |
|
Egor Kislitsyn
|
92ab72dbbb
|
Update OpenApiSpex dependency
|
4 years ago |
|
Ivan Tashkinov
|
882dd46843
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
4 years ago |
|
Mark Felder
|
b1e1db82bc
|
Store application details in the object under the generator key, not application key
|
4 years ago |
|
lain
|
e6a14e1cd1
|
Merge branch 'feat/client_app_details' into 'develop'
Support application field
See merge request pleroma/pleroma!3311
|
4 years ago |
|
Mark Felder
|
d35b6254b4
|
Store the client application data in ActivityStreams format
|
4 years ago |
|
Ivan Tashkinov
|
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 |
|
Mark Felder
|
63739c5a58
|
Tests to validate client disclosure obeys user setting
|
4 years ago |
|
Mark Felder
|
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 |
|
rinpatch
|
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 |
|
Egor Kislitsyn
|
cf6d3db58f
|
Add API endpoint to remove a conversation
|
4 years ago |
|
Mark Felder
|
9b61df1fb6
|
App is already preloaded into the token, so avoid an extra query
|
4 years ago |
|
Mark Felder
|
c1d78328ee
|
Consistency
|
4 years ago |
|
Mark Felder
|
6dc0b13cf8
|
Revert to original formatting for these function defs
|
4 years ago |
|
Mark Felder
|
7c508319a5
|
Prefer naming this put_application because we're putting it into the params map
|
4 years ago |
|
Mark Felder
|
09b8378646
|
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
|
4 years ago |
|
Ivan Tashkinov
|
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 |
|
Ivan Tashkinov
|
df89b5019b
|
[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
|
4 years ago |
|
Mark Felder
|
3dc7e89c54
|
Ensure we capture the application details into the object
|
4 years ago |
|
feld
|
008499f65a
|
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Ivan Tashkinov
|
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 |
|
feld
|
d289ad8579
|
Merge branch 'develop' into 'fix/2411-mutes-api'
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
|
4 years ago |
|
Alexander Strizhakov
|
2cb6dc5a3a
|
list timeline filtration by params
|
4 years ago |
|
Alexander Strizhakov
|
c3110c46f3
|
expanding filtration for home timeline
added local & remote statuses filtration for home timeline
|
4 years ago |
|
Alexander Strizhakov
|
c369d2b930
|
support for with_relationships parameter
in /api/v1/mutes and /api/v1/accounts/:id endpoints
|
4 years ago |
|
Ivan Tashkinov
|
380d0cce6b
|
[#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
|
4 years ago |
|
Alexander Strizhakov
|
875fbaae35
|
support for expires_in/expires_at in filters
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
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 |
|
lain
|
cf0eb0c1c5
|
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
|
4 years ago |
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
4 years ago |
|
Alex Gleason
|
cbce880076
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
4 years ago |
|
lain
|
c9d73af74d
|
Cachex: Unify arity of callback function
|
4 years ago |
|
lain
|
713612c377
|
Cachex: Make caching provider switchable at runtime.
Defaults to Cachex.
|
4 years ago |
|
Ivan Tashkinov
|
f1b07a2b2b
|
OAuth form user remembering feature. Local MastoFE login / logout fixes.
|
4 years ago |
|
Ivan Tashkinov
|
12a5981cc3
|
Session token setting on token exchange. Auth-related refactoring.
|
4 years ago |
|
Ivan Tashkinov
|
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 |
|
Egor Kislitsyn
|
fb41bd1a85
|
Hide reactions from muted and blocked users
|
4 years ago |
|
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 |
|
Alex Gleason
|
83770b7b39
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
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 |
|
Alex Gleason
|
7d8f610720
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
4 years ago |
