rinpatch
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
4 years ago
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
4 years ago
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities
4 years ago
rinpatch
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
4 years ago
rinpatch
77ee64b993
user: remove blank?
4 years ago
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController
4 years ago
Ivan Tashkinov
bde1189c34
[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
4 years ago
Ivan Tashkinov
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
4 years ago
Haelwenn
b1c1d2e5e1
Merge branch 'fix/1659-rate-limiter' into 'develop'
...
remote_ip plug adds remote_ip_found flag
Closes #1659
See merge request pleroma/pleroma!2390
4 years ago
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag
5 years ago
lain
6bc76df287
Uploads: Sandbox them in the CSP.
5 years ago
rinpatch
96eae62995
Merge branch 'fix/openapi-form-mimetype' into 'develop'
...
openapi: add application/x-www-form-urlencoded to body types
Closes #1683
See merge request pleroma/pleroma!2387
5 years ago
rinpatch
cc4ff19e34
openapi: add application/x-www-form-urlencoded to body types
...
Closes #1683
5 years ago
Mark Felder
3bf78f2be7
Fix Oban not receiving :ok from RichMediaHelper job
5 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
feld
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
5 years ago
lain
5fc6ce30ac
Merge branch 'chore/spelling' into 'develop'
...
Fix spelling in log message
See merge request pleroma/pleroma!2378
5 years ago
lain
2eae5793cd
Merge branch 'fix/issue_1679' into 'develop'
...
[#1679 ] fixed logs
See merge request pleroma/pleroma!2379
5 years ago
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
5 years ago
Maksim Pechnikov
c4e7ed660c
fix logger message
5 years ago
Mark Felder
f3725b8fc4
Fix spelling
5 years ago
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
5 years ago
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
Alexander Strizhakov
a050f3e015
fix for logger configuration through admin-fe
5 years ago
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy
5 years ago
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
rinpatch
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
5 years ago
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
Haelwenn
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
5 years ago
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data
5 years ago
Haelwenn (lanodan) Monnier
3420dec494
Remove User.fields/1
5 years ago
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields
5 years ago
Haelwenn (lanodan) Monnier
369c03834c
formatter: Use user.uri instead of user.source_data.uri
5 years ago
Haelwenn (lanodan) Monnier
b6bed1a284
Types.URI: New
5 years ago
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field
5 years ago
Haelwenn (lanodan) Monnier
5628984df4
User: remove source_data use for follower_address and following_address
5 years ago
Egor Kislitsyn
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
Ivan Tashkinov
ac672a9d6b
[ #1559 ] Addressed code review requests.
5 years ago
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
5 years ago
Alexander Strizhakov
f20a19de85
typo fix
5 years ago
Alexander Strizhakov
1cf0d5ab0d
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
Alexander Strizhakov
4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
5 years ago
lain
564f3f01ca
Merge branch 'formatter-html-safe' into 'develop'
...
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
5 years ago
Haelwenn (lanodan) Monnier
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
5 years ago
rinpatch
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
5 years ago
Alexander Strizhakov
5739c498c0
fix for gun connections pool
5 years ago
Ivan Tashkinov
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
5 years ago
rinpatch
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
5 years ago
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
5 years ago
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
5 years ago
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
5 years ago
lain
772bc258cd
ObjectID Validator: Refactor.
5 years ago
lain
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
5 years ago
Ivan Tashkinov
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Ivan Tashkinov
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
5 years ago
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Egor Kislitsyn
0aa24a150b
Add oAuth
5 years ago
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
23219e6fb3
Add OpenAPI
5 years ago
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint
5 years ago
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
feld
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
5 years ago
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
lain
037b49c415
Validators: Correct ObjectID filename
5 years ago
rinpatch
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
5 years ago
Alexander Strizhakov
94ddbe4098
restrict remote users from indexing
5 years ago
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn (lanodan) Monnier
b30fb1f3bb
User: Fix use of source_data in profile_url/1
5 years ago
kPherox
7408f003a6
Use `Pleroma.Formatter.linkify` instead of `AutoLinker.link`
5 years ago
lain
c982093cc2
Transmogrifier: Fix BAD code by RINPATCH
5 years ago
lain
1b323ce1c6
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain
ecac57732a
Transmogrifier: Only add context if it really is onne.
5 years ago
lain
51fc504705
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain
288f2b5a7c
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain
0be1fa0a86
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain
057438a657
CommonAPI: DRY up a bit.
5 years ago
lain
643f15e77b
Validators: ObjectID is an http uri.
5 years ago
kPherox
d191b0942f
Remove no longer used function
5 years ago
lain
f6835333be
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
Ivan Tashkinov
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
5 years ago
Ivan Tashkinov
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
5 years ago
lain
8bd5ad8664
Merge branch 'benchmark-improvements' into 'develop'
...
Benchmark improvements
See merge request pleroma/pleroma!2308
5 years ago
Alexander Strizhakov
b607ae1a1c
removing grouped reports admin api endpoint
5 years ago
Alexander Strizhakov
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
5 years ago
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
eb9744cade
activities generation tasks
5 years ago
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
5 years ago
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
Ivan Tashkinov
6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
5 years ago
lain
29ab1d9f8d
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain
69fc1dd69f
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain
0c60c0a76a
Validators: Use correct type for IDs.
5 years ago