Commit Graph

  • be34672d67
    formatting Alexander 2019-12-04 10:29:26 +03:00
  • 6e625a427c
    reply filtering Alexander 2019-12-04 09:49:17 +03:00
  • cb12585098 Announcements: Prevent race condition. lain 2020-04-24 14:37:53 +02:00
  • 2430b9bf90 Merge branch 'feature/remove-unused-like-code' into 'develop' lain 2020-04-24 12:09:15 +00:00
  • 1df6af2a4c Credo fixes. lain 2020-04-24 13:59:48 +02:00
  • bbf8554c97 ActivitPub: Remove like function. lain 2020-04-24 13:48:13 +02:00
  • f362836742
    Support validation for inline OpenAPI schema and automatic tests for examples Egor Kislitsyn 2020-04-24 14:46:59 +04:00
  • e6a735463f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-23 20:21:32 -05:00
  • 053c461530
    mix.exs: proper check on 0, remove else in git_pre_release Haelwenn (lanodan) Monnier 2020-04-24 00:26:24 +02:00
  • c63d6ba0b2
    mix.exs: branch_name fallbacks to "" Haelwenn (lanodan) Monnier 2020-04-23 23:44:30 +02:00
  • b429a49504
    mix.exs: Fix for MacOS Haelwenn (lanodan) Monnier 2020-04-23 23:44:03 +02:00
  • 3badbffa0a Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-04-23 23:51:38 +03:00
  • 89f38d94c7 [#2409] Fixed before-action callback results persistence. Ivan Tashkinov 2020-04-23 21:47:33 +03:00
  • a51cdafc01 Docs: Add documentation about chatmessages lain 2020-04-23 16:55:00 +02:00
  • 1e28d34592 ChatMessage: Correctly ingest emoji tags. lain 2020-04-23 16:19:49 +02:00
  • ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-23 15:47:08 +02:00
  • 1b5f8d19ee Merge branch 'bugfix/repeating-announce' into 'develop' rinpatch 2020-04-23 12:40:38 +00:00
  • 7d38197894 CommonAPI: Don't make repeating announces possible lain 2020-04-23 13:33:30 +02:00
  • 25eec6d72d Merge branch 'bugfix/null-scheduled-at' into 'develop' rinpatch 2020-04-23 11:22:30 +00:00
  • 9cf4c4fa73
    Remove vapidPublicKey from Nodeinfo Egor Kislitsyn 2020-04-23 14:12:42 +04:00
  • 320133dae4 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-22 18:33:08 -05:00
  • 416a37fcef Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-04-23 02:03:02 +03:00
  • 850377a7b8 Merge branch 'bugfix/1629-fav-race-condition' into 'develop' lain 2020-04-22 19:26:32 +00:00
  • 1bcbdc7a9f SideEffects: Use less cryptic syntax. lain 2020-04-22 21:21:21 +02:00
  • af27e4dffd Merge branch 'bugfix/1670-user-count' into 'develop' Haelwenn 2020-04-22 17:37:09 +00:00
  • f5bda09de6 Stats: Use invisible property for filtering. lain 2020-04-22 19:02:22 +02:00
  • e7fb593d13 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users Ivan Tashkinov 2020-04-22 20:00:51 +03:00
  • e62173dfc8 SideEffects: Run in transaction. lain 2020-04-22 18:40:53 +02:00
  • 1b06a27746
    Update Flake ID description Egor Kislitsyn 2020-04-22 20:20:19 +04:00
  • 6c26feed01
    Merge branch 'develop' into openapi/account Egor Kislitsyn 2020-04-22 20:18:12 +04:00
  • 4e1cab9112 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-22 10:56:53 -05:00
  • 0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks Ivan Tashkinov 2020-04-22 18:51:59 +03:00
  • 2958a7d246 Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped. Ivan Tashkinov 2020-04-22 18:50:25 +03:00
  • 28f8fcf8b0 Merge branch 'fix/follow-and-blocks-import' into 'develop' Haelwenn 2020-04-22 15:46:04 +00:00
  • 468cc977be Merge branch 'bugfix/following-fix-status-code' into 'develop' Haelwenn 2020-04-22 15:33:04 +00:00
  • 238058ecae Merge branch 'bugfix/1543-streaming-boosts' into 'develop' Haelwenn 2020-04-22 15:31:51 +00:00
  • b03aeae8b9 Apply suggestion to lib/pleroma/notification.ex Ivan Tashkinov 2020-04-22 15:31:41 +00:00
  • 771c1ad735
    Update CHANGELOG Egor Kislitsyn 2020-04-22 19:31:03 +04:00
  • 6db52c3b36 Fix Oban warning Egor Kislitsyn 2020-04-22 19:00:08 +04:00
  • e7771424a8 Fix blocks import Egor Kislitsyn 2020-04-22 18:13:13 +04:00
  • 88b82e5c3e Fix follow import Egor Kislitsyn 2020-04-21 20:05:25 +04:00
  • 7a3a88a13e Streamer: Stream boosts to the boosting user. lain 2020-04-22 17:21:13 +02:00
  • 1855c597c2 Merge branch 'feature/voters-count' into 'develop' Haelwenn 2020-04-22 15:12:19 +00:00
  • 2e73c19edc Merge branch 'worker-messages' into 'develop' Haelwenn 2020-04-22 15:09:10 +00:00
  • 8b522b3b3f merge develop Roman Chvanikov 2020-04-22 17:13:03 +03:00
  • 1fe9b91ff7 debug Roman Chvanikov 2020-04-22 17:11:06 +03:00
  • 1cd38dfffa Merge branch 'microformats' into 'develop' lain 2020-04-22 14:10:55 +00:00
  • 452072ec95
    static_fe: Add microformats2 classes Karol Kosek 2020-04-22 16:02:40 +02:00
  • 8b88e2a6e2 Stats: Ignore internal users for user count. lain 2020-04-22 15:31:37 +02:00
  • 5b39526198 AccountController: Use code 400 for self-follow. lain 2020-04-22 15:04:26 +02:00
  • 69ecc39038 Merge branch 'fix/1689-fix-migrate-to-db' into 'develop' lain 2020-04-22 12:41:31 +00:00
  • c10485db16 StatusController: Ignore nil scheduled_at parameters. lain 2020-04-22 14:26:19 +02:00
  • c466e739b6 Merge branch 'docs/debian-packages' into 'develop' lain 2020-04-22 12:10:27 +00:00
  • 568f48435e Apply suggestion to docs/installation/debian_based_en.md lain 2020-04-22 12:10:20 +00:00
  • 5102468d0f Polls: Persist and show voters' count lain 2020-04-22 14:06:39 +02:00
  • 923513b641 Federator: Return proper values for jobs lain 2020-04-22 13:28:52 +02:00
  • f719a5b23a WebPush: Return proper values for jobs. lain 2020-04-22 13:28:34 +02:00
  • 1d6338f2d3 Litepub: Add ChatMessage. lain 2020-04-22 12:52:39 +02:00
  • 2e62a63749 ChatMessageValidator: Validation changes lain 2020-04-22 12:48:52 +02:00
  • 1140e80ae2 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-21 21:10:23 -05:00
  • 11433cd38d
    Add OpenAPI schema for FlakeID Egor Kislitsyn 2020-04-21 23:54:45 +04:00
  • f0238d010a
    Improve OpenAPI schema Egor Kislitsyn 2020-04-21 23:30:24 +04:00
  • 6c8390fa4d ChatControllerTest: Credo fixes. lain 2020-04-21 18:32:30 +02:00
  • 66c2eb670b ChatController: Validate parameters. lain 2020-04-21 18:23:00 +02:00
  • 97ad0c4597 Chats: Add API specs. lain 2020-04-21 17:51:06 +02:00
  • f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring. Ivan Tashkinov 2020-04-21 16:29:19 +03:00
  • a185b5455f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-21 14:24:27 +02:00
  • 3c828016d9 Merge branch 'openapi/custom-emojis' into 'develop' lain 2020-04-21 10:13:50 +00:00
  • 5165287ff4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-21 12:00:33 +02:00
  • bb5d0eafa4 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users Ivan Tashkinov 2020-04-21 08:20:50 +03:00
  • e57c1b60e4 Merge branch 'accept-deletes' into 'develop' rinpatch 2020-04-20 18:30:01 +00:00
  • 7e456ac7f6 Merge branch 'router-cleanup' into 'develop' rinpatch 2020-04-20 18:29:03 +00:00
  • 950da036d0 pleroma_healthcheck: Remove commented code contrib/munin-healthcheck Haelwenn (lanodan) Monnier 2020-04-20 18:58:21 +02:00
  • 63f106a250 pleroma_healthcheck: Avoid div by 0 Haelwenn (lanodan) Monnier 2020-04-20 18:57:27 +02:00
  • b448f0fcb1 installation/munin-plugin/pleroma_healthcheck: New Haelwenn (lanodan) Monnier 2020-04-20 17:47:17 +02:00
  • 0c12056531 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-20 11:45:52 -05:00
  • 364eecc49f
    Merge branch 'develop' into global-status-expiration Egor Kislitsyn 2020-04-20 20:37:56 +04:00
  • bedc558809
    Merge remote-tracking branch 'upstream/develop' into accept-deletes Alex Gleason 2020-04-20 10:13:56 -05:00
  • b54c8813d6
    Add :reject_deletes option to SimplePolicy Alex Gleason 2020-04-13 13:48:32 -05:00
  • ed3974af24 Add OpenAPI spec for AccountController.identity_proofs operation Egor Kislitsyn 2020-04-20 18:39:05 +04:00
  • 736fead494 Merge branch 'develop' into openapi/account Egor Kislitsyn 2020-04-20 18:37:45 +04:00
  • 28165dad3a Merge branch 'cleanup-subscription-controller' into 'develop' lain 2020-04-20 13:01:17 +00:00
  • baeb9fb451 Merge branch 'fix-object_age_policy' into 'develop' lain 2020-04-20 12:59:16 +00:00
  • 8b4de61d64 Fix ObjectAgePolicyTest Ilja 2020-04-20 12:59:16 +00:00
  • 617a9f6208 Merge branch 'mrf-docs-update' into 'develop' lain 2020-04-20 12:57:45 +00:00
  • 258d897579 Cleanup and DRY the Router Egor Kislitsyn 2020-04-20 16:38:00 +04:00
  • b5df4a98e4 ChatMessageView: Support emoji. lain 2020-04-20 14:38:53 +02:00
  • 7e53da250e ChatMessage: Support emoji. lain 2020-04-20 14:08:54 +02:00
  • b836d3d104 ChatMessageValidator: Require published field lain 2020-04-20 13:14:59 +02:00
  • 139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-20 12:37:17 +02:00
  • 970b74383b Credo fixes. lain 2020-04-20 12:29:19 +02:00
  • 5b6818b3e5 CommonAPI: Obey local limit for chat messages. lain 2020-04-20 12:08:47 +02:00
  • ce23673ca1 ChatMessageValidator: Don't validate messages that are too long. lain 2020-04-20 11:45:11 +02:00
  • 918a8094fc Merge branch '1559-follow-request-notifications' into 'develop' rinpatch 2020-04-19 21:45:20 +00:00
  • 389fb36fb5 Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop' rinpatch 2020-04-19 21:44:25 +00:00
  • c906ffc51a
    mix.exs: Do not bail out when .git doesn’t exists Haelwenn (lanodan) Monnier 2020-04-19 20:23:48 +02:00
  • 4c4c6d0807 Merge develop Roman Chvanikov 2020-04-18 17:47:46 +03:00
  • b9a485ba52 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-18 09:02:41 -05:00
  • 7003671e3e cleanup Roman Chvanikov 2020-04-18 15:22:10 +03:00
  • 79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' Haelwenn 2020-04-18 06:59:23 +00:00