Commit Graph

  • 84f9ca1956 Blocking: Don't federate if the options is set. lain 2020-06-25 12:03:14 +02:00
  • 44bb7cfccd ActivityPub: Remove block. lain 2020-06-25 11:51:33 +02:00
  • 8cfb58a8c0 AccountController: Extract blocking to CommonAPI. lain 2020-06-25 11:44:04 +02:00
  • e38293c8f1 Transmogrifier: Switch to pipeline for Blocks. lain 2020-06-25 11:33:54 +02:00
  • 89e5b2046b ObjectValidator: Basic Block support. lain 2020-06-25 11:13:35 +02:00
  • d137f934df Transmogrifier Test: Extract block handling. lain 2020-06-25 10:54:00 +02:00
  • 0e26ef2ab9 Merge branch 'fix/following-request-from-deactivated' into 'develop' lain 2020-06-25 06:50:44 +00:00
  • 439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3 Maksim Pechnikov 2020-06-25 07:12:29 +03:00
  • 67ab580553 Filter outstanding follower requests from deactivated accounts Mark Felder 2020-06-24 17:18:53 -05:00
  • 8197d16b1c remove unneeded and clean up Your New SJW Waifu 2020-06-24 13:38:32 -05:00
  • cc837f9d15 fixed config/descpiption.exs Maksim Pechnikov 2020-06-24 21:21:33 +03:00
  • 897c627a95 Update AntiHellthreadPolicy for new MRF Your New SJW Waifu 2020-06-24 12:58:04 -05:00
  • f93ac84c51 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-24 12:18:44 -05:00
  • ae94fcc95f Merge branch 'fix-emoji-pagination' into 'develop' lain 2020-06-24 15:23:20 +00:00
  • aae1af8cf1
    fix for emoji pagination in pack show Alexander Strizhakov 2020-06-24 18:06:30 +03:00
  • 4c5fb831b3 Status schema: Add parent_visible. lain 2020-06-24 14:33:00 +02:00
  • 1702239428 Changelog: Put info under API header. lain 2020-06-24 14:30:12 +02:00
  • 79ee914bc2 Changelog: Add info about parent_visible field lain 2020-06-24 13:32:14 +02:00
  • 637bae42b4 Docs: Document added parent_visible field. lain 2020-06-24 13:31:42 +02:00
  • 35f6770436 StatusView: Add pleroma.parent_visible lain 2020-06-24 13:29:08 +02:00
  • 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' lain 2020-06-24 10:42:07 +00:00
  • 510031ece2 Merge branch 'issue/1872-updated-tzdata' into 'develop' lain 2020-06-24 09:00:17 +00:00
  • 65f3eb333b Apply suggestion to test/http/tzdata_test.exs lain 2020-06-24 08:50:33 +00:00
  • 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient Maksim Pechnikov 2020-06-24 09:12:32 +03:00
  • 22014de692 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-23 16:20:01 -05:00
  • b4a502fc8b Merge branch 'moving-mrf-namespace-migration-fix' into 'develop' feld 2020-06-23 18:51:37 +00:00
  • 71e233268a oban 2.0-rc2 Maksim Pechnikov 2020-06-23 21:47:01 +03:00
  • 98af7b59e4 Merge branch 'update-validator' into 'develop' lain 2020-06-23 18:10:33 +00:00
  • 1471b70ef1 Merge develop Roman Chvanikov 2020-06-23 20:56:55 +03:00
  • ccf5442d14 Merge develop Roman Chvanikov 2020-06-23 20:55:14 +03:00
  • cb96c82f70
    moving to mrf namespace migration fix Alexander Strizhakov 2020-06-23 20:18:27 +03:00
  • c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' Haelwenn 2020-06-23 16:38:27 +00:00
  • 54039100fe Remove reference to defunct distsn.org Mark Felder 2020-06-23 11:17:26 -05:00
  • a8d967762e migrate to oban 2.0-rc1 Maksim Pechnikov 2020-06-23 15:09:01 +03:00
  • 9357c4ea4e Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-23 06:12:05 -05:00
  • b7f297f0bd Merge branch 'issue/1798' into 'develop' lain 2020-06-23 10:54:15 +00:00
  • aee815b478 ObjectValidator: Clarify type of object. lain 2020-06-23 12:37:05 +02:00
  • 59e2a1018a Merge branch 'fix_1586_provide_index_md' into 'develop' lain 2020-06-23 10:06:47 +00:00
  • adc199c6a8 ActivityPubControllerTest: Capture error log lain 2020-06-23 12:04:51 +02:00
  • d93e01137b ActivityPubControllerTest: Testing changes. lain 2020-06-23 11:43:20 +02:00
  • 2737809bbf An act of desperation. lain 2020-06-23 11:03:32 +02:00
  • 2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator lain 2020-06-23 10:17:12 +02:00
  • 84aa9c78dd fix tests Maksim Pechnikov 2020-06-23 09:08:24 +03:00
  • 2715c40e1d added tests Maksim Pechnikov 2020-06-23 06:56:17 +03:00
  • 3875a507d4 Merge branch '@doc/apc2s-upload-media' into 'develop' Haelwenn 2020-06-23 03:04:27 +00:00
  • c116b6d6d6
    ActivityPubController: Update upload_media @doc Haelwenn (lanodan) Monnier 2020-06-23 04:42:44 +02:00
  • d21ef5e66b Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop' Haelwenn 2020-06-23 01:55:33 +00:00
  • df5e048cbb Do not need a function to provide fallback value with default defined in config.exs Mark Felder 2020-06-22 17:39:02 -05:00
  • bf8310f380 Add missing default config value for :instance, instance_thumbnail Mark Felder 2020-06-22 17:35:02 -05:00
  • 98f014d3be Merge branch 'warning/mastofe-settings-blob' into 'develop' Haelwenn 2020-06-22 21:59:21 +00:00
  • 8f6ba4b22f
    Add warning against parsing/reusing MastoFE settings blob Haelwenn (lanodan) Monnier 2020-06-22 23:45:29 +02:00
  • 32dc19873d Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-22 14:21:06 -05:00
  • 46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop' lain 2020-06-22 15:40:09 +00:00
  • b3a549e916
    Update NotificationOperation spec Egor Kislitsyn 2020-06-22 19:18:33 +04:00
  • 7e6f43c0d7
    Add is_muted to notifications Egor Kislitsyn 2020-06-22 19:03:04 +04:00
  • b0a40fc2e4 added verify RUM settings before start app Maksim Pechnikov 2020-06-22 17:27:49 +03:00
  • 7a56664ffa Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-22 16:45:28 +03:00
  • 59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop' lain 2020-06-22 12:37:10 +00:00
  • 31489bc864 Merge branch 'docs_use_include_for_install_further_reading' into 'develop' lain 2020-06-22 12:35:00 +00:00
  • 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop' lain 2020-06-22 12:25:12 +00:00
  • a0762fd5ea Merge branch 'weblate-pleroma-pleroma' into 'develop' lain 2020-06-22 12:23:45 +00:00
  • 499324f7be Removed a space that was too much Ilja 2020-06-22 14:22:23 +02:00
  • 1e089cdf29 I forgot to git add some files, oops (should be squashed with MR) Ilja 2020-06-22 14:18:55 +02:00
  • a3b10a4f64 Fix 1586 Docs: provide a index.md Ilja 2020-06-22 14:13:30 +02:00
  • b05f795326 Credo fixes lain 2020-06-22 14:02:29 +02:00
  • e785cd5cae ActivityPub: Remove update and switch to pipeline. lain 2020-06-22 13:59:45 +02:00
  • 68c812eb2e Translated using Weblate (Italian) Ben Is 2020-06-19 14:35:01 +00:00
  • 4f5af68b3e Added translation using Weblate (Italian) Ben Is 2020-06-19 14:33:58 +00:00
  • c75ba63bef Merge branch '1865-media-only' into 'develop' rinpatch 2020-06-22 11:34:07 +00:00
  • 1e7ca24430 Update Handling Test: Fix for re-used update ids. lain 2020-06-22 13:23:21 +02:00
  • 9438f83f83 Transmogrifier: Handle Update with the pipeline. lain 2020-06-22 13:16:05 +02:00
  • 31a4d42ce0 SideEffects: Handle user updating. lain 2020-06-22 13:15:37 +02:00
  • 282f492cd5 Merge branch '1883-mrf-chat' into 'develop' rinpatch 2020-06-22 10:00:13 +00:00
  • 9f7ee5dfa2 Add include for the "Further reading" section Ilja 2020-06-22 11:41:22 +02:00
  • 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop' lain 2020-06-22 08:41:09 +00:00
  • 35e9282ffd HellthreadPolicy: Restrict to Notes and Articles. lain 2020-06-22 10:35:11 +02:00
  • a433675949 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-22 08:37:39 +03:00
  • c6952144d4 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-20 14:54:11 -05:00
  • 6efd3730c3 Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop' lain 2020-06-20 16:22:01 +00:00
  • fb8775538b Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-20 18:47:10 +03:00
  • d6849b82a2 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-20 08:29:14 -05:00
  • b5f13af7ba Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex Alexander Strizhakov 2020-06-20 10:59:08 +00:00
  • c5863438ba
    proper error codes for error in adminFE Alexander Strizhakov 2020-06-20 13:53:57 +03:00
  • 31761340fe Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop' lain 2020-06-20 09:57:12 +00:00
  • 50d0c58003 Merge branch 'docs/attachment_links' into 'develop' lain 2020-06-20 09:56:04 +00:00
  • 6f6ccfccca Merge branch 'cleanup/object-conversation' into 'develop' lain 2020-06-20 09:45:01 +00:00
  • 0e789bc55f Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex lain 2020-06-20 09:39:50 +00:00
  • 15ba539258
    cheatsheet.md: no_attachment_links → attachment_links Haelwenn (lanodan) Monnier 2020-06-20 11:39:06 +02:00
  • 4cb7b1ebc6 Apply suggestion to lib/mix/tasks/pleroma/config.ex lain 2020-06-20 09:34:34 +00:00
  • 7d542450b1 Merge branch 'develop' into '1865-media-only' lain 2020-06-20 09:33:18 +00:00
  • 1a704e1f1e
    fix for packs pagination Alexander Strizhakov 2020-06-20 10:56:28 +03:00
  • 3d4cfc9c5f
    Stop filling conversation field on incoming objects (legacy, unused) Haelwenn (lanodan) Monnier 2020-06-18 19:32:03 +02:00
  • f928267773 Merge branch 'issue/1855' into 'develop' feld 2020-06-19 20:38:22 +00:00
  • ae48af5905 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-06-19 23:13:56 +03:00
  • ac0344dd24
    Only accounts with Service actor_type are considered as bots Sergey Suprunenko 2020-06-19 21:19:00 +02:00
  • b63646169d
    Add support for bot field in update_credentials Sergey Suprunenko 2020-06-19 21:18:07 +02:00
  • 303b8aca21 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-06-19 13:29:35 -05:00
  • 75670a99e4 UpdateValidator: Only allow updates from the user themselves. lain 2020-06-19 16:38:57 +02:00
  • 436bb0cd12 Merge branch 'add-troubleshooting-info' into 'develop' lain 2020-06-19 14:26:43 +00:00
  • d54b0432ea README: Add some troubleshooting info for compilation issues. lain 2020-06-19 15:49:34 +02:00