summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-04-11Remove User.upgrade_changeset in favor of remote_user_creationrinpatch
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.
2020-04-11[#1364] Disabled notifications on activities from blocked domains.Ivan Tashkinov
2020-04-10Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-04-10Chat: Only create them for valid users for now.lain
2020-04-10Merge branch 'develop' into global-status-expirationEgor Kislitsyn
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-10User: remove source_dataHaelwenn (lanodan) Monnier
2020-04-10Remove User.fields/1Haelwenn (lanodan) Monnier
2020-04-10profile emojis in User.emoji instead of source_dataHaelwenn (lanodan) Monnier
2020-04-10User: Move inbox & shared_inbox to own fieldsHaelwenn (lanodan) Monnier
2020-04-10formatter: Use user.uri instead of user.source_data.uriHaelwenn (lanodan) Monnier
2020-04-10Types.URI: NewHaelwenn (lanodan) Monnier
2020-04-10User: Move public_key from source_data to own fieldHaelwenn (lanodan) Monnier
2020-04-10User: remove source_data use for follower_address and following_addressHaelwenn (lanodan) Monnier
2020-04-09ChatController: Basic message posting.lain
2020-04-09ChatController: Basic support for returning messages.lain
2020-04-09ChatController: Add creation and return of chats.lain
2020-04-09Add `/api/v1/notifications/:id/dismiss` endpointEgor Kislitsyn
2020-04-09[#1559] Addressed code review requests.Ivan Tashkinov
2020-04-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-09CommonAPI: Basic ChatMessage support.lain
2020-04-09SideEffects: Handle ChatMessage creation.lain
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-08ChatMessage: Basic incoming handling.lain
2020-04-08Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352
2020-04-07[#1559] Support for "follow_request" notifications (configurable).Ivan Tashkinov
(Not currently supported by PleromaFE, thus disabled by default).
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-07Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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-06Enforcement of OAuth scopes check for authenticated API endpoints, ↵Ivan Tashkinov
:skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-02Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287
2020-04-02Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
Fix profile url for funkwhale channels, removes one source_data use Closes #1653 See merge request pleroma/pleroma!2333
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.