lain
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
4 years ago
rinpatch
f687befb93
Merge branch 'fix/hackney-follow-redirects' into 'develop'
...
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
Closes #2342
See merge request pleroma/pleroma!3199
4 years ago
Mark Felder
7d78c00049
Majic: specify commit so source users do not get surprise updates
4 years ago
Mark Felder
3299fea9e3
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
4 years ago
Mark Felder
6520599b7d
Update Earmark to 1.4.13, use the new compact_output mode
4 years ago
Alex Gleason
e9e17e5df3
Upgrade Earmark to v1.4.10
4 years ago
Mark Felder
45949b5cd3
Update Linkify to 0.4.0
4 years ago
Mark Felder
60c8c5402c
Update Linkify to 0.3.0
...
Added
- Support returning result as iodata and as safe iodata
Fixed
- Hashtags followed by HTML tags "a", "code" and "pre" were not detected
- Incorrect parsing of HTML links inside HTML tags
- Punctuation marks in the end of urls were included in the html links
- Incorrect parsing of mentions with symbols before them
4 years ago
rinpatch
83ec4aadd6
Merge branch 'chores/tesla_1.4.0' into 'develop'
...
mix.exs: Update tesla to 1.4.0
See merge request pleroma/pleroma!3152
4 years ago
Haelwenn (lanodan) Monnier
3f69680ed9
mix.exs: Update tesla to 1.4.0
4 years ago
Mark Felder
eea962fc10
Fix S3 uploads with Elixir 1.11
4 years ago
Mark Felder
2f2281fdf1
Ensure URLs for git repos end in .git for older git clients like on CentOS 7
4 years ago
Ivan Tashkinov
14900164b8
[ #3059 ] Used forked prometheus-phx to remove log spam.
4 years ago
Ivan Tashkinov
8a55de1d78
[ #3059 ] Fixed Phoenix 1.5 telemetry processing.
4 years ago
Ivan Tashkinov
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Egor Kislitsyn
a859d9bc15
Update dependencies
4 years ago
Mark Felder
c4fae2611f
Switch Majic to a copy hosted in our GitLab
4 years ago
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder
f3bc076f09
Temporarily soft-fork prometheus_ex
4 years ago
Mark Felder
268f7f492a
Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings
4 years ago
Mark Felder
cee1883b35
Update Oban to 2.1.0
4 years ago
feld
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
4 years ago
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
4 years ago
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
4 years ago
rinpatch
0c1d243185
bump concurrent_limiter
...
Should fix gun deadlocks
4 years ago
rinpatch
6c6de8e5df
Merge branch 'temp-hackney-fix' into 'develop'
...
temp hackney fix
See merge request pleroma/pleroma!2951
4 years ago
rinpatch
8628e1b216
switch back to upstream tesla
...
The patch we required got merged upstream: 9f7261ca49
4 years ago
Mark Felder
563718cab9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy
4 years ago
rinpatch
10da13c713
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects
...
Requires a patched Tesla due to upstream not saving opts between
redirects, patch submitted at https://github.com/teamon/tesla/pull/414
4 years ago
Alexander Strizhakov
8bd2b6eb13
temp hackney fix
4 years ago
Haelwenn (lanodan) Monnier
bce22937dc
mix.lock: Bump fast_html
...
This update fixes an incorrect push to Hex that reverted the gcc-10 fix
4 years ago
Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
4 years ago
rinpatch
858e9a59ed
mix.lock: bump fast_sanitize
...
The update brings a better error message for when cmake isn't installed
4 years ago
Mark Felder
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
rinpatch
6da17f88d6
fix fast_html build errors with gcc 10 by bumping fast_sanitize
...
Closes #2058
4 years ago
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
4 years ago
Ivan Tashkinov
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
4 years ago
rinpatch
c662b09eee
mix.exs: update fast_sanitize to 0.2.0
4 years ago
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
rinpatch
87180ff817
Fix ConnecitonPool deadlocking after reaching the connection limit
...
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
4 years ago
Maksim Pechnikov
b261135683
updated `cors_plug`
4 years ago
Maksim Pechnikov
4f10ef5e46
set `web_push_encryption` version
4 years ago
Maksim Pechnikov
df82839c30
updated `calendar` package
4 years ago
Maksim Pechnikov
cd2423d7f5
update mogrify package
4 years ago
Maksim Pechnikov
b4603a9c9c
set http_signatures version
4 years ago
Maksim Pechnikov
88f57418c8
updated `pot` package
4 years ago
Maksim Pechnikov
992a271196
updated the minor version packages
4 years ago
Maksim Pechnikov
ed881247b7
set swoosh version
4 years ago
Maksim Pechnikov
15b8446cdb
updated dev & test packages
4 years ago
lain
76aa49a0c5
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
...
[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
4 years ago
Ivan Tashkinov
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :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.
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
Alex Gleason
5d263dfdb3
Update linkify to latest release
4 years ago
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
Alex Gleason
5701840d30
Use updated Linkify from git
4 years ago
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
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
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
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
href
39f7fc5b8e
Update majic & call plug before OpenApiSpex
4 years ago
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
4 years ago
href
ec1452fd1c
Pleroma.MIME: use gen_magic
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
4 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
4 years ago
Egor Kislitsyn
247e6fcb90
Merge branch 'develop' into openapi/account
4 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