aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-04-13Add OpenAPI spec for DomainBlockControllerEgor Kislitsyn
2020-04-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses
2020-04-12Merge branch 'fix/mix-tasks-failing-otp' into 'develop'rinpatch
Fix mix tasks failing on OTP releases Closes #1678 See merge request pleroma/pleroma!2369
2020-04-12Fix mix tasks failing on OTP releasesrinpatch
No idea why this was even added. Closes #1678
2020-04-11Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-04-10Merge branch 'develop' into fix/support-conversations-paginationEgor Kislitsyn
2020-04-10Merge branch 'bugfix/apc2s_upload_activity' into 'develop'Haelwenn
bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316
2020-04-09Add `/api/v1/notifications/:id/dismiss` endpointEgor Kislitsyn
2020-04-09Merge branch 'fix/1658-invite-send' into 'develop'lain
Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344
2020-04-09typo fixAlexander Strizhakov
2020-04-09Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.exAlexander Strizhakov
2020-04-09Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.exAlexander Strizhakov
2020-04-09Merge branch 'open-api' into 'develop'lain
Add OpenAPI Closes pleroma-meta#19 See merge request pleroma/pleroma!2345
2020-04-09Merge branch 'formatter-html-safe' into 'develop'lain
formatter.ex: Use Phoenix.HTML for mention/hashtag generation See merge request pleroma/pleroma!2357
2020-04-09ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}Haelwenn (lanodan) Monnier
2020-04-08formatter.ex: Use Phoenix.HTML for mention/hashtag generationrinpatch
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.
2020-04-08fix for gun connections poolAlexander Strizhakov
2020-04-07Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352
2020-04-06Add Pleroma.Web.ApiSpec.HelpersEgor Kislitsyn
2020-04-06Merge branch 'featureflag/emoji_reactions' into 'develop'lain
Add emoji reactions to features in nodeinfo See merge request pleroma/pleroma!2313
2020-04-06Merge branch 'improving-test-coverage' into 'develop'lain
Tests for emoji mix task See merge request pleroma/pleroma!2350
2020-04-06Merge branch 'remake-remodel-2' into 'develop'lain
Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315
2020-04-06ObjectID Validator: Refactor.lain
2020-04-06Transmogrifier: Refactoring / Renaming.lain
2020-04-06tests for emoji mix taskAlexander Strizhakov
2020-04-02Merge remote-tracking branch ↵Ivan Tashkinov
'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
2020-04-02[#2323] Fixed a typo causing /accounts/relationships to render default ↵Ivan Tashkinov
relationships. Improved the tests.
2020-04-02Add oAuthEgor Kislitsyn
2020-04-01Add OpenAPIEgor Kislitsyn
2020-04-01error improvement for email_invite endpointAlexander Strizhakov
2020-04-01Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses # Conflicts: # CHANGELOG.md
2020-04-01Merge branch 'gun' into 'develop'feld
Gun adapter Closes #945 See merge request pleroma/pleroma!1861
2020-04-01Ability to control the output of account/pleroma/relationship in statuses in ↵Ivan Tashkinov
order to improve the rendering performance. See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01Validators: Correct ObjectID filenamelain
2020-04-01Merge branch 'fix/1601-add-new-meta-tag' into 'develop'rinpatch
Restrict remote users from indexing Closes #1601 See merge request pleroma/pleroma!2341
2020-04-01restrict remote users from indexingAlexander Strizhakov
2020-03-31Provide known-good user.uri, remove User.profile_url/1Haelwenn (lanodan) Monnier
2020-03-31User: Fix use of source_data in profile_url/1Haelwenn (lanodan) Monnier
2020-04-01Use `Pleroma.Formatter.linkify` instead of `AutoLinker.link`kPherox
2020-03-31Transmogrifier: Fix BAD code by RINPATCHlain
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-31Transmogrifier: Only add context if it really is onne.lain
2020-03-31Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-2
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-31CommonAPI: DRY up a bit.lain
2020-03-31Validators: ObjectID is an http uri.lain
2020-03-31Remove no longer used functionkPherox
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-31[#2332] Misc. improvements per code change requests.Ivan Tashkinov