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

Commit Graph

  • d28b9708d2 Update AdminFE build, re-enables emoji packs Mark Felder 2020-05-27 13:50:24 -05:00
  • 29ff6d414b HTTP security plug: Harden img-src and media-src when MediaProxy is enabled rinpatch 2020-05-27 21:01:36 +03:00
  • 455a402c8a HTTP Security plug: rewrite &csp_string/0 rinpatch 2020-05-27 20:27:30 +03:00
  • 2fdc6ef97f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-27 12:14:53 -05:00
  • 8f6d428880 AccountView: Use mediaproxy URLs for emojis rinpatch 2020-05-27 19:35:35 +03:00
  • 78c46fb7ba MediaProxy test: use config macros instead of directly putting values rinpatch 2020-05-27 19:34:56 +03:00
  • 48fd9be65a
         Exclude post actor from to of relay announce kPherox 2020-05-26 09:47:03 +00:00
  • d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop' rinpatch 2020-05-27 14:17:12 +00:00
  • 91f73a7592 Merge branch 'notification-fixes' into 'develop' rinpatch 2020-05-27 13:45:14 +00:00
  • 73f222d76a Migrations: Make user_id index on notifications better for query. lain 2020-05-27 12:56:15 +02:00
  • 047a11c48f Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex Alexander Strizhakov 2020-05-27 10:55:42 +00:00
  • c6290be682
         Fix typo Egor Kislitsyn 2020-05-27 14:42:21 +04:00
  • b8e029b5ea Notification: Actually preload objects. lain 2020-05-27 12:41:06 +02:00
  • b9e2678b9e Merge branch 'fav-speedup' into 'develop' lain 2020-05-27 08:02:00 +00:00
  • 7e13200869 ActivityPub: Change ordering to nulls last in favorites query lain 2020-05-27 09:46:12 +02:00
  • 3249141588
         validate actor type Alexander Strizhakov 2020-05-27 09:42:28 +03:00
  • 4cae9e6f6f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-26 16:20:40 -05:00
  • cf139b06a3 Merge branch 'fav-speedup' into 'develop' rinpatch 2020-05-26 16:33:13 +00:00
  • 3601c0015c Merge branch '1808-pleroma-sucks' into 'develop' rinpatch 2020-05-26 15:57:01 +00:00
  • 5ad28ff405 Merge branch 'apps-index' into 'develop' rinpatch 2020-05-26 15:56:23 +00:00
  • ed08da9135 Merge branch '1813-throttling' into 'develop' rinpatch 2020-05-26 15:55:09 +00:00
  • d8d99fd4cf Activity.Queries: Use correct actor restriction. lain 2020-05-26 17:46:16 +02:00
  • acba7043be Migrations: Add index on client_id and client_secret for apps. lain 2020-05-26 16:46:57 +02:00
  • 5083558ecd Merge branch 'restore-new-image' into 'develop' lain 2020-05-26 14:17:54 +00:00
  • 1a7ed04f9c Merge branch 'develop' into fix/mediaproxy-http-invalidation Maksim Pechnikov 2020-05-26 17:12:26 +03:00
  • 337ca33e5e Config: Restore old new background image lain 2020-05-26 16:00:56 +02:00
  • b233c8e55c Merge branch 'fix/oban-warnings' into 'develop' lain 2020-05-26 12:41:46 +00:00
  • 2069ec5006
         Fix Oban warnings Egor Kislitsyn 2020-05-26 16:11:42 +04:00
  • 51bc6674f6 Mastodon API Controllers: Use the correct params for rate limiting. lain 2020-05-26 13:45:54 +02:00
  • fca48154a2
         Add AdminAPI.InviteView Egor Kislitsyn 2020-05-26 15:21:33 +04:00
  • 2a4f965191
         Add OpenAPI spec for AdminAPI.InviteTokenController Egor Kislitsyn 2020-05-26 15:02:51 +04:00
  • 95ebfb9190
         Move invite actions to AdminAPI.InviteTokenController Egor Kislitsyn 2020-05-26 13:13:39 +04:00
  • 644195e31e Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop' lain 2020-05-26 10:56:40 +00:00
  • 8f08384d80
         another view for account in admin-fe status_show Alexander Strizhakov 2020-05-18 10:09:21 +03:00
  • c8803965af Merge branch 'skip-crypt-test' into 'develop' lain 2020-05-26 08:32:13 +00:00
  • 04a26ab0a8 added deleted_urls in AttachmentsCleanupWorker Maksim Pechnikov 2020-05-26 09:49:20 +03:00
  • 65d9692975 fix tests Maksim Pechnikov 2020-05-26 06:38:45 +03:00
  • d7a57004ef [#1501] Made user feed contain public and unlisted activities. Ivan Tashkinov 2020-05-25 23:27:47 +03:00
  • e32b7ae044
         Skip failing :crypt test on mac Egor Kislitsyn 2020-05-25 23:01:37 +04:00
  • 0ba1f2631a
         Add OpenAPI spec for AdminAPI.OAuthAppContoller Egor Kislitsyn 2020-05-25 22:02:22 +04:00
  • 6e9e21d6fc added deleted_urls_cache Maksim Pechnikov 2020-05-25 20:55:42 +03:00
  • 09d8b9cb55 Merge branch '1471-tuning-advice' into 'develop' lain 2020-05-25 17:45:40 +00:00
  • af3568a6d9 Docs: sql -> SQL lain 2020-05-25 19:26:07 +02:00
  • f7cb3f4cfc Apply suggestion to docs/installation/otp_en.md lain 2020-05-25 17:11:35 +00:00
  • dbd07d29a3 Streamer: Don't crash on streaming chat notifications lain 2020-05-25 17:27:45 +02:00
  • 2c25087d20 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-25 16:52:03 +02:00
  • 6a85fe1f9d Docs: Document reasonable Postgres settings. lain 2020-05-25 15:53:14 +02:00
  • f5d77ba574 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-25 08:46:00 -05:00
  • 6bd7070b00 Transmogrifier: Use a simpler way to get mentions. lain 2020-05-25 15:08:43 +02:00
  • 5fef405208 User: Change signature of get_users_from_set lain 2020-05-25 15:06:35 +02:00
  • cbcd592300
         Add OpenAPI spec for AdminAPI.RelayController Egor Kislitsyn 2020-05-22 17:52:26 +04:00
  • f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks lain 2020-05-25 14:01:16 +02:00
  • 5a0d0654a1 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-25 07:01:00 -05:00
  • 6783d544b2 Merge branch 'flaky-tests' into 'develop' lain 2020-05-25 12:00:53 +00:00
  • 5d5db7e5b7 StealEmojiPolicyTest: Clean up. lain 2020-05-25 14:00:18 +02:00
  • 2dff376041 StealEmojiPolicyTest: Fix flaky test. lain 2020-05-25 13:48:47 +02:00
  • ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-25 13:57:27 +02:00
  • aeb0875025 StealEmojiPolicyTest: Fix flaky test. lain 2020-05-25 13:48:47 +02:00
  • ec470c4c77 Merge branch 'openapi/admin/status' into 'develop' lain 2020-05-25 11:40:54 +00:00
  • 3bec0d2e50 Factory: Set users to be ap_enabled by default. lain 2020-05-25 12:59:42 +02:00
  • 0c970a9d44 UserTest: Add test for user refreshing. lain 2020-05-25 12:49:38 +02:00
  • d0c26956da User: Don't error out if we want to refresh a user but can't lain 2020-05-25 12:46:14 +02:00
  • 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop' rinpatch 2020-05-24 19:05:57 +00:00
  • 0a8170bd13 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-23 15:09:10 -05:00
  • 755bf36437 fix mediaproxy invalidations Maksim Pechnikov 2020-05-23 21:08:07 +03:00
  • aa06fc584b Fix MediaProxy Invalidation for Http method Mark Felder 2020-05-22 13:53:03 -05:00
  • 124812282f Revert "Merge branch 'issue/1509' into 'develop'" revert-6dd1575c lain 2020-05-22 18:32:27 +00:00
  • 72189d227f Merge branch 'priv-warning' into 'develop' lain 2020-05-22 17:20:23 +00:00
  • f7dac7f3f1 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-22 12:11:58 -05:00
  • ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop' lain 2020-05-22 16:05:35 +00:00
  • 5d60b25e69 Apply suggestion to lib/pleroma/web/common_api/utils.ex Roman Chvanikov 2020-05-22 15:44:10 +00:00
  • 8eb1dfadca Update CHANGELOG and docs Roman Chvanikov 2020-05-22 18:30:13 +03:00
  • cd2654e3cd Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-22 10:27:16 -05:00
  • cc82229ba7 Add filename_display_max_length config Roman Chvanikov 2020-05-22 18:19:25 +03:00
  • 3506e95499 Add Changelog lain 2020-05-22 17:13:09 +02:00
  • 91c8467582 OStatusController: Add Mastodon activity compat route. lain 2020-05-22 17:11:59 +02:00
  • 355aa3bdc7 ActivityPubController: Add Mastodon activity compat route. lain 2020-05-22 17:06:12 +02:00
  • 8a4bd9e5d1 OStatusController: Add Mastodon compatibility route for objects. lain 2020-05-22 16:47:22 +02:00
  • 1fa7aa9fc5 Merge branch 'emoji-react-better-errors' into 'develop' rinpatch 2020-05-22 14:36:08 +00:00
  • 96650c55ae Merge branch 'fix/notifications-api' into 'develop' rinpatch 2020-05-22 14:35:13 +00:00
  • fabc11bf9a priv/static: Add a warning discouraging admins from modifying the static files directly rinpatch 2020-05-22 17:33:19 +03:00
  • ba106aa9c8
         Fix notifications mark as read API Egor Kislitsyn 2020-05-22 18:15:36 +04:00
  • ca755f9a73 ActivityPubController: Add Mastodon compatibility route. lain 2020-05-22 16:15:29 +02:00
  • bcb549531f EmojiReactionController: Return more appropriate error. lain 2020-05-22 14:38:28 +02:00
  • 0e23138b50 [#2497] Specified SHELL in .gitlab-ci.yml as required for exexec. Ivan Tashkinov 2020-05-22 10:35:48 +03:00
  • 7b02bfca51 Merge branch 'announce-validator' into 'develop' Haelwenn 2020-05-22 05:47:53 +00:00
  • a57e7f3503 Merge branch '1113-op-mentioning' into 'develop' Haelwenn 2020-05-22 05:22:07 +00:00
  • 89f84f406c Ensure all MediaProxy settings are grouped together chore/expose-invalidation-to-adminfe Mark Felder 2020-05-21 16:36:13 -05:00
  • 6524f74114 Hint where to find the example script Mark Felder 2020-05-21 16:26:16 -05:00
  • 3771db97b4 Add MediaProxy invalidation settings to description.exs Mark Felder 2020-05-21 16:23:57 -05:00
  • 3a1e810aaa [#2497] Customized exexec launch to support root operation (currently required by Gitlab CI). Ivan Tashkinov 2020-05-21 21:47:32 +03:00
  • b26755648d Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-21 11:57:57 -05:00
  • 610343edb3 [#2497] Image preview proxy: image resize & background color fix with ffmpeg -filter_complex. Ivan Tashkinov 2020-05-21 17:35:42 +03:00
  • e0d1a942a6 Merge branch 'issue/1707' into 'develop' lain 2020-05-21 14:32:49 +00:00
  • ab1154e13f Merge branch 'admin-logo-upload' into 'develop' lain 2020-05-21 14:30:34 +00:00
  • 578ed3a37f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-21 15:35:13 +02:00
  • a42a0716ec Merge branch 'features/emoji_stealer' into 'develop' lain 2020-05-21 13:31:49 +00:00
  • f166316f50 Merge branch 'openapi/pleroma-api/pleroma' into 'develop' lain 2020-05-21 13:30:09 +00:00
  • 283fb1e05b Merge branch 'issue/749' into 'develop' lain 2020-05-21 13:27:44 +00:00
  • 45d2c4157f
         Add OpenAPI spec for AdminAPI.StatusController Egor Kislitsyn 2020-05-21 14:03:38 +04:00