Commit Graph

  • cafdf18408 Merge branch '1873-pagination-fixes' into 'develop' lain 2020-06-19 13:42:57 +00:00
  • 372533b7c3 Merge branch 'dry-up-follower-update' into 'develop' lain 2020-06-19 13:40:34 +00:00
  • abdb540d45 ObjectValidators: Add basic UpdateValidator. lain 2020-06-19 15:30:30 +02:00
  • 5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search. Ivan Tashkinov 2020-06-19 16:14:06 +03:00
  • 7e488cd4a7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator lain 2020-06-19 14:56:50 +02:00
  • 02ca8a363f
    default page size for files Alexander Strizhakov 2020-06-19 14:46:38 +03:00
  • 0c739b423a
    changelog entry Alexander Strizhakov 2020-06-19 12:31:55 +03:00
  • 3e3f9253e6
    adding overall count for packs and files Alexander Strizhakov 2020-06-19 10:17:24 +03:00
  • 9dba010e0e Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-19 00:26:44 -05:00
  • 0103df2d0a Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-18 22:26:14 +03:00
  • 4975ed86bc
    emoji pagination for pack show action Alexander Strizhakov 2020-06-18 18:50:03 +03:00
  • 3becdafd33
    emoji packs pagination Alexander Strizhakov 2020-06-18 14:32:21 +03:00
  • e4c61f1741 added test Maksim Pechnikov 2020-06-18 05:45:15 +03:00
  • c9b5e3feda revert 'database' option to rejected keys Maksim Pechnikov 2020-06-18 05:29:31 +03:00
  • 4044f24e2e fix test Maksim Pechnikov 2020-06-18 05:02:33 +03:00
  • 2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url Mark Felder 2020-06-17 13:13:55 -05:00
  • c08c9db0c1 Remove misleading is_ prefix from boolean function Mark Felder 2020-06-17 13:02:01 -05:00
  • 71a5d9bffb Empty list as default Mark Felder 2020-06-17 12:54:02 -05:00
  • 3462d4b995 Merge branch 'develop' into issue/1855 Mark Felder 2020-06-17 12:50:06 -05:00
  • d772361e62 Merge branch 'fix/1787-mogrify-args' into 'develop' lain 2020-06-17 15:53:24 +00:00
  • 43a47bf5cc Merge branch 'fix/notification-type' into 'develop' rinpatch 2020-06-17 15:21:42 +00:00
  • d4b5a9730e
    Remove poll from notification_type OpenAPI spec Egor Kislitsyn 2020-06-17 18:47:59 +04:00
  • 96493da7bd Apply suggestion to test/web/media_proxy/invalidation_test.exs Maksim 2020-06-17 13:14:01 +00:00
  • 9a371bf5f6 Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex Maksim 2020-06-17 13:12:38 +00:00
  • 44ce97a9c9 Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex Maksim 2020-06-17 13:12:32 +00:00
  • 078d687e6e Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs Maksim 2020-06-17 12:58:50 +00:00
  • 2991aae4c4 Apply suggestion to test/web/media_proxy/invalidations/script_test.exs Maksim 2020-06-17 12:58:38 +00:00
  • 11b22a4229 Apply suggestion to test/web/media_proxy/invalidations/http_test.exs Maksim 2020-06-17 12:58:33 +00:00
  • 6d33a3a51b Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs Maksim 2020-06-17 12:58:28 +00:00
  • 793a53f1ec Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs Maksim 2020-06-17 12:58:16 +00:00
  • 1b45bc7b2a Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs Maksim 2020-06-17 12:58:08 +00:00
  • 74fd761637 Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex Maksim 2020-06-17 12:56:30 +00:00
  • abfb1c756b Apply suggestion to docs/API/admin_api.md Maksim 2020-06-17 12:56:17 +00:00
  • 90613348ed Apply suggestion to docs/API/admin_api.md Maksim 2020-06-17 12:56:13 +00:00
  • be11b15bf9 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-17 05:53:30 -05:00
  • 4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop' rinpatch 2020-06-17 10:34:23 +00:00
  • bb7744ab5c
    tests fixes feature/1392-support-irreversible-filters Alexander Strizhakov 2020-05-01 09:20:54 +03:00
  • 86fd8fc1ef
    adding benchmarks in new format Alexander Strizhakov 2020-03-31 16:53:11 +03:00
  • 6ed97f8b52
    test fix Alexander Strizhakov 2020-03-30 11:18:25 +03:00
  • 3158d35212
    renaming back and reject nil on create Alexander Strizhakov 2020-02-26 17:50:56 +03:00
  • c5e933107c
    Apply suggestion to test/notification_test.exs Alexander Strizhakov 2020-02-26 14:00:38 +00:00
  • c6c64c0324
    Apply suggestion to test/notification_test.exs Alexander Strizhakov 2020-02-26 14:00:28 +00:00
  • ba82c2110b
    Apply suggestion to lib/pleroma/filter.ex Alexander Strizhakov 2020-02-26 13:59:07 +00:00
  • c26bb1a43d
    don't filter notifications for follow and move types Alexander Strizhakov 2020-02-07 18:16:39 +03:00
  • 4f4ff5b001
    Restrict thread statuses that contain user's irreversible filters Sergey Suprunenko 2019-11-25 16:59:55 +01:00
  • 65e14580c3
    Skip notifications for statuses that contain an irreversible filtered word Sergey Suprunenko 2019-11-22 19:52:50 +01:00
  • f7c09e91ed
    Restrict statuses that contain user's irreversible filters Sergey Suprunenko 2019-11-16 22:54:13 +01:00
  • 9a82de219c
    formatting Alexander Strizhakov 2020-06-17 10:50:05 +03:00
  • abda3f2d92
    suggestion for changelog Alexander Strizhakov 2020-06-17 10:47:20 +03:00
  • a77b0388f4
    credo fix Alexander Strizhakov 2020-06-17 10:31:06 +03:00
  • 02a5648feb fixed migration the settings to DB Maksim Pechnikov 2020-06-17 09:15:35 +03:00
  • bb68f9d27c Merge branch 'release/update-otp-elixir' into 'develop' rinpatch 2020-06-17 00:00:51 +00:00
  • 281ecd6b30 CHANGELOG.md: mention minimal elixir version update rinpatch 2020-06-17 02:29:32 +03:00
  • 55d8263c00 Update OTP releases to official images of 1.10.3 rinpatch 2020-06-17 02:27:28 +03:00
  • 97d344502f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-16 16:08:36 -05:00
  • 83e5b95102 Merge branch 'hotfix/notification-migration' into 'develop' lain 2020-06-16 21:07:04 +00:00
  • 5c0e1039ce Chunk the notification type backfill migration rinpatch 2020-06-16 23:45:59 +03:00
  • a0c0207ad6 resolve conflicts Roman Chvanikov 2020-06-16 21:55:34 +03:00
  • b536e57124 Merge branch '1866-last-status-stuff' into 'develop' Haelwenn 2020-06-16 18:10:00 +00:00
  • 39f7fc5b8e Update majic & call plug before OpenApiSpex href 2020-06-16 19:00:54 +02:00
  • b66e6eb521
    fixes for tests Alexander Strizhakov 2020-06-16 19:03:45 +03:00
  • ed189568f3
    moving mrf settings from instance to separate group Alexander Strizhakov 2020-03-21 09:47:05 +03:00
  • 3c2cee33ad
    moving custom ecto types in context folders Alexander Strizhakov 2020-06-16 17:50:33 +03:00
  • f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME href 2020-06-16 15:11:45 +02:00
  • 8bfacffabc Merge branch 'elixir-1.9' into 'develop' rinpatch 2020-06-16 13:18:29 +00:00
  • aca6a7543a Upgrade to Elixir 1.9 Steven Fuchs 2020-06-16 13:18:29 +00:00
  • 4baf5ffe73 Merge branch 'fix/1787-mogrify-args' into 'develop' lain 2020-06-16 13:17:52 +00:00
  • ec1452fd1c Pleroma.MIME: use gen_magic href 2020-05-14 21:36:31 +02:00
  • 32c6576b60
    naming Alexander Strizhakov 2020-05-31 14:42:15 +03:00
  • e1603ac8fe
    fix attemps to merge map Alexander Strizhakov 2020-05-31 13:25:04 +03:00
  • 23decaab81
    fix for updated hackney Alexander Strizhakov 2020-05-31 12:38:24 +03:00
  • 9a4fde9766
    Mogrify args as custom tuples Alexander Strizhakov 2020-05-31 10:46:02 +03:00
  • 015f9258a9 Transmogrifier: Extract user update handling tests. lain 2020-06-16 14:48:46 +02:00
  • 4733f6a337 Changelog: Add info about only_media changes. lain 2020-06-16 13:09:28 +02:00
  • 1eb6cedaad ActivityPub: When restricting to media posts, only show 'Creates'. lain 2020-06-16 13:08:27 +02:00
  • 412b13c393 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-15 12:53:44 -05:00
  • b023110799 fixed a visibility of functions Maksim Pechnikov 2020-06-15 20:47:02 +03:00
  • 0b29e1b0dc Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-15 20:22:10 +03:00
  • faba1a6e33 fix tests stwf 2020-06-15 12:25:03 -04:00
  • 1e49bfa9ac Merge branch 'merge-ogp-twitter-parsers' into 'develop' lain 2020-06-15 12:41:48 +00:00
  • e1ee8bc1da User: update_follower_count refactor. lain 2020-06-15 14:29:34 +02:00
  • 579763126f Merge branch 'develop' into issue/1855 Maksim Pechnikov 2020-06-15 15:24:55 +03:00
  • efdfc85c2d update docs Maksim Pechnikov 2020-06-15 15:24:00 +03:00
  • bd63089a63
    Fix tests Egor Kislitsyn 2020-06-15 16:20:05 +04:00
  • 58e4e3db8b
    Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers Egor Kislitsyn 2020-06-15 16:03:40 +04:00
  • 62b8c31b7a added tests Maksim Pechnikov 2020-06-15 14:55:00 +03:00
  • 1092b36500 Changelog: Add info about conversation view changes. lain 2020-06-15 12:30:11 +02:00
  • b7df7436c8 Conversations: Return last dm for conversation, not last message. lain 2020-06-15 12:27:13 +02:00
  • 43eb4144d6 Merge branch 'notifications-filtering' into 'develop' namespace-move-notification lain 2020-06-15 07:57:58 +00:00
  • 448e93ce2c Merge branch 'notifications-filtering' into 'develop' lain 2020-06-15 07:57:58 +00:00
  • e1dc36afe0 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-14 22:36:52 +03:00
  • 2e8a236cef fix invalidates media url's Maksim Pechnikov 2020-06-14 21:02:57 +03:00
  • b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page eugenijm 2020-05-18 18:46:04 +03:00
  • 405a7e9d1d Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-13 21:57:42 -05:00
  • 271ea5068f Merge branch '1851-favorites-pagination' into 'develop' rinpatch 2020-06-13 17:20:43 +00:00
  • 1d625c29a0 ControllerHelper: Always return id field. lain 2020-06-13 13:12:43 +02:00
  • 4b865bba10 Apply suggestion to lib/pleroma/web/controller_helper.ex lain 2020-06-13 10:37:15 +00:00
  • cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy href 2020-06-10 17:34:23 +02:00
  • 520367d6fd Fix atom leak in Rich Media Parser Egor Kislitsyn 2020-06-09 21:49:24 +04:00
  • f891e2b2f1 Merge branch 'release/2.0.7' into 'stable' v2.0.7 rinpatch 2020-06-13 09:07:02 +00:00