lain
|
41db52729e
|
Apply suggestion to docs/configuration/storing_remote_media.md
|
2020-05-14 09:14:59 +00:00 |
|
lain
|
359d7b0a6d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
|
2020-05-14 09:09:11 +00:00 |
|
lain
|
1c2629328d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
|
2020-05-14 09:07:09 +00:00 |
|
lain
|
4134bfbbb2
|
Merge branch 'pleroma_internal' into 'develop'
Add `pleroma_internal` as an internal field
See merge request pleroma/pleroma!2533
|
2020-05-14 08:22:53 +00:00 |
|
Haelwenn (lanodan) Monnier
|
cb363f0183
|
MastodonAPI: /api/v2/media endpoints
|
2020-05-14 10:14:28 +02:00 |
|
Haelwenn (lanodan) Monnier
|
e688d4ee69
|
MRF.StealEmojiPolicy: New Policy
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
|
2020-05-14 09:59:56 +02: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 |
|
Alex Gleason
|
249e009c5e
|
Add pleroma_internal as an internal field
|
2020-05-13 16:14:24 -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 |
|
Ivan Tashkinov
|
74912dd9ee
|
PleromaFE bundle supporting with_relationships param.
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49
|
2020-05-13 19:20:21 +03:00 |
|
Ivan Tashkinov
|
8062d590dd
|
[#2456] OpenAPI-related tweaks. Removed support for with_relationships param in GET /api/v1/accounts/search.
|
2020-05-13 18:56:45 +03:00 |
|
Alex Gleason
|
9cbf17d59f
|
Handle bcrypt passwords for Mastodon migration
|
2020-05-13 10:53:56 -05:00 |
|
Egor Kislitsyn
|
6802dc28ba
|
Add OpenAPI spec for PleromaAPI.AccountController
|
2020-05-13 19:06:46 +04: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 |
|
Ivan Tashkinov
|
59b6d5f2aa
|
[#2456] Changed embed_relationships param to with_relationships.
|
2020-05-13 15:08:07 +03:00 |
|
Michael Weiss
|
ae3b0b4c0d
|
Fix digest mix task on OTP releases
This is based on #2191, credit belongs to @rinpatch.
|
2020-05-13 13:34:03 +02: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 |
|
Ivan Tashkinov
|
33b798425f
|
[#2456] Post-merge fix.
|
2020-05-13 12:50:52 +03: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 |
|
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 |
|