Commit graph

9606 commits

Author SHA1 Message Date
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
Mark Felder
3525400eb2 Sync FE static/config.json 2020-05-13 15:57:39 -05:00
rinpatch
d7d352b869 Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma!2529
2020-05-13 16:26:34 +00:00
Haelwenn (lanodan) Monnier
5f5681282e Translated using Weblate (French)
Currently translated at 100.0% (90 of 90 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/
2020-05-13 13:38:40 +00:00
lain
da550be066 Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests

See merge request pleroma/pleroma!2524
2020-05-13 13:38:32 +00:00
lain
6706cdce65 Merge branch 'openapi/suggestions' into 'develop'
Add OpenAPI spec for SuggestionController

See merge request pleroma/pleroma!2525
2020-05-13 10:34:04 +00:00
Egor Kislitsyn
bcadbf964a
Add OpenAPI spec for SuggestionController 2020-05-13 14:15:24 +04:00
lain
156c8a5088 Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController

See merge request pleroma/pleroma!2521
2020-05-13 09:34:30 +00:00
lain
1307d6ca3c Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController

See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
Alexander Strizhakov
fbe3d3aa5f
ignore order 2020-05-13 11:38:23 +03:00
Alexander Strizhakov
2c356a4bac
don't use async with global mocks 2020-05-13 11:38:23 +03:00
Alexander Strizhakov
12635bc156
don't use global mocks in setup callbacks 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
b962b24e6f
don't run in async if tests depend on env config 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
ec27f346ee
correct order for publised in assert 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
e0944dee99
make test fail everytime 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
712055612f
don't run tests which change env in async 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
4ba913d641
{:error, :enoent} s3 fix
s3 tests were executed before temp file was uploaded
2020-05-13 11:38:21 +03:00
lain
3210e939bf Merge branch 'upgrade-comeonin' into 'develop'
Upgrade Comeonin to v5

See merge request pleroma/pleroma!2523
2020-05-13 07:45:35 +00:00
Alex Gleason
b46811a074
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
Egor Kislitsyn
79ad12064d
Fix format 2020-05-13 01:59:17 +04:00
minibikini
cb1a3e196c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:43 +00:00
minibikini
5a2333925c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:36 +00:00
minibikini
822e9c09aa Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:21 +00:00
minibikini
40646a7e0e Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:14:52 +00:00
minibikini
0bb164a3e1 Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:12:22 +00:00
minibikini
648cc0d72d Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:09:26 +00:00
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04:00
rinpatch
c74018e6a7 Merge branch 'fix/eldap-required' into 'develop'
fix eldap being required for non-OTP releases

See merge request pleroma/pleroma!2520
2020-05-12 20:20:19 +00:00
rinpatch
da2fe8920d fix eldap being required for non-OTP releases 2020-05-12 23:03:21 +03:00
rinpatch
2b18b8a263 Merge branch 'streamer-get-topic' into 'develop'
Expand and authorize streams in Streamer directly

See merge request pleroma/pleroma!2519
2020-05-12 17:02:57 +00:00
href
68cca29dcf Fix typo in test 2020-05-12 18:51:10 +02:00
rinpatch
24c8c13640 Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
ActivityPub: Fix non-federating blocks.

Closes #1757

See merge request pleroma/pleroma!2514
2020-05-12 16:45:46 +00:00
rinpatch
4cc71aad65 Merge branch '1748-remote-following-follower-count' into 'develop'
Transmogrifier: On incoming follow accept, update follow counts.

Closes #1748

See merge request pleroma/pleroma!2515
2020-05-12 16:44:58 +00:00
href
e6d8cacf2d Expand and authorize streams in Streamer directly 2020-05-12 18:04:47 +02:00
lain
fdc9ac8897 Merge branch 'otp-version-update-suggestion' into 'develop'
Startup: suggest updating OTP when the version is too low for gun

See merge request pleroma/pleroma!2518
2020-05-12 14:53:26 +00:00