aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-13Add `pleroma_internal` as an internal fieldAlex Gleason
2020-05-13Synchronize suggestions with all available static/config.json settingsMark Felder
2020-05-13Sync FE static/config.jsonMark Felder
2020-05-13Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch
Translations update from Weblate See merge request pleroma/pleroma!2529
2020-05-13PleromaFE bundle supporting `with_relationships` param.Ivan Tashkinov
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49
2020-05-13[#2456] OpenAPI-related tweaks. Removed support for `with_relationships` ↵Ivan Tashkinov
param in `GET /api/v1/accounts/search`.
2020-05-13Handle bcrypt passwords for Mastodon migrationAlex Gleason
2020-05-13Add OpenAPI spec for PleromaAPI.AccountControllerEgor Kislitsyn
2020-05-13Translated using Weblate (French)Haelwenn (lanodan) Monnier
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-13Merge branch 'fix/1742-random-failing-tests' into 'develop'lain
Fix sporadically failing tests See merge request pleroma/pleroma!2524
2020-05-13[#2456] Changed `embed_relationships` param to `with_relationships`.Ivan Tashkinov
2020-05-13Fix digest mix task on OTP releasesMichael Weiss
This is based on #2191, credit belongs to @rinpatch.
2020-05-13Merge branch 'openapi/suggestions' into 'develop'lain
Add OpenAPI spec for SuggestionController See merge request pleroma/pleroma!2525
2020-05-13Add OpenAPI spec for SuggestionControllerEgor Kislitsyn
2020-05-13[#2456] Post-merge fix.Ivan Tashkinov
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-13Merge branch 'openapi/statuses' into 'develop'lain
Add OpenAPI spec for StatusController See merge request pleroma/pleroma!2521
2020-05-13Merge branch 'openapi/timelines' into 'develop'lain
Add OpenAPI spec for TimelineController See merge request pleroma/pleroma!2506
2020-05-13ignore orderAlexander Strizhakov
2020-05-13don't use async with global mocksAlexander Strizhakov
2020-05-13don't use global mocks in setup callbacksAlexander Strizhakov
2020-05-13don't run in async if tests depend on env configAlexander Strizhakov
2020-05-13correct order for publised in assertAlexander Strizhakov
2020-05-13make test fail everytimeAlexander Strizhakov
2020-05-13don't run tests which change env in asyncAlexander Strizhakov
2020-05-13{:error, :enoent} s3 fixAlexander Strizhakov
s3 tests were executed before temp file was uploaded
2020-05-13Merge branch 'upgrade-comeonin' into 'develop'lain
Upgrade Comeonin to v5 See merge request pleroma/pleroma!2523
2020-05-12Upgrade Comeonin to v5Alex Gleason
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-13Fix formatEgor Kislitsyn
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-13Add OpenAPI spec for StatusControllerEgor Kislitsyn
2020-05-12Merge branch 'fix/eldap-required' into 'develop'rinpatch
fix eldap being required for non-OTP releases See merge request pleroma/pleroma!2520
2020-05-12Filter config descriptions by config whitelistStephanie Wilde-Hobbs
2020-05-12fix eldap being required for non-OTP releasesrinpatch
2020-05-12[#2456] OpenAPI: added `embed_relationships` param definition.Ivan Tashkinov