aboutsummaryrefslogtreecommitdiff
path: root/mix.lock
AgeCommit message (Collapse)Author
2020-07-29updated the minor version packagesMaksim Pechnikov
2020-07-29set swoosh versionMaksim Pechnikov
2020-07-29updated dev & test packagesMaksim Pechnikov
2020-07-23Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'lain
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting Closes #1973 See merge request pleroma/pleroma!2791
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-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
This reverts merge request !2784
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
This reverts merge request !2677
2020-07-20Update linkify to latest releaseAlex Gleason
2020-07-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs
2020-07-16Use updated Linkify from gitAlex Gleason
2020-07-16Merge remote-tracking branch 'upstream/develop' into linkifyAlex Gleason
2020-07-15Go back to upstream Teslahref
2020-07-15Bump gunhref
2020-07-15HTTP: Implement max request limitsrinpatch
2020-07-10Merge branch 'develop' into issue/1790-updated-obanMark Felder
2020-07-10Switch to the official Oban 2.0.0 releaseMark Felder
2020-07-10prometheus update for OTP 23Alexander Strizhakov
2020-07-03Update Oban to 2.0-rc3Mark Felder
2020-07-03Merge branch 'develop' into issue/1790-updated-obanMark Felder
2020-07-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex
2020-06-30AutoLinker --> Linkify, update to latest versionAlex Gleason
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-29updated swooshMaksim Pechnikov
2020-06-24added wrapper Pleroma.HTTP for Tzdata.HTTPClientMaksim Pechnikov
2020-06-23oban 2.0-rc2Maksim Pechnikov
2020-06-23migrate to oban 2.0-rc1Maksim Pechnikov
2020-06-16Update majic & call plug before OpenApiSpexhref
2020-06-16Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIMEhref
2020-06-16Pleroma.MIME: use gen_magichref
2020-05-30mix.lock: update hackney to 1.16.0rinpatch
Closes #1612
2020-05-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-05-20[#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp ↵Ivan Tashkinov
& mogrify-based resizing.
2020-05-19Merge branch 'recipients-query-speedup' into 'develop'rinpatch
Greatly speed up recipients query See merge request pleroma/pleroma!2558
2020-05-19User.Query: Speed up recipients query.lain
2020-05-19Update crypt libraryRoman Chvanikov
2020-05-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # mix.lock
2020-05-13Handle bcrypt passwords for Mastodon migrationAlex Gleason
2020-05-13Merge branch 'openapi/timelines' into 'develop'lain
Add OpenAPI spec for TimelineController See merge request pleroma/pleroma!2506
2020-05-12Upgrade Comeonin to v5Alex Gleason
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-11[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests ↵Ivan Tashkinov
adjustments.
2020-05-11Add OpenAPI spec for TimelineControllerEgor Kislitsyn
2020-05-07Restore mix.lock after 2FA mergerinpatch
It downgraded a bunch of deps, including plug. Which resulted in errors since pleroma was using a feature plug didn't support at the time.
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-06fix for syslog compile with updated rebar3Alexander Strizhakov
2020-04-20Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-15remote_ip plug adds remote_ip_found flagAlexander Strizhakov
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
This reverts merge request !1877
2020-04-14Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-13Add spec for AccountController.statusesEgor Kislitsyn
2020-04-10Merge branch 'develop' into support/update_obanMaksim Pechnikov