alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 2069ec5006
         Fix Oban warnings Egor Kislitsyn 2020-05-26 16:11:42 +0400
  • 51bc6674f6 Mastodon API Controllers: Use the correct params for rate limiting. lain 2020-05-26 13:45:54 +0200
  • fca48154a2
         Add AdminAPI.InviteView Egor Kislitsyn 2020-05-26 15:21:33 +0400
  • 2a4f965191
         Add OpenAPI spec for AdminAPI.InviteTokenController Egor Kislitsyn 2020-05-26 15:02:51 +0400
  • 95ebfb9190
         Move invite actions to AdminAPI.InviteTokenController Egor Kislitsyn 2020-05-26 13:13:39 +0400
  • 644195e31e Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop' lain 2020-05-26 10:56:40 +0000
  • 8f08384d80
         another view for account in admin-fe status_show Alexander Strizhakov 2020-05-18 10:09:21 +0300
  • c8803965af Merge branch 'skip-crypt-test' into 'develop' lain 2020-05-26 08:32:13 +0000
  • d7a57004ef [#1501] Made user feed contain public and unlisted activities. Ivan Tashkinov 2020-05-25 23:27:47 +0300
  • e32b7ae044
         Skip failing `:crypt` test on mac Egor Kislitsyn 2020-05-25 23:01:37 +0400
  • 0ba1f2631a
         Add OpenAPI spec for AdminAPI.OAuthAppContoller Egor Kislitsyn 2020-05-25 22:02:22 +0400
  • 09d8b9cb55 Merge branch '1471-tuning-advice' into 'develop' lain 2020-05-25 17:45:40 +0000
  • af3568a6d9 Docs: sql -> SQL lain 2020-05-25 19:26:07 +0200
  • f7cb3f4cfc Apply suggestion to docs/installation/otp_en.md lain 2020-05-25 17:11:35 +0000
  • dbd07d29a3 Streamer: Don't crash on streaming chat notifications lain 2020-05-25 17:27:45 +0200
  • 2c25087d20 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-25 16:52:03 +0200
  • 6a85fe1f9d Docs: Document reasonable Postgres settings. lain 2020-05-25 15:53:14 +0200
  • 6bd7070b00 Transmogrifier: Use a simpler way to get mentions. lain 2020-05-25 15:08:43 +0200
  • 5fef405208 User: Change signature of get_users_from_set lain 2020-05-25 15:06:35 +0200
  • cbcd592300
         Add OpenAPI spec for AdminAPI.RelayController Egor Kislitsyn 2020-05-22 17:52:26 +0400
  • f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks lain 2020-05-25 14:01:16 +0200
  • 6783d544b2 Merge branch 'flaky-tests' into 'develop' lain 2020-05-25 12:00:53 +0000
  • 5d5db7e5b7 StealEmojiPolicyTest: Clean up. lain 2020-05-25 14:00:18 +0200
  • 2dff376041 StealEmojiPolicyTest: Fix flaky test. lain 2020-05-25 13:48:47 +0200
  • ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-25 13:57:27 +0200
  • aeb0875025 StealEmojiPolicyTest: Fix flaky test. lain 2020-05-25 13:48:47 +0200
  • ec470c4c77 Merge branch 'openapi/admin/status' into 'develop' lain 2020-05-25 11:40:54 +0000
  • 3bec0d2e50 Factory: Set users to be ap_enabled by default. lain 2020-05-25 12:59:42 +0200
  • 0c970a9d44 UserTest: Add test for user refreshing. lain 2020-05-25 12:49:38 +0200
  • d0c26956da User: Don't error out if we want to refresh a user but can't lain 2020-05-25 12:46:14 +0200
  • 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop' rinpatch 2020-05-24 19:05:57 +0000
  • 72189d227f Merge branch 'priv-warning' into 'develop' lain 2020-05-22 17:20:23 +0000
  • ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop' lain 2020-05-22 16:05:35 +0000
  • 5d60b25e69 Apply suggestion to lib/pleroma/web/common_api/utils.ex Roman Chvanikov 2020-05-22 15:44:10 +0000
  • 8eb1dfadca Update CHANGELOG and docs Roman Chvanikov 2020-05-22 18:30:13 +0300
  • cc82229ba7 Add filename_display_max_length config Roman Chvanikov 2020-05-22 18:19:25 +0300
  • 3506e95499 Add Changelog lain 2020-05-22 17:13:09 +0200
  • 91c8467582 OStatusController: Add Mastodon activity compat route. lain 2020-05-22 17:11:59 +0200
  • 355aa3bdc7 ActivityPubController: Add Mastodon activity compat route. lain 2020-05-22 17:06:12 +0200
  • 8a4bd9e5d1 OStatusController: Add Mastodon compatibility route for objects. lain 2020-05-22 16:47:22 +0200
  • 1fa7aa9fc5 Merge branch 'emoji-react-better-errors' into 'develop' rinpatch 2020-05-22 14:36:08 +0000
  • 96650c55ae Merge branch 'fix/notifications-api' into 'develop' rinpatch 2020-05-22 14:35:13 +0000
  • fabc11bf9a priv/static: Add a warning discouraging admins from modifying the static files directly rinpatch 2020-05-22 17:33:19 +0300
  • ba106aa9c8
         Fix notifications mark as read API Egor Kislitsyn 2020-05-22 18:15:36 +0400
  • ca755f9a73 ActivityPubController: Add Mastodon compatibility route. lain 2020-05-22 16:15:29 +0200
  • bcb549531f EmojiReactionController: Return more appropriate error. lain 2020-05-22 14:38:28 +0200
  • 0e23138b50 [#2497] Specified SHELL in .gitlab-ci.yml as required for `exexec`. Ivan Tashkinov 2020-05-22 10:35:48 +0300
  • 7b02bfca51 Merge branch 'announce-validator' into 'develop' Haelwenn 2020-05-22 05:47:53 +0000
  • a57e7f3503 Merge branch '1113-op-mentioning' into 'develop' Haelwenn 2020-05-22 05:22:07 +0000
  • 3a1e810aaa [#2497] Customized `exexec` launch to support root operation (currently required by Gitlab CI). Ivan Tashkinov 2020-05-21 21:47:32 +0300
  • 610343edb3 [#2497] Image preview proxy: image resize & background color fix with ffmpeg -filter_complex. Ivan Tashkinov 2020-05-21 17:35:42 +0300
  • e0d1a942a6 Merge branch 'issue/1707' into 'develop' lain 2020-05-21 14:32:49 +0000
  • ab1154e13f Merge branch 'admin-logo-upload' into 'develop' lain 2020-05-21 14:30:34 +0000
  • 578ed3a37f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-21 15:35:13 +0200
  • a42a0716ec Merge branch 'features/emoji_stealer' into 'develop' lain 2020-05-21 13:31:49 +0000
  • f166316f50 Merge branch 'openapi/pleroma-api/pleroma' into 'develop' lain 2020-05-21 13:30:09 +0000
  • 283fb1e05b Merge branch 'issue/749' into 'develop' lain 2020-05-21 13:27:44 +0000
  • 45d2c4157f
         Add OpenAPI spec for AdminAPI.StatusController Egor Kislitsyn 2020-05-21 14:03:38 +0400
  • c4a5cead51 UploadTest: Fix test. lain 2020-05-21 15:17:39 +0200
  • cc0d462e91 Attachments: Have the mediaType on the root, too. lain 2020-05-21 15:08:56 +0200
  • 814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-21 15:00:05 +0200
  • bf1b221f94 Credo fixes for the credo god. lain 2020-05-21 14:12:32 +0200
  • cdc6ba8d7b AnnounceValidator: Check for announcability lain 2020-05-21 13:58:18 +0200
  • c76267afb9 Credo fixes. lain 2020-05-21 13:31:52 +0200
  • 23e248694d Announcements: Fix all tests. lain 2020-05-21 13:16:21 +0200
  • d9d425708e SideEffects: Builed out Announce effects. lain 2020-05-21 12:43:09 +0200
  • 4ae2f75c3e Apply suggestion to docs/administration/CLI_tasks/user.md lain 2020-05-21 10:27:06 +0000
  • 9de9760aa6
         Move status actions to AdminAPI.StatusController Egor Kislitsyn 2020-05-20 18:00:41 +0400
  • 9bc5e18ade rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate` Maksim Pechnikov 2020-05-21 08:06:57 +0300
  • 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 +0300
  • c96f425cb0 fixed `mix pleroma.instance gen` Maksim Pechnikov 2020-05-20 21:16:40 +0300
  • 42b06d78df Merge branch 'chore/update-config-fe' into 'develop' Haelwenn 2020-05-20 17:45:19 +0000
  • 6fd4f58ead Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-05-20 20:27:03 +0300
  • 1871a5ddb4 [#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing. Ivan Tashkinov 2020-05-20 20:26:43 +0300
  • 4c48626585 Also add new sidebarRight setting Mark Felder 2020-05-20 12:22:31 -0500
  • 39031f4860 Pipeline: Don't federate if federation is disabled. lain 2020-05-20 16:36:55 +0200
  • e42bc5f557 Announcements: Handle through common pipeline. lain 2020-05-20 15:44:37 +0200
  • 265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop' lain 2020-05-20 12:08:28 +0000
  • c7cdc553ff Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator lain 2020-05-20 14:02:40 +0200
  • 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop' lain 2020-05-20 11:43:49 +0000
  • 67844a8b11 Merge branch 'openapi/fix-spec' into 'develop' lain 2020-05-20 11:40:05 +0000
  • eb5f428565 CommonAPI: Change public->private implicit addressing. lain 2020-05-20 13:38:47 +0200
  • 26f01744bc
         Add `background_image` to `InstanceOperation` Egor Kislitsyn 2020-05-20 15:18:58 +0400
  • 5ba6e1c322
         Move notification actions to PleromaAPI.NotificationController Egor Kislitsyn 2020-05-20 15:14:11 +0400
  • f3fc8b22b1
         Move conversation actions to PleromaAPI.ConversationController Egor Kislitsyn 2020-05-20 15:00:11 +0400
  • 9a5de0f454
         Move reaction actions to EmojiReactionController Egor Kislitsyn 2020-05-19 23:50:49 +0400
  • 490a3a34b6
         Add OpenAPI spec for PleromaAPI.PleromaAPIController Egor Kislitsyn 2020-05-19 21:52:26 +0400
  • 94ba5a7802 Merge branch 'exposed-background-image' into 'develop' Haelwenn 2020-05-20 10:53:54 +0000
  • 6dd1575c64 Merge branch 'issue/1509' into 'develop' lain 2020-05-20 10:35:36 +0000
  • 2a74565090 Changelog: Add background to instance lain 2020-05-20 12:14:17 +0200
  • 5b8105928b Docs: Add background_image in instance lain 2020-05-20 12:13:57 +0200
  • 8a6ddf26ac InstanceOperation: Add background image to example lain 2020-05-20 12:12:07 +0200
  • c3cfe87c60 Merge branch 'mastofe/bundle-2020-05-20' into 'develop' lain 2020-05-20 09:12:35 +0000
  • c2dd4639d6
         MastoFE: update to bundle-2020-05-20 Haelwenn (lanodan) Monnier 2020-05-20 07:55:14 +0200
  • 376147fb82 Apply suggestion to installation/nginx-cache-purge.sh.example Maksim 2020-05-20 04:12:21 +0000
  • 5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop' Haelwenn 2020-05-20 04:00:46 +0000
  • b5b9d161cd update purge script Maksim Pechnikov 2020-05-20 06:56:04 +0300
  • 918ee46417 Synchronize :fe settings in config.exs Mark Felder 2020-05-19 16:05:39 -0500
  • 48bcb22146 Merge branch 'recipients-query-speedup' into 'develop' rinpatch 2020-05-19 14:32:27 +0000
  • 47ed9ee441
         Fix summary Egor Kislitsyn 2020-05-19 17:29:58 +0400