aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-07-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
2020-07-22Merge branch 'bugfix/limiter_git_url' into 'develop'lain
2020-07-22mix.exs: Append .git to git repo URLsHaelwenn (lanodan) Monnier
2020-07-21Merge branch 'revert-2b5d9eb1' into 'develop'lain
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
2020-07-21Merge branch 'linkify' into 'develop'lain
2020-07-21Merge branch 'gopher-fix' into 'develop'lain
2020-07-21copy tmp file if test depends on itAlexander Strizhakov
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
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
2020-07-18Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is usedhref
2020-07-17Merge branch 'fix-1958' into 'develop'Haelwenn
2020-07-17OpenAPI: Add :id to follower/following endpoints, fixes #1958Alex Gleason
2020-07-17Merge branch 'feature/expose-post-formats' into 'develop'Haelwenn
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
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
2020-07-17Bug issue template: remove choice in "Installation type"rinpatch
2020-07-16Migrate :auto_linker --> Pleroma.Formatter in ConfigDBAlex Gleason
2020-07-16Formatter: Test link with local mentionAlex Gleason
2020-07-16Use updated Linkify from gitAlex Gleason
2020-07-16description.exs typofixesAlex Gleason
2020-07-16Merge remote-tracking branch 'upstream/develop' into linkifyAlex Gleason
2020-07-16Improve TOTP token and recovery input fields in OAuth loginMark Felder
2020-07-15Merge branch 'refactor/gun-pool-registry' into 'develop'feld
2020-07-15Merge branch 'develop' into refactor/gun-pool-registryMark Felder
2020-07-15Merge branch 'refactor/notification_settings' into 'develop'feld
2020-07-15Update FE bundleMark Felder
2020-07-15Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-07-15Merge branch 'features/mrf-reasons' into 'develop'rinpatch
2020-07-15Merge branch 'fix/oban-pruning' into 'develop'rinpatch
2020-07-15Merge branch 'issue/sign-authority' into 'develop'feld
2020-07-15MastoAPI: fix & test giving MRF reject reasonsHaelwenn (lanodan) Monnier
2020-07-15Bring back oban job pruningrinpatch
2020-07-15ConnectionPool.Worker: do not stop with an error when there is a timeoutrinpatch
2020-07-15Merge branch 'develop' into issue/sign-authorityMaksim Pechnikov
2020-07-15Set a default timeout for Gun adapter timeouthref
2020-07-15Don't test tls_options in adapter helper test.href
2020-07-15host is now uselesshref
2020-07-15Simplify TLS optshref
2020-07-15Go back to upstream Teslahref
2020-07-15Bump gunhref
2020-07-15parentheses...href
2020-07-15Fix race in enforcer/reclaimer starthref