Ivan Tashkinov
|
bdf57b8ef4
|
Merge remote-tracking branch 'remotes/origin/develop' into 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
|
4 years ago |
href
|
ebfa591689
|
Go back to upstream Tesla
|
4 years ago |
href
|
6b1f6a1cf7
|
Bump gun
|
4 years ago |
rinpatch
|
4128e3a84a
|
HTTP: Implement max request limits
|
4 years ago |
Mark Felder
|
3c0c1fd2ef
|
Merge branch 'develop' into issue/1790-updated-oban
|
4 years ago |
Mark Felder
|
d7a37fddd1
|
Switch to the official Oban 2.0.0 release
|
4 years ago |
Alexander Strizhakov
|
b6688030fa
|
prometheus update for OTP 23
|
4 years ago |
Mark Felder
|
4d3d867f10
|
Update Oban to 2.0-rc3
|
4 years ago |
Mark Felder
|
4695bdd81b
|
Merge branch 'develop' into issue/1790-updated-oban
|
4 years ago |
Ivan Tashkinov
|
61180ab6f4
|
Merge remote-tracking branch 'remotes/origin/develop' into 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
|
4 years ago |
Maksim Pechnikov
|
dc60b1ee58
|
updated swoosh
|
4 years ago |
Maksim Pechnikov
|
721fc7c554
|
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
|
4 years ago |
Maksim Pechnikov
|
71e233268a
|
oban 2.0-rc2
|
4 years ago |
Maksim Pechnikov
|
a8d967762e
|
migrate to oban 2.0-rc1
|
4 years ago |
rinpatch
|
d2a1975e56
|
mix.lock: update hackney to 1.16.0
Closes #1612
|
4 years ago |
Ivan Tashkinov
|
6fd4f58ead
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
|
4 years ago |
Ivan Tashkinov
|
1871a5ddb4
|
[#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
|
4 years ago |
rinpatch
|
48bcb22146
|
Merge branch 'recipients-query-speedup' into 'develop'
Greatly speed up recipients query
See merge request pleroma/pleroma!2558
|
4 years ago |
lain
|
a985bd57b4
|
User.Query: Speed up recipients query.
|
4 years ago |
Roman Chvanikov
|
512261c97d
|
Update crypt library
|
4 years ago |
Ivan Tashkinov
|
e4b12494d7
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
|
4 years ago |
Alex Gleason
|
9cbf17d59f
|
Handle bcrypt passwords for Mastodon migration
|
4 years ago |
lain
|
1307d6ca3c
|
Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
|
4 years ago |
Alex Gleason
|
b46811a074
|
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
|
4 years ago |
Ivan Tashkinov
|
1b23acf164
|
[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
|
4 years ago |
Egor Kislitsyn
|
3bde0fa3f6
|
Add OpenAPI spec for TimelineController
|
4 years ago |
rinpatch
|
9c3c142c32
|
Restore mix.lock after 2FA merge
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.
|
4 years ago |
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
4 years ago |
Alexander Strizhakov
|
4b00eb93fe
|
fix for syslog compile with updated rebar3
|
4 years ago |
Egor Kislitsyn
|
736fead494
|
Merge branch 'develop' into openapi/account
|
4 years ago |
Alexander Strizhakov
|
22bde21c4f
|
remote_ip plug adds remote_ip_found flag
|
5 years ago |
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
Egor Kislitsyn
|
247e6fcb90
|
Merge branch 'develop' into openapi/account
|
5 years ago |
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
5 years ago |
Egor Kislitsyn
|
03124c96cc
|
Add spec for AccountController.statuses
|
5 years ago |
Maksim Pechnikov
|
648cc699e5
|
Merge branch 'develop' into support/update_oban
|
5 years ago |
lain
|
d2e21fbc96
|
Merge branch 'open-api' into 'develop'
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
|
5 years ago |
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
5 years ago |
Maksim Pechnikov
|
591f7015d9
|
update Oban package
|
5 years ago |
Egor Kislitsyn
|
23219e6fb3
|
Add OpenAPI
|
5 years ago |
Alexander Strizhakov
|
1fcdcb12a7
|
updating gun with bug fix
https://github.com/ninenines/gun/issues/222
|
5 years ago |
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
5 years ago |
Alexander Strizhakov
|
f0651730bd
|
Merge branch 'develop' into gun
|
5 years ago |
Haelwenn (lanodan) Monnier
|
acb016397e
|
mix.lock: [minor] last hash appended
|
5 years ago |
Haelwenn (lanodan) Monnier
|
d1379c4de8
|
Formatting: Do not use \n and prefer <br> instead
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
|
5 years ago |
Maksim Pechnikov
|
edb659dc57
|
Merge branch 'develop' into issue/1276
|
5 years ago |
Alexander Strizhakov
|
fe47bcde8c
|
updating tesla ref
|
5 years ago |
Alexander Strizhakov
|
d6bebd4f9c
|
moving some logic to tesla adapter
- checking original inside gun adapter
- flushing streams on max_body error
|
5 years ago |
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
5 years ago |
Mark Felder
|
85d571fc23
|
Move Tesla repo to our GitLab
|
5 years ago |