aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-23Merge branch 'bugfix/mrf-reject-logging' into 'develop'lain
Fix #783: Make MRF reject log as info level instead of error Closes #783 See merge request pleroma/pleroma!2758
2020-07-23Merge branch 'issue/1878' into 'develop'lain
[#1878] fix reset confirmation email in admin section See merge request pleroma/pleroma!2751
2020-07-23Merge branch 'linkify' into 'develop'lain
Fix Linkify See merge request pleroma/pleroma!2792
2020-07-23added warning to use old keysMaksim Pechnikov
2020-07-22Update linkify migration tests to use config from ConfigDBAlex Gleason
2020-07-22Migration to fix malformed Pleroma.Formatter configAlex Gleason
2020-07-22Refactor require_migration/1 into a test helper functionAlex Gleason
2020-07-22Add AutolinkerToLinkify migration testAlex Gleason
2020-07-22Fix linkify ConfigDB migrationAlex Gleason
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish ↵Ivan Tashkinov
:restrict_unauthenticated. Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22Add related_policy fieldAngelina Filippova
2020-07-22Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'lain
Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777
2020-07-22added check user email for welcome emailMaksim Pechnikov
2020-07-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
2020-07-22fix sender for welcome emailMaksim Pechnikov
2020-07-22Merge branch 'bugfix/limiter_git_url' into 'develop'lain
mix.exs: Append .git to git repo URLs Closes #1980 See merge request pleroma/pleroma!2787
2020-07-22mix.exs: Append .git to git repo URLsHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980
2020-07-22Merge branch 'develop' into issue/1023Maksim Pechnikov
2020-07-22update descriptionMaksim Pechnikov
2020-07-22added testsMaksim Pechnikov
2020-07-21Document the emoji packs API fixMark Felder
2020-07-21Test that Emoji Packs can be listed when instance is not publicMark Felder
2020-07-21Skip the correct plugMark Felder
2020-07-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
This reverts merge request !2784
2020-07-21Merge branch 'revert-2b5d9eb1' into 'develop'lain
Revert "Merge branch 'linkify' into 'develop'" See merge request pleroma/pleroma!2784
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
This reverts merge request !2677
2020-07-21Merge branch 'develop' into fix/pleroma-api-emoji-packsMark Felder
2020-07-21Merge branch 'linkify' into 'develop'lain
AutoLinker --> Linkify, update to latest version See merge request pleroma/pleroma!2677
2020-07-21Merge branch 'gopher-fix' into 'develop'lain
Gopher: using atom keys in search params See merge request pleroma/pleroma!2775
2020-07-21Allow unblocking a domain via query paramsEgor Kislitsyn
2020-07-21copy tmp file if test depends on itAlexander Strizhakov
2020-07-21added welcome emailMaksim Pechnikov
2020-07-20Pleroma.Formatter can have partial updatesAlex Gleason
2020-07-20Update linkify to latest releaseAlex Gleason
2020-07-20Merge branch 'patch-1' into 'develop'Haelwenn
fix markdown rendering withing <details>; typo parent**s**_visible See merge request pleroma/pleroma!2781
2020-07-20fix markdown rendering withing <details>; typo parent**s**_visibleDym Sohin
2020-07-18Test angry face in formatter D:< #1968Alex Gleason
2020-07-18Merge branch 'fix/followredirects-hackney' into 'develop'feld
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used Closes #1966 and #1961 See merge request pleroma/pleroma!2778
2020-07-18Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is usedhref
2020-07-18Fix /api/pleroma/emoji/packs index endpoint.KokaKiwi
2020-07-17Merge branch 'fix-1958' into 'develop'Haelwenn
OpenAPI: Add :id to follower/following endpoints, fixes #1958 Closes #1958 See merge request pleroma/pleroma!2772
2020-07-17OpenAPI: Add :id to follower/following endpoints, fixes #1958Alex Gleason
2020-07-17Test that unapproved users can never log in regardless of admin settingsAlex Gleason
2020-07-17Fully delete users with status :approval_pendingAlex Gleason
2020-07-17Merge branch 'feature/expose-post-formats' into 'develop'Haelwenn
Expose the post formats in /api/v1/instance See merge request pleroma/pleroma!2776
2020-07-17Expose the post formats in /api/v1/instanceMark Felder
2020-07-17using atom keys in search paramsAlexander Strizhakov
2020-07-17Merge branch 'feature/totp-input-improvements' into 'develop'feld
Improve TOTP token and recovery input fields in OAuth login See merge request pleroma/pleroma!2769
2020-07-17TOTP length is configurable, so we can't hardcode this here.Mark Felder
2020-07-17Merge branch 'chore/issue-template-remove-tasks' into 'develop'rinpatch
Bug issue template: remove choice in "Installation type" See merge request pleroma/pleroma!2774
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 10:25:47 +0000