aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2020-05-13Add missing nsfwCensorImage optionMark Felder
2020-05-13Add missing hideSitename settingMark Felder
2020-05-13Add hideFilteredStatuses and hideMutedPosts settingsMark Felder
2020-05-13Add greentext optionMark Felder
2020-05-13formattingOptionsEnabled no longer existsMark Felder
2020-05-13Add disableChat optionMark Felder
2020-05-13Spelling/grammarMark Felder
2020-05-13enableEmojiPicker is not a settingMark Felder
2020-05-13scopeOptionsEnabled has been replaced with minimalScopesModeMark Felder
2020-05-13Stickers setting does not existMark Felder
2020-05-13Alpha sort FE config descriptionsMark Felder
2020-05-13Synchronize suggestions with all available static/config.json settingsMark Felder
2020-05-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs
2020-05-11copy/paste fix for descriptionsAlexander Strizhakov
2020-05-10Merge branch 'shortening-modules-name' into 'develop'lain
Descriptions that module names are shortened See merge request pleroma/pleroma!2428
2020-05-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding
2020-05-08Minor grammar nitMark Felder
2020-05-08Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-05Merge branch 'openapi/validation-plug' into 'develop'rinpatch
Ignore unexpected query params and ENUM values Closes #1719 See merge request pleroma/pleroma!2468
2020-05-05Document configuration for Pleroma.Web.ApiSpec.CastAndValidateEgor Kislitsyn
2020-05-05Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-05-04Merge branch 'feature/update-labels-for-activating-settings' into 'develop'feld
Fix inconsistency in language for activating settings in description.exs Closes admin-fe#108 See merge request pleroma/pleroma!2469
2020-05-04Fix inconsistency in language for activating settingsAngelina Filippova
2020-05-04Enable strict validation mode in dev and test environmentsEgor Kislitsyn
2020-05-04Add a config option to enable strict validationEgor Kislitsyn
2020-05-01Restricted embedding of relationships where applicable (statuses / ↵Ivan Tashkinov
notifications / accounts rendering). Added support for :skip_notifications for accounts listing (index.json). Adjusted tests.
2020-05-01Made follow request notifications non-optional (removed config switch).Ivan Tashkinov
2020-04-27descriptions that module names are shortenedAlexander Strizhakov
2020-04-24Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-04-20Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-04-20Merge remote-tracking branch 'upstream/develop' into accept-deletesAlex Gleason
2020-04-20Add :reject_deletes option to SimplePolicyAlex Gleason
2020-04-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1559-follow-request-notifications # Conflicts: # CHANGELOG.md
2020-04-13[#2342] Removed description.exs entry for temporary configuration option.Ivan Tashkinov
2020-04-10Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-04-07[#1559] Support for "follow_request" notifications (configurable).Ivan Tashkinov
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-01Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses # Conflicts: # CHANGELOG.md
2020-04-01Merge branch 'gun' into 'develop'feld
Gun adapter Closes #945 See merge request pleroma/pleroma!1861
2020-04-01Ability to control the output of account/pleroma/relationship in statuses in ↵Ivan Tashkinov
order to improve the rendering performance. See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-03-30Merge branch 'develop' into gunAlexander Strizhakov
2020-03-30activities generation tasksAlexander Strizhakov
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-notifications-sending-control
2020-03-25Fixed incorrect usage of "relations" as a short form of "relationships".Ivan Tashkinov
2020-03-20Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-03-20Merge branch 'develop' into gunAlexander Strizhakov
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-16Enable Gun adapter by defaultMark Felder
We need devs to dogfood this before we merge it into the 2.1 release
2020-03-16Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov