summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-19operation use helper function for empty objectfix/1650-domain-mutesAlexander Strizhakov
2020-05-19markdown and specsAlexander Strizhakov
2020-05-18changelog and docs updateAlexander Strizhakov
2020-05-18adding domain mutesAlexander Strizhakov
2020-05-18Merge branch '1763-password-updates' into 'develop'rinpatch
Authentication Plug: Update bcrypt password on login. Closes #1763 See merge request pleroma/pleroma!2542
2020-05-17Pleroma Authenticator: Also update passwords here.lain
2020-05-17AuthenticationPlug: Also update crypt passwords.lain
2020-05-17Authentication Plug: Update bcrypt password on login.lain
2020-05-17Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
Translations update from Weblate See merge request pleroma/pleroma!2535
2020-05-17Translated using Weblate (Polish)Jędrzej Tomaszewski
Currently translated at 65.0% (69 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-17Added translation using Weblate (Dutch)Fristi
2020-05-17Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'lain
Remove settings that shouldn't be altered Closes admin-fe#110 See merge request pleroma/pleroma!2540
2020-05-17Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'lain
PleromaFE bundle supporting `with_relationships` param See merge request pleroma/pleroma!2530
2020-05-17Merge branch 'restricted-relations-embedding' into 'develop'lain
Restricted support for embedded relationships See merge request pleroma/pleroma!2456
2020-05-16Remove description of the settings that should't be alteredAngelina Filippova
2020-05-16Merge branch 'features/mastoapi_v2_media' into 'develop'lain
MastodonAPI: /api/v2/media endpoints See merge request pleroma/pleroma!2439
2020-05-16Merge branch '1757-fix-unblocks-too' into 'develop'rinpatch
CommonAPI: Unblock a user even if we don't have an activity. Closes #1757 See merge request pleroma/pleroma!2538
2020-05-16CommonAPI: Unblock a user even if we don't have an activity.lain
2020-05-15Merge branch 'chore/update-fe-settings-and-docs' into 'develop'lain
Synchronize PleromaFE settings See merge request pleroma/pleroma!2532
2020-05-15Merge branch 'fix/digest-task-otp' into 'develop'lain
Fix digest mix task on OTP releases See merge request pleroma/pleroma!2526
2020-05-15Merge branch 'fix/database-config' into 'develop'lain
Returning partial chain Closes #1772 See merge request pleroma/pleroma!2537
2020-05-15returning partial chainAlexander Strizhakov
2020-05-15Merge branch 'openapi/nullable-request-fields' into 'develop'rinpatch
[OpenAPI] Mark all not required request fields as nullable Closes #1761 See merge request pleroma/pleroma!2536
2020-05-15[OpenAPI] Mark all not required request fields as nullableEgor Kislitsyn
2020-05-15Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch
Translations update from Weblate See merge request pleroma/pleroma!2531
2020-05-14Translated using Weblate (Polish)Michał Sidor
Currently translated at 61.3% (65 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14Translated using Weblate (Polish)Michał Sidor
Currently translated at 55.6% (59 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14Added translation using Weblate (Polish)Michał Sidor
2020-05-14Merge branch 'feature/database-configuration-whitelist' into 'develop'rinpatch
Database configuration whitelist See merge request pleroma/pleroma!2522
2020-05-14Add config migration disclaimer to config whitelist documentationStephanie Wilde-Hobbs
2020-05-14Merge branch 'bcrypt-auth' into 'develop'lain
Handle bcrypt passwords for Mastodon migration See merge request pleroma/pleroma!2527
2020-05-14Pbkdf2.verify_pass --> AuthenticationPlug.checkpwAlex Gleason
2020-05-14Do not require `description` in `update` actionEgor Kislitsyn
2020-05-14Fix OpenAPI specEgor Kislitsyn
2020-05-14Add Changelog entryStephanie Wilde-Hobbs
2020-05-14Allow whitelisting whole groupsStephanie Wilde-Hobbs
2020-05-14Style fixesSteph
2020-05-14Add OpenAPISpex for MediaControllerHaelwenn (lanodan) Monnier
2020-05-14Merge branch 'features/openrc-console' into 'develop'lain
init.d/pleroma: Add option to attach an elixir console See merge request pleroma/pleroma!1704
2020-05-14Merge branch 'openapi/pleroma-api/accounts' into 'develop'lain
Add OpenAPI spec for PleromaAPI.AccountController See merge request pleroma/pleroma!2528
2020-05-14Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14Merge branch 'pleroma_internal' into 'develop'lain
Add `pleroma_internal` as an internal field See merge request pleroma/pleroma!2533
2020-05-14MastodonAPI: /api/v2/media endpointsHaelwenn (lanodan) Monnier
2020-05-13LintMark Felder
2020-05-13Clarify where the Features panel isMark Felder
2020-05-13FormattingMark Felder
2020-05-13Add missing showFeaturesPanel settingMark Felder
2020-05-13add postContentType settingMark Felder
2020-05-13Add missing nsfwCensorImage optionMark Felder