Commit Graph

718 Commits

Author SHA1 Message Date
lain 64b3d81e50 Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
Remove settings that shouldn't be altered

Closes admin-fe#110

See merge request pleroma/pleroma!2540
2020-05-17 07:48:52 +00:00
lain 4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships

See merge request pleroma/pleroma!2456
2020-05-17 07:26:51 +00:00
Angelina Filippova 4a925b964a Remove description of the settings that should't be altered 2020-05-16 20:39:42 +03:00
Mark Felder 54b4824186 Lint 2020-05-13 17:07:14 -05:00
Mark Felder 6f53d8815e Clarify where the Features panel is 2020-05-13 16:57:33 -05:00
Mark Felder 2560a4aa56 Formatting 2020-05-13 16:51:23 -05:00
Mark Felder 0c82a967ec Add missing showFeaturesPanel setting 2020-05-13 16:49:56 -05:00
Mark Felder 5131149056 add postContentType setting 2020-05-13 16:45:16 -05:00
Mark Felder 52a95a0265 Add missing nsfwCensorImage option 2020-05-13 16:40:04 -05:00
Mark Felder 923ab78807 Add missing hideSitename setting 2020-05-13 16:36:33 -05:00
Mark Felder c86cdb76a7 Add hideFilteredStatuses and hideMutedPosts settings 2020-05-13 16:35:12 -05:00
Mark Felder 7f00698c3b Add greentext option 2020-05-13 16:32:38 -05:00
Mark Felder 38fb5eaf6a formattingOptionsEnabled no longer exists 2020-05-13 16:31:15 -05:00
Mark Felder 4bdde143f9 Add disableChat option 2020-05-13 16:30:24 -05:00
Mark Felder 2420d7f439 Spelling/grammar 2020-05-13 16:26:49 -05:00
Mark Felder 4aad764c1d enableEmojiPicker is not a setting 2020-05-13 16:24:37 -05:00
Mark Felder 2e28b50132 scopeOptionsEnabled has been replaced with minimalScopesMode 2020-05-13 16:23:42 -05:00
Mark Felder e2c80e62f1 Stickers setting does not exist 2020-05-13 16:19:17 -05:00
Mark Felder 1e48aee50e Alpha sort FE config descriptions 2020-05-13 16:18:26 -05:00
Mark Felder 1b93581162 Synchronize suggestions with all available static/config.json settings 2020-05-13 16:03:42 -05:00
Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into 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-13 12:42:36 +03:00
Alexander Strizhakov da6a38d205
copy/paste fix for descriptions 2020-05-11 09:35:20 +03:00
lain 7ca83e71a9 Merge branch 'shortening-modules-name' into 'develop'
Descriptions that module names are shortened

See merge request pleroma/pleroma!2428
2020-05-10 09:05:22 +00:00
Ivan Tashkinov b0d0d8f91b Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 2020-05-10 09:17:16 +03:00
Mark Felder c9344b5f2d Minor grammar nit 2020-05-08 14:36:59 -05:00
Ivan Tashkinov b2924ab1fb Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 2020-05-08 21:37:55 +03:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
rinpatch 5482a1f6ef Merge branch 'openapi/validation-plug' into 'develop'
Ignore unexpected query params and ENUM values

Closes #1719

See merge request pleroma/pleroma!2468
2020-05-05 12:08:58 +00:00
Egor Kislitsyn cc922e7d8c
Document configuration for Pleroma.Web.ApiSpec.CastAndValidate 2020-05-05 15:01:33 +04:00
feld b1c29e2de8 Merge branch 'feature/update-labels-for-activating-settings' into 'develop'
Fix inconsistency in language for activating settings in description.exs

Closes admin-fe#108

See merge request pleroma/pleroma!2469
2020-05-04 20:24:08 +00:00
Angelina Filippova 2ab52d5224 Fix inconsistency in language for activating settings 2020-05-04 22:41:14 +03:00
Egor Kislitsyn 1cb89aac1e
Enable strict validation mode in dev and test environments 2020-05-04 22:35:28 +04:00
Egor Kislitsyn f070b5569c
Add a config option to enable strict validation 2020-05-04 22:33:05 +04:00
Ivan Tashkinov d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
2020-05-01 18:45:24 +03:00
Ivan Tashkinov 92efb888c7 Made follow request notifications non-optional (removed config switch). 2020-05-01 09:51:41 +03:00
Alexander Strizhakov 66acfa6882
descriptions that module names are shortened 2020-04-27 10:28:05 +03:00
Alex Gleason bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
Alex Gleason b54c8813d6
Add :reject_deletes option to SimplePolicy 2020-04-20 10:11:06 -05:00
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
#	CHANGELOG.md
2020-04-17 16:23:58 +03:00
Ivan Tashkinov 5c76afb06c [#2342] Removed description.exs entry for temporary configuration option. 2020-04-13 15:38:50 +03:00
Ivan Tashkinov 1a4875adfa [#1559] Support for "follow_request" notifications (configurable).
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
Ivan Tashkinov 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
#	CHANGELOG.md
2020-04-01 20:08:14 +03:00
feld ef7d2b0f11 Merge branch 'gun' into 'develop'
Gun adapter

Closes #945

See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
Alexander Strizhakov eb9744cade
activities generation tasks 2020-03-30 11:42:25 +03:00
Ivan Tashkinov 012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control 2020-03-25 09:05:17 +03:00
Ivan Tashkinov e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships". 2020-03-25 09:04:00 +03:00
Alexander Strizhakov 9bae9b1b1b
Merge branch 'develop' into gun 2020-03-20 20:47:54 +03:00
Alexander Strizhakov fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00