summaryrefslogtreecommitdiff
path: root/mix.lock
AgeCommit message (Collapse)Author
2021-01-17update for retired elixir_make package versionAlexander Strizhakov
2020-12-22Mix: Update linkify to 0.4.1lain
2020-12-22Switch to a fork of Hackney 1.15.2 for now so we can have our URL ↵Mark Felder
normalization bugfix
2020-12-22Fix S3 uploads with Elixir 1.11Mark Felder
2020-11-04Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-10-12Switch Majic to a copy hosted in our GitLabMark Felder
2020-10-09Merge branch 'develop' into feature/gen-magicMark Felder
2020-09-30Update Oban to 2.1.0Mark Felder
2020-09-18Merge branch 'media-preview-proxy-nostream' into 'develop'feld
Media preview proxy See merge request pleroma/pleroma!3001
2020-09-18Federate data through persistent websocket connectionsSteven Fuchs
2020-09-10Merge branch 'develop' into feature/gen-magicMark Felder
2020-09-09Merge branch 'develop' into media-preview-proxyMark Felder
2020-09-09bump concurrent_limiterrinpatch
Should fix gun deadlocks
2020-09-07Merge branch 'temp-hackney-fix' into 'develop'rinpatch
temp hackney fix See merge request pleroma/pleroma!2951
2020-09-07switch back to upstream teslarinpatch
The patch we required got merged upstream: https://github.com/teamon/tesla/commit/9f7261ca49f9f901ceb73b60219ad6f8a9f6aa30
2020-09-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Mark Felder
media-preview-proxy
2020-09-04ConnectionPool middleware: Fix connection leak on ReverseProxy redirectsrinpatch
Requires a patched Tesla due to upstream not saving opts between redirects, patch submitted at https://github.com/teamon/tesla/pull/414
2020-09-04temp hackney fixAlexander Strizhakov
2020-09-04mix.lock: Bump fast_htmlHaelwenn (lanodan) Monnier
This update fixes an incorrect push to Hex that reverted the gcc-10 fix
2020-09-03Merge branch 'develop' into media-preview-proxyMark Felder
2020-08-31mix.lock: bump fast_sanitizerinpatch
The update brings a better error message for when cmake isn't installed
2020-08-26Merge branch 'develop' into feld-2168-media-preview-proxyMark Felder
2020-08-26fix fast_html build errors with gcc 10 by bumping fast_sanitizerinpatch
Closes #2058
2020-08-18[#2497] Added video preview proxy. Switched from exexec to Port.Ivan Tashkinov
2020-08-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # mix.lock
2020-08-07mix.exs: update fast_sanitize to 0.2.0rinpatch
2020-08-07Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # mix.lock
2020-08-01Fix ConnecitonPool deadlocking after reaching the connection limitrinpatch
The issue was with ConcurrentLimiter not decrementing counters on overload. It was fixed in the latest commit, but concurrentlimiter version wasn't updated in Pleroma for some reason. Closes #1977
2020-07-30updated `cors_plug`Maksim Pechnikov
2020-07-30set `web_push_encryption` versionMaksim Pechnikov
2020-07-30updated `calendar` packageMaksim Pechnikov
2020-07-29update mogrify packageMaksim Pechnikov
2020-07-29set http_signatures versionMaksim Pechnikov
2020-07-29updated `pot` packageMaksim Pechnikov
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