aboutsummaryrefslogtreecommitdiff
path: root/mix.lock
AgeCommit message (Collapse)Author
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
2020-04-09Merge branch 'open-api' into 'develop'lain
Add OpenAPI Closes pleroma-meta#19 See merge request pleroma/pleroma!2345
2020-04-02Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-02update Oban packageMaksim Pechnikov
2020-04-01Add OpenAPIEgor Kislitsyn
2020-03-30updating gun with bug fixAlexander Strizhakov
https://github.com/ninenines/gun/issues/222
2020-03-29Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
2020-03-15mix.lock: [minor] last hash appendedHaelwenn (lanodan) Monnier
2020-03-13Formatting: Do not use \n and prefer <br> insteadHaelwenn (lanodan) Monnier
It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-08Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-03-04updating tesla refAlexander Strizhakov
2020-03-04moving some logic to tesla adapterAlexander Strizhakov
- checking original inside gun adapter - flushing streams on max_body error
2020-03-03Merge branch 'develop' into gunAlexander Strizhakov
2020-03-02Move Tesla repo to our GitLabMark Felder
2020-03-01Merge branch 'develop' into gunAlexander Strizhakov
2020-03-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-02-29deps: update cachex to 3.2.0rinpatch
2020-02-25Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-21temp using tesla from forkAlexander Strizhakov
2020-02-18Merge branch 'develop' into gunMark Felder
2020-02-18adding gun adapterAlexander Strizhakov
2020-02-17Merge branch 'develop' into chore/floki-updateMark Felder
2020-02-17Update plug_cryptolain
2020-02-17Merge branch 'develop' into issue/1276Maksim Pechnikov