summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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-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
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-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
2020-07-17Bug issue template: remove choice in "Installation type"rinpatch
It made gitlab display "1 of 2 tasks completed" when one is chosen, which is totally not what this was used for.
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
Refactor gun pooling and simplify adapter option insertion Closes #1834, #1700, and #1680 See merge request pleroma/pleroma!2479
2020-07-15Merge branch 'develop' into refactor/gun-pool-registryMark Felder
2020-07-15Merge branch 'refactor/notification_settings' into 'develop'feld
Refactor notification settings See merge request pleroma/pleroma!2602
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
Add rejection reason to our MRFs See merge request pleroma/pleroma!2759
2020-07-15Merge branch 'fix/oban-pruning' into 'develop'rinpatch
Bring back oban job pruning Closes #1945 See merge request pleroma/pleroma!2768
2020-07-15Merge branch 'issue/sign-authority' into 'develop'feld
Include port in host for signatures See merge request pleroma/pleroma!2766
2020-07-15MastoAPI: fix & test giving MRF reject reasonsHaelwenn (lanodan) Monnier
2020-07-15Bring back oban job pruningrinpatch
Closes #1945
2020-07-15ConnectionPool.Worker: do not stop with an error when there is a timeoutrinpatch
This produced error log messages about GenServer termination every time the connection was not open due to a timeout. Instead we stop with `{:shutdown, <gun_error>}` since shutting down when the connection can't be established is normal behavior.
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 23:23:07 +0000