142646426e
fix emoji tests
2022-06-11 14:08:54 +01:00
c07fcdbf2b
just test 1.13
2022-06-10 14:20:47 +01:00
92d3742072
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 17:21:44 +00:00
Sean King
bf995a7770
Upgrade web_push_encryption to 0.3.1
2022-01-01 21:02:09 -07:00
Sean King
91ea394cd0
Change concurrent_limiter to Hex PM version 0.1.1
2022-01-01 14:49:57 -07:00
9542709f72
update linkify
2021-12-30 20:01:25 +00:00
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-30 18:05:22 +00:00
Lain Soykaf
7ed2258979
Update changelog
2021-12-26 17:00:09 +01:00
Lain Soykaf
6efbd08854
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
2021-12-26 16:41:17 +01:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
Lain Soykaf
abb62dd886
Application, dependencies: prepare for finch
2021-12-15 13:53:09 -05:00
de60b1f3c1
make search provider configurable
2021-12-12 17:35:35 +00:00
9002e5155b
Add import functionality
2021-12-12 17:35:35 +00:00
Alex Gleason
ab5dee84bf
Run mix deps.get
2021-12-07 10:03:31 -05:00
sadposter
ca2bd8b72b
remove deactivated_users call
2021-12-06 10:18:16 +00:00
Haelwenn
c97f99ccf2
Merge branch 'bugfix/markdown-newlines' into 'develop'
...
mix: Update earmark
See merge request pleroma/pleroma!3538
2021-11-16 13:54:34 +00:00
Haelwenn (lanodan) Monnier
5e15ceb49d
mix: Update earmark
...
This should fix the presence of extraneous newlines in markdown output.
Related: https://github.com/pragdave/earmark/issues/406
2021-11-16 14:33:27 +01:00
lain
4d341f51e1
Merge branch 'fix-tests' into 'develop'
...
Test fixes
See merge request pleroma/pleroma!3532
2021-11-15 14:31:27 +00:00
lain
838da53ea7
Merge branch 'bump/http_signatures-0.1.1' into 'develop'
...
mix: Update http_signatures to 0.1.1
See merge request pleroma/pleroma!3530
2021-11-15 11:58:49 +00:00
Lain Soykaf
7dcc73f294
Mix: Update crypt to fix musl builds.
2021-11-14 16:04:08 +01:00
Lain Soykaf
26450a0be3
Mix: Upgrade mogrify library
...
The old library would modify a file on reading it, the new one
doesn't have this issue.
2021-11-14 11:43:39 +01:00
Haelwenn (lanodan) Monnier
e4ad4f0bd6
mix: Update http_signatures to 0.1.1
2021-11-10 00:53:32 +01:00
Haelwenn (lanodan) Monnier
3b20eddcf8
mix: Update crypt to fix #pragma warning
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2710
2021-10-06 07:40:02 +02:00
64d009693e
Update Linkify to fix crash on posts with a URL we failed to parse correctly
2021-07-08 12:33:17 -05:00
f97f305d00
Merge branch 'ecto-upgrade' into 'develop'
...
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
2021-06-23 20:17:01 +00:00
Alex Gleason
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-06-23 13:22:32 -05:00
Haelwenn (lanodan) Monnier
a851a24036
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
...
This should fix setting the upload limit in the database as found in:
https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU
This reverts commit 7d350b73f5
2021-06-22 11:19:13 +02:00
Alex Gleason
d0147eba78
Use eblurhash 1.1.0 from Hex
2021-06-09 09:28:22 -05:00
Haelwenn (lanodan) Monnier
7c5e007b9c
mix: Update pot to ~> 1.0
2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption
2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
2768063387
mix: Update dependencies
2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
166455c884
mix: Switch hackney & gun to releases
2021-06-03 19:10:47 +02:00
Haelwenn (lanodan) Monnier
59af07f149
Update all dependencies
2021-06-03 19:10:47 +02:00
Alex Gleason
bcf6efce15
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
2021-05-14 09:09:32 -05:00
Alex Gleason
543e9402d6
Support blurhash
2021-05-14 09:07:16 -05:00
Alex Gleason
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
Alex Gleason
004bcedb07
Upgrade Earmark 1.4.15
2021-04-30 12:23:11 -05:00
Alexander Strizhakov
ef5b0510eb
updating timex
2021-03-20 08:29:02 +03:00
Haelwenn
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
2021-03-16 01:54:43 +00:00
Ivan Tashkinov
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
Egor Kislitsyn
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04:00
Ivan Tashkinov
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
2021-03-03 23:09:30 +03:00
lain
0a589c887b
Mix: Update linkify.
2021-03-02 17:03:14 +01:00
9272cef500
Switch to a build of Majic that does not try to fix extensions by default
2021-01-28 14:03:29 -06:00
d2382ab5f4
Update Oban to 2.3.4
2021-01-15 15:01:48 -06:00
a1a58f0a53
Switch to local fork of crypt until upstream fixes ability to build on aarch64
...
https://github.com/msantos/crypt/pull/8
2020-12-28 17:52:18 -06:00
lain
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
2020-12-26 10:26:35 +00:00
5b838accc0
Update Linkify to 0.4.1
...
Fixes false positive detection of IPv4 addresses
2020-12-23 09:07:01 -06:00
Alexander Strizhakov
dedc575225
update for retired elixir_make package version
2020-12-22 17:42:23 +03:00
lain
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
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
2020-12-13 12:16:41 +00:00
Mark Felder
7d78c00049
Majic: specify commit so source users do not get surprise updates
2020-12-12 13:04:16 -06:00
Mark Felder
3299fea9e3
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
2020-12-12 13:01:30 -06:00
Mark Felder
6520599b7d
Update Earmark to 1.4.13, use the new compact_output mode
2020-12-11 17:23:03 -06:00
Alex Gleason
e9e17e5df3
Upgrade Earmark to v1.4.10
2020-12-11 17:22:17 -06:00
Mark Felder
45949b5cd3
Update Linkify to 0.4.0
2020-12-01 17:26:25 -06:00
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
2020-11-23 11:22:50 -06:00
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
2020-11-17 12:42:51 +00:00
Haelwenn (lanodan) Monnier
3f69680ed9
mix.exs: Update tesla to 1.4.0
2020-11-17 13:09:56 +01:00
Mark Felder
eea962fc10
Fix S3 uploads with Elixir 1.11
2020-11-16 19:51:44 +00:00
Mark Felder
2f2281fdf1
Ensure URLs for git repos end in .git for older git clients like on CentOS 7
2020-11-02 17:09:56 -06:00
Ivan Tashkinov
14900164b8
[ #3059 ] Used forked prometheus-phx to remove log spam.
2020-10-22 17:58:25 +03:00
Ivan Tashkinov
8a55de1d78
[ #3059 ] Fixed Phoenix 1.5 telemetry processing.
2020-10-22 13:54:15 +03:00
Ivan Tashkinov
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
Egor Kislitsyn
a859d9bc15
Update dependencies
2020-10-15 18:05:54 +04:00
Mark Felder
c4fae2611f
Switch Majic to a copy hosted in our GitLab
2020-10-12 12:25:45 -05:00
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
Mark Felder
f3bc076f09
Temporarily soft-fork prometheus_ex
2020-10-07 10:23:20 -05:00
Mark Felder
268f7f492a
Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings
2020-10-07 09:50:51 -05:00
Mark Felder
cee1883b35
Update Oban to 2.1.0
2020-09-30 07:53:19 -05:00
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
2020-09-09 11:11:36 -05:00
rinpatch
0c1d243185
bump concurrent_limiter
...
Should fix gun deadlocks
2020-09-09 18:34:07 +03:00
rinpatch
6c6de8e5df
Merge branch 'temp-hackney-fix' into 'develop'
...
temp hackney fix
See merge request pleroma/pleroma!2951
2020-09-07 12:47:43 +00:00
rinpatch
8628e1b216
switch back to upstream tesla
...
The patch we required got merged upstream: 9f7261ca49
2020-09-07 15:21:20 +03:00
Mark Felder
563718cab9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy
2020-09-06 08:15:34 -05:00
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
2020-09-04 22:10:40 +03:00
Alexander Strizhakov
8bd2b6eb13
temp hackney fix
2020-09-04 14:24:15 +03:00
Haelwenn (lanodan) Monnier
bce22937dc
mix.lock: Bump fast_html
...
This update fixes an incorrect push to Hex that reverted the gcc-10 fix
2020-09-04 09:15:58 +02:00
Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
rinpatch
858e9a59ed
mix.lock: bump fast_sanitize
...
The update brings a better error message for when cmake isn't installed
2020-08-31 09:54:16 +03:00
Mark Felder
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-26 16:37:57 -05:00
rinpatch
6da17f88d6
fix fast_html build errors with gcc 10 by bumping fast_sanitize
...
Closes #2058
2020-08-26 16:31:02 +03:00
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
Ivan Tashkinov
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
2020-08-11 15:13:29 +03:00
rinpatch
c662b09eee
mix.exs: update fast_sanitize to 0.2.0
2020-08-07 16:45:33 +03:00
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-08-07 09:38:05 +03:00
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
2020-08-01 12:18:56 +03:00
Maksim Pechnikov
b261135683
updated cors_plug
2020-07-30 09:12:42 +03:00
Maksim Pechnikov
4f10ef5e46
set web_push_encryption version
2020-07-30 09:08:03 +03:00
Maksim Pechnikov
df82839c30
updated calendar package
2020-07-30 08:58:19 +03:00
Maksim Pechnikov
cd2423d7f5
update mogrify package
2020-07-29 09:22:49 +03:00
Maksim Pechnikov
b4603a9c9c
set http_signatures version
2020-07-29 07:23:06 +03:00
Maksim Pechnikov
88f57418c8
updated pot package
2020-07-29 07:02:36 +03:00
Maksim Pechnikov
992a271196
updated the minor version packages
2020-07-29 07:00:27 +03:00
Maksim Pechnikov
ed881247b7
set swoosh version
2020-07-29 06:50:00 +03:00
Maksim Pechnikov
15b8446cdb
updated dev & test packages
2020-07-29 06:47:56 +03:00
