Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
rinpatch
7ee35eb9a6
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'
...
Fix mix tasks failing on OTP releases
Closes #1678
See merge request pleroma/pleroma!2369
5 years ago
rinpatch
2ba754ffe1
Fix mix tasks failing on OTP releases
...
No idea why this was even added.
Closes #1678
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
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
Egor Kislitsyn
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
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
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
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
96ee0aadbf
Merge branch 'improving-test-coverage' into 'develop'
...
Tests for emoji mix task
See merge request pleroma/pleroma!2350
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
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task
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
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