Commit Graph

  • c4a5cead51 UploadTest: Fix test. lain 2020-05-21 15:17:39 +02:00
  • cc0d462e91 Attachments: Have the mediaType on the root, too. lain 2020-05-21 15:08:56 +02:00
  • 814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-21 15:00:05 +02:00
  • bf1b221f94 Credo fixes for the credo god. lain 2020-05-21 14:12:32 +02:00
  • cdc6ba8d7b AnnounceValidator: Check for announcability lain 2020-05-21 13:58:18 +02:00
  • c76267afb9 Credo fixes. lain 2020-05-21 13:31:52 +02:00
  • 23e248694d Announcements: Fix all tests. lain 2020-05-21 13:16:21 +02:00
  • d9d425708e SideEffects: Builed out Announce effects. lain 2020-05-21 12:43:09 +02:00
  • 4ae2f75c3e Apply suggestion to docs/administration/CLI_tasks/user.md lain 2020-05-21 10:27:06 +00:00
  • 9de9760aa6
    Move status actions to AdminAPI.StatusController Egor Kislitsyn 2020-05-20 18:00:41 +04:00
  • 9bc5e18ade rename mix task: pleroma.user unsubscribe -> pleroma.user deactivate Maksim Pechnikov 2020-05-21 08:06:57 +03:00
  • d269e61071 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-20 23:01:32 -05:00
  • b7fc61e17b Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE eugenijm 2020-04-12 22:54:43 +03:00
  • c96f425cb0 fixed mix pleroma.instance gen Maksim Pechnikov 2020-05-20 21:16:40 +03:00
  • 42b06d78df Merge branch 'chore/update-config-fe' into 'develop' Haelwenn 2020-05-20 17:45:19 +00:00
  • 6fd4f58ead Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-05-20 20:27:03 +03:00
  • 1871a5ddb4 [#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing. Ivan Tashkinov 2020-05-20 20:26:43 +03:00
  • 4c48626585 Also add new sidebarRight setting Mark Felder 2020-05-20 12:22:31 -05:00
  • 39031f4860 Pipeline: Don't federate if federation is disabled. lain 2020-05-20 16:36:55 +02:00
  • e42bc5f557 Announcements: Handle through common pipeline. lain 2020-05-20 15:44:37 +02:00
  • 265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop' lain 2020-05-20 12:08:28 +00:00
  • c7cdc553ff Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator lain 2020-05-20 14:02:40 +02:00
  • 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop' lain 2020-05-20 11:43:49 +00:00
  • 67844a8b11 Merge branch 'openapi/fix-spec' into 'develop' lain 2020-05-20 11:40:05 +00:00
  • eb5f428565 CommonAPI: Change public->private implicit addressing. lain 2020-05-20 13:38:47 +02:00
  • 26f01744bc
    Add background_image to InstanceOperation Egor Kislitsyn 2020-05-20 15:18:58 +04:00
  • 5ba6e1c322
    Move notification actions to PleromaAPI.NotificationController Egor Kislitsyn 2020-05-20 15:14:11 +04:00
  • f3fc8b22b1
    Move conversation actions to PleromaAPI.ConversationController Egor Kislitsyn 2020-05-20 15:00:11 +04:00
  • 9a5de0f454
    Move reaction actions to EmojiReactionController Egor Kislitsyn 2020-05-19 23:50:49 +04:00
  • 490a3a34b6
    Add OpenAPI spec for PleromaAPI.PleromaAPIController Egor Kislitsyn 2020-05-19 21:52:26 +04:00
  • 94ba5a7802 Merge branch 'exposed-background-image' into 'develop' Haelwenn 2020-05-20 10:53:54 +00:00
  • 6dd1575c64 Merge branch 'issue/1509' into 'develop' lain 2020-05-20 10:35:36 +00:00
  • 2a74565090 Changelog: Add background to instance lain 2020-05-20 12:14:17 +02:00
  • 5b8105928b Docs: Add background_image in instance lain 2020-05-20 12:13:57 +02:00
  • 8a6ddf26ac InstanceOperation: Add background image to example lain 2020-05-20 12:12:07 +02:00
  • c3cfe87c60 Merge branch 'mastofe/bundle-2020-05-20' into 'develop' lain 2020-05-20 09:12:35 +00:00
  • c2dd4639d6
    MastoFE: update to bundle-2020-05-20 Haelwenn (lanodan) Monnier 2020-05-20 07:55:14 +02:00
  • 376147fb82 Apply suggestion to installation/nginx-cache-purge.sh.example Maksim 2020-05-20 04:12:21 +00:00
  • 5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop' Haelwenn 2020-05-20 04:00:46 +00:00
  • b5b9d161cd update purge script Maksim Pechnikov 2020-05-20 06:56:04 +03:00
  • 918ee46417 Synchronize :fe settings in config.exs Mark Felder 2020-05-19 16:05:39 -05:00
  • 48bcb22146 Merge branch 'recipients-query-speedup' into 'develop' rinpatch 2020-05-19 14:32:27 +00:00
  • 47ed9ee441
    Fix summary Egor Kislitsyn 2020-05-19 17:29:58 +04:00
  • be322541c8 User.Query: Remove superfluous distinct lain 2020-05-19 14:36:34 +02:00
  • 2328eff09c UserTest: Hide warning in tests. lain 2020-05-19 14:36:13 +02:00
  • 6609714d66
    Move Scrobble views to ScrobbleView Egor Kislitsyn 2020-05-19 16:11:59 +04:00
  • 524d04d921
    Add OpenAPI spec for PleromaAPI.ScrobbleController Egor Kislitsyn 2020-05-19 15:53:18 +04:00
  • a985bd57b4 User.Query: Speed up recipients query. lain 2020-05-19 14:11:32 +02:00
  • 7075fa92a5 Merge branch 'deps/update-crypt' into 'develop' lain 2020-05-19 11:57:01 +00:00
  • 512261c97d Update crypt library Roman Chvanikov 2020-05-19 14:46:06 +03:00
  • e4c720f14c
    Fix typo Egor Kislitsyn 2020-05-19 14:59:50 +04:00
  • 58ccd2bbfd Merge branch 'openapi/pleroma-api/mascot' into 'develop' Haelwenn 2020-05-19 09:41:57 +00:00
  • 7e3814390e Merge branch 'issue/1667' into 'develop' Haelwenn 2020-05-19 06:56:44 +00:00
  • 86f50a809f Merge branch 'support/docs' into 'develop' Haelwenn 2020-05-19 06:43:57 +00:00
  • 41f8f17260 fix api/v1/accounts/update_credentials Maksim Pechnikov 2020-05-19 09:42:41 +03:00
  • c95bbeadc3
    operation use helper function for empty object fix/1650-domain-mutes Alexander Strizhakov 2020-05-19 09:36:49 +03:00
  • d4f50f2ba9
    markdown and specs Alexander Strizhakov 2020-05-19 09:36:20 +03:00
  • ed442a225a removed Quantum from docs Maksim Pechnikov 2020-05-19 06:15:42 +03:00
  • 5f0a3ac74d added tests Maksim Pechnikov 2020-05-18 09:22:26 +03:00
  • 71a95d6781 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-18 14:13:39 -05:00
  • d19c716770 AttachmentValidator: Handle empty mediatypes lain 2020-05-18 20:17:28 +02:00
  • d4a7577cde
    Fix API documentation Egor Kislitsyn 2020-05-18 22:01:38 +04:00
  • fe5d423b43
    Add OpenAPI spec for MascotController Egor Kislitsyn 2020-05-18 22:00:32 +04:00
  • a66da971ff Merge branch 'openapi/use-boolean-like-in-requests' into 'develop' rinpatch 2020-05-18 17:13:53 +00:00
  • 45c3a72404
    [OpenAPI] Use BooleanLike in all request bodies Egor Kislitsyn 2020-05-18 20:58:59 +04:00
  • be4db41d71 ChatMessageValidator: Allow one message in an array, too. lain 2020-05-18 18:45:33 +02:00
  • 0d417e005d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-18 18:38:32 +02:00
  • 8e9c939e42 Merge branch 'direct-timeline-with-muted-param-fix' into 'develop' lain 2020-05-18 16:27:54 +00:00
  • f8d199cbbf ActivityPub.Utils: Use system time instead of os time for timestamps use-system-time lain 2020-05-18 18:26:12 +02:00
  • 5735b5c8be Fixed missing support for with_muted param in direct timeline. Ivan Tashkinov 2020-05-18 19:00:00 +03:00
  • aef31c69df
    Rename EmojiAPIController to EmojiPackController Egor Kislitsyn 2020-05-18 19:38:22 +04:00
  • 8bde8dfec2
    Cleanup Pleroma.Emoji.Pack Egor Kislitsyn 2020-05-18 19:43:23 +04:00
  • 6e4de715b3
    Add OpenAPI spec for PleromaAPI.EmojiAPIController Egor Kislitsyn 2020-05-14 19:21:51 +04:00
  • 0d5bce018d AnnounceValidator: Validate for existing announce lain 2020-05-18 16:54:10 +02:00
  • 17a8342c1e ObjectValidators: Add basic Announce validator. lain 2020-05-18 16:45:11 +02:00
  • 63ab2743ce TransmogrifierTest: Fix tests. lain 2020-05-18 15:47:26 +02:00
  • 7d381b16b7 Transmogrifier Test: Extract Announce handling. lain 2020-05-18 14:48:37 +02:00
  • 20a22362b8 Merge branch 'copyright' into 'develop' lain 2020-05-18 12:35:27 +00:00
  • 215daabdb4
    copyright update Alexander Strizhakov 2020-05-18 15:15:51 +03:00
  • 5c502eb3ad Merge branch '1778-benchmark-fix' into 'develop' lain 2020-05-18 12:14:24 +00:00
  • 80d0eb9735
    changelog and docs update Alexander Strizhakov 2020-05-18 15:02:33 +03:00
  • 15c7e3b4bf Merge branch 'docs/storing-remote-media' into 'develop' lain 2020-05-18 11:59:07 +00:00
  • 7b500d6b4f Load Testing: adjust to new CommonAPI.post format. lain 2020-05-18 13:56:58 +02:00
  • 188b32145e InstanceView: Expose background image link. lain 2020-05-18 13:28:50 +02:00
  • 96f7b1b140 Merge branch 'show-media-endpoint-fixes' into 'develop' lain 2020-05-18 10:57:59 +00:00
  • fa7cfbd0b0
    adding domain mutes Alexander Strizhakov 2020-05-16 10:22:19 +03:00
  • 71c95dfc1c
    Keep only pure-federation side-effects of user.ap_enabled bugfix/non-ap_enabled-direct_follow Haelwenn (lanodan) Monnier 2020-04-07 08:23:13 +02:00
  • 1be6b3056e Use indexed split_part/3 to get a hostname rather than ts_ functions Roman Chvanikov 2020-05-18 12:38:16 +03:00
  • 636b99c552
    Federator: print out error string on unhandled activity Haelwenn (lanodan) Monnier 2020-04-07 08:39:15 +02:00
  • 01bd6a1e54 Merge branch 'develop' into feature/admin-api-status-count-per-instance Roman Chvanikov 2020-05-18 11:56:27 +03:00
  • 1199cf3a78 Merge branch '1763-password-updates' into 'develop' rinpatch 2020-05-18 07:57:13 +00:00
  • 0321a3e078
    test naming fix Alexander Strizhakov 2020-05-18 10:34:34 +03:00
  • 1671864d88
    return :visible instead of boolean Alexander Strizhakov 2020-05-15 20:29:09 +03:00
  • b1aa402229
    removing 410 status Alexander Strizhakov 2020-05-13 11:11:10 +03:00
  • e7bc2f980c
    account visibility Alexander Strizhakov 2020-05-07 13:44:38 +03:00
  • 9b76565264 MediaController: enforced owner-only access in :show action. Improved error response on denied access (now 403). Adjusted tests. Ivan Tashkinov 2020-05-18 09:51:53 +03:00
  • c33a4315fb updated docs Maksim Pechnikov 2020-05-18 06:48:19 +03:00
  • baf051a59e SideEffects: Don't update unread count for actor in chatmessages. lain 2020-05-17 12:22:26 +02:00
  • 9c17109765 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-17 12:14:49 +02:00
  • 8bfd9710ae Pleroma Authenticator: Also update passwords here. lain 2020-05-17 11:53:17 +02:00