Commit Graph

  • 3aa04b81c4
    Test default "content-type" for CastAndValidate Egor Kislitsyn 2020-06-29 19:47:04 +0400
  • 344a9b28b3 Merge branch 'fix/swoosh-sendmail' into 'develop' feld 2020-06-29 15:24:39 +0000
  • 979f02ec94
    Fix CastAndValidate plug Egor Kislitsyn 2020-06-29 17:33:00 +0400
  • dc60b1ee58 updated swoosh Maksim Pechnikov 2020-06-29 16:22:54 +0300
  • 67d92ac7b7
    Remove `/statusnet/config` Egor Kislitsyn 2020-06-29 17:00:37 +0400
  • 07ff2d62f4 Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop' lain 2020-06-29 12:44:58 +0000
  • 8693e01799
    Fix warning Egor Kislitsyn 2020-06-29 16:29:51 +0400
  • 6512ef6879
    excluding attachment links from RichMedia Alexander Strizhakov 2020-06-29 15:25:57 +0300
  • 4a306720e8
    Merge branch 'develop' into remove-twitter-api Egor Kislitsyn 2020-06-29 16:09:49 +0400
  • 59540131c1 Credo fixes. lain 2020-06-29 14:09:03 +0200
  • f308196b75 Token Response: Remove empty file. lain 2020-06-29 13:52:50 +0200
  • e374872fe7 AccountOperation: Correctly describe create response. lain 2020-06-29 13:49:48 +0200
  • bb168ed94a OAuth: Extract view-type functions to a view. lain 2020-06-29 13:39:09 +0200
  • 651f269568 Merge branch 'avatar-removing' into 'develop' lain 2020-06-29 11:16:30 +0000
  • e64d08439e UpdateCredentialsTest: Add test for removing profile images. lain 2020-06-29 12:40:23 +0200
  • 8630a6c7f5 Preloaders: Use strings as keys. lain 2020-06-29 11:41:00 +0200
  • a19f8778af User preloader: Put user info at correct key lain 2020-06-29 11:06:20 +0200
  • 577da132da Merge branch '1031-parent-visible' into 'develop' lain 2020-06-29 08:39:51 +0000
  • e229640372 Merge branch 'openapi/schema-account-pleromafields' into 'develop' lain 2020-06-29 08:32:56 +0000
  • 9f51b03eed
    ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses Haelwenn (lanodan) Monnier 2020-06-29 03:31:33 +0200
  • cf1bd386c6 Merge branch 'docs/mastoapi-account-fields' into 'develop' Haelwenn 2020-06-29 00:56:02 +0000
  • efb5d64e50
    differences_in_mastoapi_responses: Update account fields Haelwenn (lanodan) Monnier 2020-06-29 02:39:26 +0200
  • 4b32bc80de Merge branch 'reduce-preloading-defaults' into 'develop' lain 2020-06-27 10:40:29 +0000
  • 0313520cd2 Config: Reduce default preloaders to configuration endpoints. lain 2020-06-27 12:18:37 +0200
  • dc31fbfe6c Merge branch 'fix/fetcher-transmogrifier-error' into 'develop' lain 2020-06-27 09:41:35 +0000
  • f89390110b
    added tab & labels for mrf policies Alexander Strizhakov 2020-06-27 12:18:34 +0300
  • ce85db41a3 Lint Mark Felder 2020-06-26 14:35:04 -0500
  • 1566543bec
    object/fetcher: Pass full Transmogrifier error Haelwenn (lanodan) Monnier 2020-06-26 20:10:47 +0200
  • 244655e884
    MastoAPI: Show source field when deleting Haelwenn (lanodan) Monnier 2020-06-26 07:16:24 +0200
  • 76313e8162 Document breaking change of hide_notification_details setting Mark Felder 2020-06-26 12:48:05 -0500
  • 69848d5c97 Rename notification "privacy_option" setting Mark Felder 2020-06-26 12:45:46 -0500
  • bf1c5e255a Merge branch 'block-handling' into 'develop' Haelwenn 2020-06-26 17:41:00 +0000
  • 09478c9cf7 Merge branch '1258-anti-link-spam-exemption' into 'develop' Haelwenn 2020-06-26 16:59:46 +0000
  • fd5e797379 Simplify notification filtering settings further Mark Felder 2020-06-26 11:24:28 -0500
  • b950fb01db Merge branch 'develop' into refactor/notification_settings Mark Felder 2020-06-26 10:23:19 -0500
  • a5bbfa21a1 StaticFE: Prioritize json in requests. lain 2020-06-26 16:27:39 +0200
  • f378e93bf4 AccountController: Return scope in proper format. lain 2020-06-26 16:15:27 +0200
  • a2002ebb63 Preloading: Fix nodeinfo url. lain 2020-06-26 14:48:23 +0200
  • 4a7a34ae8c Preloading: Return correct data for statusnet stuff. lain 2020-06-26 14:47:38 +0200
  • e7bc0273e5
    additional data to MRF policies in descriptions Alexander Strizhakov 2020-06-26 15:22:08 +0300
  • 6db9f7cdb3 Merge branch 'fix-chats' into 'develop' lain 2020-06-26 11:09:37 +0000
  • 7ed2296416 Nodeinfo: Add chat information back in. lain 2020-06-26 13:04:15 +0200
  • 15a8b70318 User: Don't unfollow on block when the relevant setting is set. lain 2020-06-26 12:06:00 +0200
  • c3383d4fab BlockValidator: Restore old behavior for incoming blocks. lain 2020-06-26 11:58:40 +0200
  • 91cd023720
    Pleroma.Upload.Filter.Mogrify args description Alexander Strizhakov 2020-06-26 09:03:07 +0300
  • 27c33f216a
    activity_draft: Add source field Haelwenn (lanodan) Monnier 2020-06-26 05:39:35 +0200
  • 7c7a6509b9 Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop' Haelwenn 2020-06-26 03:48:25 +0000
  • d6c958b4c2
    nodeinfo: Fix MRF transparency Haelwenn (lanodan) Monnier 2020-06-26 05:33:59 +0200
  • 8288419686 Merge branch 'preload-data' into 'develop' feld 2020-06-25 21:35:39 +0000
  • 2e39fbe02e Merge branch 'mastoapi-omitted' into 'develop' feld 2020-06-25 21:25:02 +0000
  • bb275c4985 Merge branch 'update/admin-fe-20200625' into 'develop' feld 2020-06-25 20:09:19 +0000
  • d9e4623628 Update AdminFE build Mark Felder 2020-06-25 14:55:00 -0500
  • 433c01b370 Merge branch 'develop' into refactor/notification_settings Mark Felder 2020-06-25 14:16:28 -0500
  • 28d4e60f66
    MastoAPI differences: Document not implemented features Alex Gleason 2020-06-25 12:32:06 -0500
  • 1d0804b49f Merge branch 'chore/remove-reference-to-distsn' into 'develop' lain 2020-06-25 10:42:57 +0000
  • 04abee782b AntiSpamLinkPolicy: Exempt local users. lain 2020-06-25 12:40:39 +0200
  • f585622f85 Apply suggestion to config/description.exs lain 2020-06-25 10:17:16 +0000
  • 1cd1977c0f Merge branch 'issue/1872-ex_aws' into 'develop' lain 2020-06-25 10:14:19 +0000
  • 84f9ca1956 Blocking: Don't federate if the options is set. lain 2020-06-25 12:03:14 +0200
  • 44bb7cfccd ActivityPub: Remove `block`. lain 2020-06-25 11:51:33 +0200
  • 8cfb58a8c0 AccountController: Extract blocking to CommonAPI. lain 2020-06-25 11:44:04 +0200
  • e38293c8f1 Transmogrifier: Switch to pipeline for Blocks. lain 2020-06-25 11:33:54 +0200
  • 89e5b2046b ObjectValidator: Basic `Block` support. lain 2020-06-25 11:13:35 +0200
  • d137f934df Transmogrifier Test: Extract block handling. lain 2020-06-25 10:54:00 +0200
  • 0e26ef2ab9 Merge branch 'fix/following-request-from-deactivated' into 'develop' lain 2020-06-25 06:50:44 +0000
  • 439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3 Maksim Pechnikov 2020-06-25 07:12:29 +0300
  • 67ab580553 Filter outstanding follower requests from deactivated accounts Mark Felder 2020-06-24 17:18:53 -0500
  • cc837f9d15 fixed config/descpiption.exs Maksim Pechnikov 2020-06-24 21:21:33 +0300
  • ae94fcc95f Merge branch 'fix-emoji-pagination' into 'develop' lain 2020-06-24 15:23:20 +0000
  • aae1af8cf1
    fix for emoji pagination in pack show Alexander Strizhakov 2020-06-24 18:06:30 +0300
  • 4c5fb831b3 Status schema: Add parent_visible. lain 2020-06-24 14:33:00 +0200
  • 1702239428 Changelog: Put info under API header. lain 2020-06-24 14:30:12 +0200
  • 79ee914bc2 Changelog: Add info about parent_visible field lain 2020-06-24 13:32:14 +0200
  • 637bae42b4 Docs: Document added parent_visible field. lain 2020-06-24 13:31:42 +0200
  • 35f6770436 StatusView: Add pleroma.parent_visible lain 2020-06-24 13:29:08 +0200
  • 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' lain 2020-06-24 10:42:07 +0000
  • 510031ece2 Merge branch 'issue/1872-updated-tzdata' into 'develop' lain 2020-06-24 09:00:17 +0000
  • 65f3eb333b Apply suggestion to test/http/tzdata_test.exs lain 2020-06-24 08:50:33 +0000
  • 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient Maksim Pechnikov 2020-06-24 09:12:32 +0300
  • b4a502fc8b Merge branch 'moving-mrf-namespace-migration-fix' into 'develop' feld 2020-06-23 18:51:37 +0000
  • 71e233268a oban 2.0-rc2 Maksim Pechnikov 2020-06-23 21:47:01 +0300
  • 98af7b59e4 Merge branch 'update-validator' into 'develop' lain 2020-06-23 18:10:33 +0000
  • 1471b70ef1 Merge develop Roman Chvanikov 2020-06-23 20:56:55 +0300
  • cb96c82f70
    moving to mrf namespace migration fix Alexander Strizhakov 2020-06-23 20:18:27 +0300
  • c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' Haelwenn 2020-06-23 16:38:27 +0000
  • 54039100fe Remove reference to defunct distsn.org Mark Felder 2020-06-23 11:17:26 -0500
  • a8d967762e migrate to oban 2.0-rc1 Maksim Pechnikov 2020-06-23 15:09:01 +0300
  • b7f297f0bd Merge branch 'issue/1798' into 'develop' lain 2020-06-23 10:54:15 +0000
  • aee815b478 ObjectValidator: Clarify type of object. lain 2020-06-23 12:37:05 +0200
  • 59e2a1018a Merge branch 'fix_1586_provide_index_md' into 'develop' lain 2020-06-23 10:06:47 +0000
  • adc199c6a8 ActivityPubControllerTest: Capture error log lain 2020-06-23 12:04:51 +0200
  • d93e01137b ActivityPubControllerTest: Testing changes. lain 2020-06-23 11:43:20 +0200
  • 2737809bbf An act of desperation. lain 2020-06-23 11:03:32 +0200
  • 2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator lain 2020-06-23 10:17:12 +0200
  • 84aa9c78dd fix tests Maksim Pechnikov 2020-06-23 09:08:24 +0300
  • 2715c40e1d added tests Maksim Pechnikov 2020-06-23 06:56:17 +0300
  • 3875a507d4 Merge branch '@doc/apc2s-upload-media' into 'develop' Haelwenn 2020-06-23 03:04:27 +0000
  • c116b6d6d6
    ActivityPubController: Update upload_media @doc Haelwenn (lanodan) Monnier 2020-06-23 04:42:44 +0200
  • d21ef5e66b Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop' Haelwenn 2020-06-23 01:55:33 +0000
  • df5e048cbb Do not need a function to provide fallback value with default defined in config.exs Mark Felder 2020-06-22 17:39:02 -0500