Commit Graph

  • 7e0b42d99f
    Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements Egor Kislitsyn 2020-04-09 20:34:21 +04:00
  • ab185d3ea4
    Add spec for AccountController.follows Egor Kislitsyn 2020-04-09 20:12:09 +04:00
  • 68a979b824
    Add specs for AccountController.block and AccountController.unblock Egor Kislitsyn 2020-04-09 18:41:18 +04:00
  • e4195d4a68
    Add specs for AccountController.mute and AccountController.unmute Egor Kislitsyn 2020-04-09 18:28:14 +04:00
  • aa958a6dda
    Add spec for AccountController.unfollow Egor Kislitsyn 2020-04-09 17:57:21 +04:00
  • 854780c72b
    Add spec for AccountController.follow Egor Kislitsyn 2020-04-09 15:25:24 +04:00
  • 1b680a98ae
    Add spec for AccountController.lists Egor Kislitsyn 2020-04-08 23:51:46 +04:00
  • e105cc12b6
    Add spec for AccountController.following Egor Kislitsyn 2020-04-08 23:38:07 +04:00
  • bd6e2b300f
    Add spec for AccountController.followers Egor Kislitsyn 2020-04-08 23:16:20 +04:00
  • 03124c96cc
    Add spec for AccountController.statuses Egor Kislitsyn 2020-04-08 22:33:25 +04:00
  • 278b3fa0ad
    Add spec for AccountController.show Egor Kislitsyn 2020-04-07 18:53:12 +04:00
  • d7d6a83233
    Add spec for AccountController.relationships Egor Kislitsyn 2020-04-07 18:29:05 +04:00
  • ab400b2ddb
    Add specs for ActorType and VisibilityScope Egor Kislitsyn 2020-04-07 16:18:23 +04:00
  • 260cbddc94
    Add spec for AccountController.update_credentials Egor Kislitsyn 2020-04-07 14:53:12 +04:00
  • f80116125f
    Add spec for AccountController.verify_credentials Egor Kislitsyn 2020-04-06 00:15:37 +04:00
  • b08ded6c2f
    Add spec for AccountController.create Egor Kislitsyn 2020-04-03 22:45:08 +04:00
  • ef37774403 Merge branch 'output-of-relationships-in-statuses' into 'develop' rinpatch 2020-04-13 13:05:40 +00:00
  • 5c76afb06c [#2342] Removed description.exs entry for temporary configuration option. Ivan Tashkinov 2020-04-13 15:38:50 +03:00
  • 99b0bc1989 [#1364] Resolved merge conflicts with develop. Refactoring. Ivan Tashkinov 2020-04-13 13:24:31 +03:00
  • dc8fa04192
    Merge branch 'develop' into global-status-expiration Egor Kislitsyn 2020-04-13 14:12:51 +04:00
  • f00ff20768 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users Ivan Tashkinov 2020-04-13 09:23:50 +03:00
  • a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses Ivan Tashkinov 2020-04-13 09:16:51 +03:00
  • dc2637c188 [#2342] Removed changelog entry for temporary configuration option. Ivan Tashkinov 2020-04-13 09:16:35 +03:00
  • de34c4ee6b
    changelog entry Alexander Strizhakov 2020-04-13 08:59:06 +03:00
  • a050f3e015
    fix for logger configuration through admin-fe Alexander Strizhakov 2020-04-10 14:42:52 +03:00
  • c5c09fc61b fix mediaType of object Maksim Pechnikov 2020-04-13 06:53:45 +03:00
  • 9a3c74b244
    Always accept deletions through SimplePolicy Alex Gleason 2020-04-12 20:26:35 -05:00
  • ed894802d5
    Expand MRF SimplePolicy docs Alex Gleason 2020-04-12 18:46:47 -05:00
  • c556efb761 [#1364] Enabled notifications on followed domain-blocked users' activities. Ivan Tashkinov 2020-04-12 21:53:03 +03:00
  • 7ee35eb9a6 Merge branch 'fix/mix-tasks-failing-otp' into 'develop' rinpatch 2020-04-12 16:00:15 +00:00
  • 2ba754ffe1 Fix mix tasks failing on OTP releases rinpatch 2020-04-12 18:49:31 +03:00
  • 5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop' rinpatch 2020-04-11 19:46:04 +00:00
  • c077ad0b33 Remove User.upgrade_changeset in favor of remote_user_creation rinpatch 2020-04-11 21:44:52 +03:00
  • 8c72cd3d54 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-11 10:31:22 -05:00
  • 88b16fdfb7 [#1364] Disabled notifications on activities from blocked domains. Ivan Tashkinov 2020-04-11 16:01:09 +03:00
  • c682563b92 Merge branch 'support/update_oban' into 'develop' rinpatch 2020-04-11 10:04:02 +00:00
  • ad92cef844 fix Oban migration Maksim Pechnikov 2020-04-10 21:27:50 +03:00
  • c255c2e4f5 Merge branch 'develop' into support/update_oban Maksim Pechnikov 2020-04-10 21:27:41 +03:00
  • aae22ab691 Merge branch 'chore/changelog-organization' into 'develop' feld 2020-04-10 16:56:41 +00:00
  • 6ff8812ea3 Add a section for changelog entries that pertain to the next patch release. Mark Felder 2020-04-10 11:37:02 -05:00
  • dd612f86ae
    Merge remote-tracking branch 'origin/develop' into global-status-expiration Egor Kislitsyn 2020-04-10 20:00:05 +04:00
  • 64c78581fe Chat: Only create them for valid users for now. lain 2020-04-10 14:47:56 +02:00
  • fc4f92c5de Merge branch 'fix/support-conversations-pagination' into 'develop' Haelwenn 2020-04-10 12:12:49 +00:00
  • 7f692343c8
    Merge branch 'develop' into global-status-expiration Egor Kislitsyn 2020-04-10 14:20:48 +04:00
  • cf2a0574e7
    Merge branch 'develop' into fix/support-conversations-pagination Egor Kislitsyn 2020-04-10 14:18:57 +04:00
  • 53110d6aca Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-10 00:44:22 -05:00
  • ce089615e1 Merge branch 'chore/fix-changelog' into 'develop' Haelwenn 2020-04-10 05:15:11 +00:00
  • 92243e62b2 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-09 23:33:53 -05:00
  • 4d33e0bd50 Merge branch 'bugfix/apc2s_upload_activity' into 'develop' Haelwenn 2020-04-10 04:31:13 +00:00
  • e89078ac2a
    User: remove source_data Haelwenn (lanodan) Monnier 2020-04-06 10:59:35 +02:00
  • 3420dec494
    Remove User.fields/1 Haelwenn (lanodan) Monnier 2020-04-06 10:44:48 +02:00
  • 9172d719cc
    profile emojis in User.emoji instead of source_data Haelwenn (lanodan) Monnier 2020-04-03 13:03:32 +02:00
  • 62656ab259
    User: Move inbox & shared_inbox to own fields Haelwenn (lanodan) Monnier 2020-04-01 07:47:07 +02:00
  • 369c03834c
    formatter: Use user.uri instead of user.source_data.uri Haelwenn (lanodan) Monnier 2020-04-01 07:15:38 +02:00
  • b6bed1a284
    Types.URI: New Haelwenn (lanodan) Monnier 2020-04-09 13:01:35 +02:00
  • 19eedb3d04
    User: Move public_key from source_data to own field Haelwenn (lanodan) Monnier 2020-04-01 06:58:48 +02:00
  • 5628984df4
    User: remove source_data use for follower_address and following_address Haelwenn (lanodan) Monnier 2020-04-01 01:50:53 +02:00
  • 648cc699e5 Merge branch 'develop' into support/update_oban Maksim Pechnikov 2020-04-10 07:09:28 +03:00
  • c433ed9dbb Merge branch 'fix-otp-version-file-in-docker' into 'develop' Haelwenn 2020-04-10 03:55:54 +00:00
  • c2aad36aa8 Rename function kPherox 2020-04-09 23:19:41 +00:00
  • 9abf13abe0 CHANGELOG.md: update 2.0.2 release date rinpatch 2020-04-08 00:39:55 +03:00
  • adeb82e496 CHANGELOG.md: add 2.0.2 update notes rinpatch 2020-04-08 00:38:48 +03:00
  • 0b8f9a66ae CHANGELOG.md: add entries for funkwhale-related changes rinpatch 2020-04-02 23:37:14 +03:00
  • 7306d2d069 CHANGELOG.md: Add 2.0.2 entry rinpatch 2020-03-31 13:59:26 +03:00
  • 2a08f44b02 CHANGELOG.md: Add upgrade notes for 2.0.1 rinpatch 2020-03-16 00:50:03 +03:00
  • 781ac28859 changelog.md: add 2.0.1 entry rinpatch 2020-03-15 17:26:58 +03:00
  • fd388a0941 Merge branch 'update-changelog' into 'develop' rinpatch 2020-04-09 19:49:10 +00:00
  • c826d5195f
    Update CHANGELOG Egor Kislitsyn 2020-04-09 23:36:17 +04:00
  • c23532d24b Merge branch 'notifications-dismiss-api' into 'develop' feld 2020-04-09 19:32:11 +00:00
  • 0e8f6d24b8
    Create OTP_VERSION file by mix release kPherox 2020-04-10 00:19:09 +09:00
  • 2cc6841424 ChatController: Basic message posting. lain 2020-04-09 17:18:31 +02:00
  • e8fd0dd689 ChatController: Basic support for returning messages. lain 2020-04-09 16:59:49 +02:00
  • f0b5c45e3b Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-09 09:39:47 -05:00
  • e84c0450bf Merge branch 'fix-otp-version-file-in-docker' into 'develop' lain 2020-04-09 14:12:08 +00:00
  • 68abea313d ChatController: Add creation and return of chats. lain 2020-04-09 15:13:55 +02:00
  • d545b883eb
    Add /api/v1/notifications/:id/dismiss endpoint Egor Kislitsyn 2020-04-09 17:08:43 +04:00
  • d37a102933
    Fix OTP_VERSION file in docker kPherox 2020-04-09 21:16:29 +09:00
  • ac672a9d6b [#1559] Addressed code review requests. Ivan Tashkinov 2020-04-09 15:13:37 +03:00
  • d35e114acd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-09 13:25:27 +02:00
  • 8e637ae1a7 CommonAPI: Basic ChatMessage support. lain 2020-04-09 13:20:16 +02:00
  • 4b04785071 SideEffects: Extend ChatMessage test. lain 2020-04-09 12:46:33 +02:00
  • 2e78686686 SideEffects: Handle ChatMessage creation. lain 2020-04-09 12:44:20 +02:00
  • b87b798ca1 Merge branch 'fix/1658-invite-send' into 'develop' lain 2020-04-09 10:42:43 +00:00
  • f20a19de85
    typo fix Alexander Strizhakov 2020-04-09 13:28:54 +03:00
  • 9795ff5b01 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs Alexander Strizhakov 2020-04-09 10:17:50 +00:00
  • 365c34a7a9 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs Alexander Strizhakov 2020-04-09 10:17:44 +00:00
  • 1cf0d5ab0d Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex Alexander Strizhakov 2020-04-09 10:17:36 +00:00
  • 4c60fdcbb1 Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex Alexander Strizhakov 2020-04-09 10:17:31 +00:00
  • c8bfbf511e Apply suggestion to docs/API/admin_api.md Alexander Strizhakov 2020-04-09 10:17:24 +00:00
  • d2e21fbc96 Merge branch 'open-api' into 'develop' lain 2020-04-09 09:48:56 +00:00
  • 564f3f01ca Merge branch 'formatter-html-safe' into 'develop' lain 2020-04-09 09:47:07 +00:00
  • de592a6d33 Merge branch 'changelog-update' into 'develop' Haelwenn 2020-04-09 05:11:10 +00:00
  • 73134e248a
    no changelog entry - bug fixed only in develop Alexander Strizhakov 2020-04-09 08:03:21 +03:00
  • 4cedecac45 Merge branch 'bugfix/objectid_validator' into 'develop' Haelwenn 2020-04-09 02:43:03 +00:00
  • c401b00c78
    ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""} Haelwenn (lanodan) Monnier 2020-04-09 04:36:39 +02:00
  • d067eaa7b3 formatter.ex: Use Phoenix.HTML for mention/hashtag generation rinpatch 2020-04-08 22:58:31 +03:00
  • 3965772b26 [#1559] Minor change (analysis). Ivan Tashkinov 2020-04-08 21:33:37 +03:00
  • f35c28bf07 [#1559] Added / fixed tests for follow / follow_request notifications. Ivan Tashkinov 2020-04-08 21:26:22 +03:00
  • 90cbf55236 Merge branch 'gun-pool-fix' into 'develop' feld 2020-04-08 17:13:54 +00:00
  • 3b15a0eecc Merge branch 'release/2.0.2' into 'stable' v2.0.2 rinpatch 2020-04-08 15:51:56 +00:00