Commit graph

  • e455ca3f3e Merge branch 'feature/database-configuration-whitelist' into 'develop' rinpatch 2020-05-14 16:07:37 +0000
  • 80308c5c26
    Add config migration disclaimer to config whitelist documentation Stephanie Wilde-Hobbs 2020-05-14 15:56:14 +0100
  • 4157c459b8 Merge branch 'bcrypt-auth' into 'develop' lain 2020-05-14 14:36:56 +0000
  • 5b0f27d23d
    Pbkdf2.verify_pass --> AuthenticationPlug.checkpw Alex Gleason 2020-05-14 08:42:27 -0500
  • bb03dfdb03
    Do not require description in update action Egor Kislitsyn 2020-05-14 16:29:32 +0400
  • 0f885b4b86
    Fix OpenAPI spec Egor Kislitsyn 2020-05-14 16:18:30 +0400
  • 3eff542678
    Add Changelog entry Stephanie Wilde-Hobbs 2020-05-14 12:36:49 +0100
  • 20cbfb5cb5
    Allow whitelisting whole groups Stephanie Wilde-Hobbs 2020-05-14 12:34:46 +0100
  • 3342846ac2 ChatView: Add update_at field. lain 2020-05-14 13:20:28 +0200
  • 5c6f575315
    Style fixes Steph 2020-05-14 09:50:53 +0000
  • 099e314a1b
    Add OpenAPISpex for MediaController Haelwenn (lanodan) Monnier 2020-05-14 10:50:12 +0200
  • a2a8c8e9e0 Merge branch 'features/openrc-console' into 'develop' lain 2020-05-14 09:27:33 +0000
  • 39ec1af993 Merge branch 'openapi/pleroma-api/accounts' into 'develop' lain 2020-05-14 09:25:18 +0000
  • 41db52729e Apply suggestion to docs/configuration/storing_remote_media.md lain 2020-05-14 09:14:59 +0000
  • 359d7b0a6d Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex lain 2020-05-14 09:09:11 +0000
  • 1c2629328d Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex lain 2020-05-14 09:07:09 +0000
  • 4134bfbbb2 Merge branch 'pleroma_internal' into 'develop' lain 2020-05-14 08:22:53 +0000
  • cb363f0183
    MastodonAPI: /api/v2/media endpoints Haelwenn (lanodan) Monnier 2020-04-29 17:38:14 +0200
  • e688d4ee69
    MRF.StealEmojiPolicy: New Policy Haelwenn (lanodan) Monnier 2020-04-14 18:59:04 +0200
  • 54b4824186 Lint Mark Felder 2020-05-13 17:07:14 -0500
  • 6f53d8815e Clarify where the Features panel is Mark Felder 2020-05-13 16:57:33 -0500
  • 2560a4aa56 Formatting Mark Felder 2020-05-13 16:51:23 -0500
  • 0c82a967ec Add missing showFeaturesPanel setting Mark Felder 2020-05-13 16:49:56 -0500
  • 5131149056 add postContentType setting Mark Felder 2020-05-13 16:45:16 -0500
  • 52a95a0265 Add missing nsfwCensorImage option Mark Felder 2020-05-13 16:40:04 -0500
  • 923ab78807 Add missing hideSitename setting Mark Felder 2020-05-13 16:36:33 -0500
  • c86cdb76a7 Add hideFilteredStatuses and hideMutedPosts settings Mark Felder 2020-05-13 16:35:12 -0500
  • 7f00698c3b Add greentext option Mark Felder 2020-05-13 16:32:38 -0500
  • 38fb5eaf6a formattingOptionsEnabled no longer exists Mark Felder 2020-05-13 16:31:15 -0500
  • 4bdde143f9 Add disableChat option Mark Felder 2020-05-13 16:30:24 -0500
  • 2420d7f439 Spelling/grammar Mark Felder 2020-05-13 16:26:49 -0500
  • 4aad764c1d enableEmojiPicker is not a setting Mark Felder 2020-05-13 16:24:37 -0500
  • 2e28b50132 scopeOptionsEnabled has been replaced with minimalScopesMode Mark Felder 2020-05-13 16:23:42 -0500
  • e2c80e62f1 Stickers setting does not exist Mark Felder 2020-05-13 16:19:17 -0500
  • 1e48aee50e Alpha sort FE config descriptions Mark Felder 2020-05-13 16:18:26 -0500
  • 249e009c5e
    Add pleroma_internal as an internal field Alex Gleason 2020-05-13 16:14:24 -0500
  • 1b93581162 Synchronize suggestions with all available static/config.json settings Mark Felder 2020-05-13 16:03:42 -0500
  • 3525400eb2 Sync FE static/config.json Mark Felder 2020-05-13 15:57:39 -0500
  • 8a383707ae Merge develop Roman Chvanikov 2020-05-13 19:56:40 +0300
  • d7d352b869 Merge branch 'weblate-pleroma-pleroma' into 'develop' rinpatch 2020-05-13 16:26:34 +0000
  • 74912dd9ee PleromaFE bundle supporting with_relationships param. https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49 Ivan Tashkinov 2020-05-13 19:20:21 +0300
  • 8062d590dd [#2456] OpenAPI-related tweaks. Removed support for with_relationships param in GET /api/v1/accounts/search. Ivan Tashkinov 2020-05-13 18:56:45 +0300
  • 9cbf17d59f
    Handle bcrypt passwords for Mastodon migration Alex Gleason 2020-05-12 16:57:01 -0500
  • 6802dc28ba
    Add OpenAPI spec for PleromaAPI.AccountController Egor Kislitsyn 2020-05-13 19:06:25 +0400
  • 5f5681282e Translated using Weblate (French) Haelwenn (lanodan) Monnier 2020-05-11 23:08:20 +0000
  • da550be066 Merge branch 'fix/1742-random-failing-tests' into 'develop' lain 2020-05-13 13:38:32 +0000
  • 0f0acc740d Chat: Allow posting without content if an attachment is present. lain 2020-05-13 15:31:28 +0200
  • 59b6d5f2aa [#2456] Changed embed_relationships param to with_relationships. Ivan Tashkinov 2020-05-13 15:08:07 +0300
  • 06cad239e5 InstanceView: Add pleroma chat messages to nodeinfo lain 2020-05-13 14:05:22 +0200
  • ae3b0b4c0d
    Fix digest mix task on OTP releases Michael Weiss 2020-05-13 13:08:10 +0200
  • 3cff4e24cd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-13 12:44:16 +0200
  • 6706cdce65 Merge branch 'openapi/suggestions' into 'develop' lain 2020-05-13 10:34:04 +0000
  • bcadbf964a
    Add OpenAPI spec for SuggestionController Egor Kislitsyn 2020-05-13 14:15:24 +0400
  • 33b798425f [#2456] Post-merge fix. Ivan Tashkinov 2020-05-13 12:50:52 +0300
  • fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding Ivan Tashkinov 2020-05-13 12:42:36 +0300
  • 156c8a5088 Merge branch 'openapi/statuses' into 'develop' lain 2020-05-13 09:34:30 +0000
  • 1307d6ca3c Merge branch 'openapi/timelines' into 'develop' lain 2020-05-13 09:33:37 +0000
  • fbe3d3aa5f
    ignore order Alexander Strizhakov 2020-05-13 10:17:47 +0300
  • 2c356a4bac
    don't use async with global mocks Alexander Strizhakov 2020-05-13 09:29:41 +0300
  • 12635bc156
    don't use global mocks in setup callbacks Alexander Strizhakov 2020-05-13 09:20:25 +0300
  • b962b24e6f
    don't run in async if tests depend on env config Alexander Strizhakov 2020-05-13 08:00:17 +0300
  • ec27f346ee
    correct order for publised in assert Alexander Strizhakov 2020-05-12 12:12:10 +0300
  • e0944dee99
    make test fail everytime Alexander Strizhakov 2020-05-11 15:22:52 +0300
  • 712055612f
    don't run tests which change env in async Alexander Strizhakov 2020-05-11 15:07:05 +0300
  • 4ba913d641
    {:error, :enoent} s3 fix Alexander Strizhakov 2020-05-08 18:51:16 +0300
  • a5ccb5b0b1 Merge branch 'release/2.0.5' into 'stable' lain 2020-05-13 08:12:09 +0000
  • 3210e939bf Merge branch 'upgrade-comeonin' into 'develop' lain 2020-05-13 07:45:35 +0000
  • b46811a074
    Upgrade Comeonin to v5 https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md Alex Gleason 2020-05-12 16:42:24 -0500
  • 79ad12064d
    Fix format Egor Kislitsyn 2020-05-13 01:59:17 +0400
  • 2906cbbd40 mix.exs: bump to 2.0.5 rinpatch 2020-05-13 00:08:36 +0300
  • 6430df851d CHANGELOG.md: add 2.0.5 entry rinpatch 2020-05-13 00:08:07 +0300
  • 3f13437a9c User: Truncate bios when updating a remote user. lain 2020-05-11 12:50:25 +0200
  • 3a63f84c45 pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7 rinpatch 2020-05-12 23:09:44 +0300
  • a8abf1ada6 ActivityPub: Fix non-federating blocks. lain 2020-05-12 10:52:46 +0200
  • cb1a3e196c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:23:43 +0000
  • 5a2333925c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:23:36 +0000
  • 822e9c09aa Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:23:21 +0000
  • 40646a7e0e Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:14:52 +0000
  • 0bb164a3e1 Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:12:22 +0000
  • 648cc0d72d Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:09:26 +0000
  • 7803a85d2c
    Add OpenAPI spec for StatusController Egor Kislitsyn 2020-05-12 23:59:26 +0400
  • c74018e6a7 Merge branch 'fix/eldap-required' into 'develop' rinpatch 2020-05-12 20:20:19 +0000
  • a2fcfc78c9
    Filter config descriptions by config whitelist Stephanie Wilde-Hobbs 2020-05-12 21:07:33 +0100
  • ec5e057802 Transmogrifier: On incoming follow accept, update follow counts. lain 2020-05-12 12:29:37 +0200
  • b5b675fa14 fix eldap being required for non-OTP releases rinpatch 2020-05-12 23:03:21 +0300
  • da2fe8920d fix eldap being required for non-OTP releases rinpatch 2020-05-12 23:03:21 +0300
  • 40d0775c7f Reorder alias href 2020-05-12 21:27:54 +0200
  • 37c2deb3dd Expand and authorize streams in Streamer directly (backport from !2519) href 2020-05-12 21:06:23 +0200
  • bfb48e3db6 [#2456] OpenAPI: added embed_relationships param definition. Ivan Tashkinov 2020-05-12 20:55:01 +0300
  • 2b18b8a263 Merge branch 'streamer-get-topic' into 'develop' rinpatch 2020-05-12 17:02:57 +0000
  • 68cca29dcf Fix typo in test href 2020-05-12 18:51:10 +0200
  • 24c8c13640 Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop' rinpatch 2020-05-12 16:45:46 +0000
  • 4cc71aad65 Merge branch '1748-remote-following-follower-count' into 'develop' rinpatch 2020-05-12 16:44:58 +0000
  • 63a1a82f38 [#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching. Ivan Tashkinov 2020-05-12 19:14:35 +0300
  • 620247a015
    Add database configuration whitelist Stephanie Wilde-Hobbs 2020-05-12 17:12:27 +0100
  • e6d8cacf2d Expand and authorize streams in Streamer directly href 2020-05-12 18:04:47 +0200
  • fdc9ac8897 Merge branch 'otp-version-update-suggestion' into 'develop' lain 2020-05-12 14:53:26 +0000
  • c0ea5c60e4 ChatController: Don't return chats for user you've blocked. lain 2020-05-12 16:43:04 +0200
  • be5d0a9bde Merge branch '1020-honk-announces' into 'develop' lain 2020-05-12 14:35:51 +0000
  • 8308611279 Startup: suggest updating OTP when the version is too low for gun rinpatch 2020-05-12 17:30:39 +0300