Alex Gleason
|
2e682788a3
|
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
|
3 years ago |
|
Alex Gleason
|
3ff9c5e2a6
|
Break out activity-specific HTML functions into Pleroma.Activity.HTML
Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex
|
3 years ago |
|
Alex Gleason
|
c9e4200ed2
|
Create real Views for all Controllers
This makes views depend on each other at runtime instead of compile-time
|
3 years ago |
|
Alex Gleason
|
07fed0fda2
|
Switch to aliasing `Router.Helpers` instead of importing
|
3 years ago |
|
lain
|
7dac83eb6e
|
Linting.
|
4 years ago |
|
lain
|
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 |
|
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 |
|
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 |
|
Alexander Strizhakov
|
1e6c27181e
|
expires_in in scheduled status params
|
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
|
df89b5019b
|
[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
|
4 years ago |
|
Mark Felder
|
4540e08a6a
|
Rendering fallback for when we don't have valid data available
|
4 years ago |
|
Mark Felder
|
981349f21d
|
Enable rendering of the client application data details
|
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 |
|
feld
|
f1f773f2c7
|
Merge branch 'email-stub-in-verify-credentials' into 'develop'
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
|
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 |
|
feld
|
cd5ff7a943
|
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.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
|
60b4654038
|
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.
|
4 years ago |
|
Egor Kislitsyn
|
793fc77b16
|
Add active user count
|
4 years ago |
|
Alexander Strizhakov
|
875fbaae35
|
support for expires_in/expires_at in filters
|
4 years ago |
|
Haelwenn
|
250e202098
|
Merge branch 'fix/missing-own_votes' into 'develop'
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
|
4 years ago |
|
Mark Felder
|
2cb5c16723
|
Credo
|
4 years ago |
|
Alexander Strizhakov
|
3f3d64acbf
|
little refactor and tests
for voted & own_votes fields in polls
|
4 years ago |
|
Mark Felder
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
4 years ago |
|
Mark Felder
|
6bfd497f4a
|
Include own_votes in the poll data
|
4 years ago |
|
Mark Felder
|
80ccdb56f6
|
Make tag urls absolute
|
4 years ago |
|
Mark Felder
|
28581e03ad
|
Merge branch 'develop' into refactor/deactivated_user_field
|
4 years ago |
|
Mark Felder
|
d36182c088
|
Change user.confirmation_pending field to user.is_confirmed
|
4 years ago |
|
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
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 |
|
Haelwenn
|
3966add048
|
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
|
4 years ago |
|
Haelwenn
|
b122b6ffa3
|
Merge branch 'features/hashtag-column' into 'develop'
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
18b536c176
|
Pleroma.Object/1: take %Object{} as argument instead
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
87b13c5430
|
Create Object.hashtags/1 wrapper
|
4 years ago |
