70cd62b033
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-10-04 11:35:58 -05:00
5d7d623390
Merge branch 'bugfix/elixir-1.14' into 'develop'
...
Bugfix: Elixir 1.14
See merge request pleroma/pleroma!3740
2022-09-27 21:46:03 +00:00
ac95b8b4f3
Merge branch 'websocketex' into 'develop'
...
Use Websockex to replace websocket_client
See merge request pleroma/pleroma!3743
2022-09-18 17:09:12 +00:00
11ea7d98bb
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-09-06 14:52:04 -05:00
f7c2073103
Merge branch 'bump/min-elixir-1.10' into 'develop'
...
Bump minimum Elixir version to 1.10
See merge request pleroma/pleroma!3741
2022-09-05 15:19:34 +00:00
257601d67d
Merge branch 'ssh-bbs-improvements' into 'develop'
...
BBS: add functionnalities and readability
See merge request pleroma/pleroma!3675
2022-09-03 11:15:07 +00:00
be411ad3bc
Test coverage: Switch to covertool to get cobertura output
...
This allows to have coverage information integrated into Gitlab
2022-09-03 05:03:50 +02:00
ec80a1e405
Bump minimum Elixir version to 1.10
...
1.9 being end-of-life
2022-09-03 03:58:22 +02:00
93ed6da4a3
mix: Switch prometheus_ex to fix/elixir-1.14 branch
2022-09-03 03:58:22 +02:00
6d148b6637
Use Websockex to replace websocket_client
2022-09-03 02:13:00 +02:00
b439e91f57
Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'"
...
This reverts merge request !3649
2022-09-02 22:35:40 +00:00
21ab7369ca
Bump minimum Elixir version to 1.10
...
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.
Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
2022-09-02 22:53:54 +02:00
01239456a1
Merge branch 'rewrite/integration-test-websocket-client' into 'develop'
...
Rewrite integration-test websocket client with Mint.WebSocket, closes #2812
Closes #2812
See merge request pleroma/pleroma!3649
2022-09-02 19:18:22 +00:00
31fd41de0c
Release 2.4.4
2022-08-19 20:29:06 -04:00
eb42e90c4f
Use Websockex to replace websocket_client
2022-08-19 20:24:21 -04:00
0430be87e1
Report pleroma until husky fixes it
2022-08-03 18:16:42 -05:00
6ba6456150
Full migration from Pleroma to Akkoma
2022-07-29 18:16:19 -05:00
99d2710e69
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-07-05 16:17:17 -05:00
c3a0944ce5
mix: update eblurhash to 1.2.2
...
Previous eblurhash versions bundled precompiled binaries which caused
issues on non-Darwin operating systems.
2022-07-02 14:52:28 +02:00
e606b9ab3f
add missing extra application to start the SSH BBS
2022-05-18 20:05:42 +02:00
f53d289b51
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-05-06 22:31:08 -05:00
f9943b2065
mix: Bump to 2.4.52 for 2.4.3 mergeback
2022-05-06 10:23:43 +02:00
c3b2b71ea2
update sweet_xml [Security]
2022-05-06 10:23:25 +02:00
57c486014c
Release 2.4.3
2022-05-06 09:01:33 +02:00
85cbf773f0
update sweet_xml [Security]
2022-05-06 08:36:58 +02:00
078d314354
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-03-25 09:07:30 -05:00
d7c53da77a
Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
...
Translate backend-rendered pages
See merge request pleroma/pleroma!3634
2022-03-20 18:14:37 +00:00
d0c1997d48
Rewrite integration-test websocket client with Mint.WebSocket
2022-03-19 23:33:37 -06:00
de2682231e
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-03-18 01:34:11 -05:00
79ccb6b999
Support fallbacking to other languages
2022-03-06 11:43:31 -05:00
56197192bb
mix: Check .git presence
2022-02-25 10:39:12 +01:00
b762792837
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-01-23 11:19:53 -06:00
d5eb44e8b3
Upgrade Linkify to v0.5.2
2022-01-15 12:27:16 -06:00
acb6e32006
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-01-13 11:43:06 -06:00
f4bc2f5975
Add 2.4.2 changelog entry and bump mix version
2022-01-11 13:39:23 +03:00
991b26f494
Merge branch 'update-hackney' into 'develop'
...
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
2022-01-10 17:40:31 +03:00
bf995a7770
Upgrade web_push_encryption to 0.3.1
2022-01-01 21:02:09 -07:00
91ea394cd0
Change concurrent_limiter to Hex PM version 0.1.1
2022-01-01 14:49:57 -07:00
e70a8107fa
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-12-30 10:40:51 -06:00
Lain Soykaf
6efbd08854
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
2021-12-26 16:41:17 +01:00
1fa616638b
Merge branch 'warnings-as-errors' into 'develop'
...
Enable :warnings_as_errors for CI only
See merge request pleroma/pleroma!3474
2021-12-23 16:19:57 +00:00
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
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
68278ab5bd
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-12-14 06:57:13 -06:00
613f55b078
Merge branch 'benchmark' into 'develop'
...
Fix benchmarks
See merge request pleroma/pleroma!3551
2021-12-06 21:16:30 +00:00
ce4560c2a1
Fix benchmarks
2021-12-03 16:20:54 -05:00
a1batross
809503011f
Mix: upgrade Hackney to 1.18.0
2021-11-29 17:28:10 +00:00
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
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
4d341f51e1
Merge branch 'fix-tests' into 'develop'
...
Test fixes
See merge request pleroma/pleroma!3532
2021-11-15 14:31:27 +00:00
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
e4ad4f0bd6
mix: Update http_signatures to 0.1.1
2021-11-10 00:53:32 +01:00
9d61da811c
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-10-08 09:55:18 -05:00
bdaa7e5394
Merge branch 'bugfix/crypt-pragma' into 'develop'
...
mix: Update crypt to fix #pragma warning
Closes #2710
See merge request pleroma/pleroma!3527
2021-10-06 05:58:52 +00:00
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
319ea3ec4c
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-09-07 09:47:03 -05:00
28a17c2dc7
Merge branch 'release/2.4.1' into chores/2.4.1-develop
2021-08-28 18:49:04 +02:00
7372609c5b
Release 2.4.1
2021-08-28 18:32:21 +02:00
ab993ba681
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-08-26 11:18:28 -05:00
8f730f70cb
mix.exs: 2.4.50
2021-08-08 16:00:10 +02:00
79e993cae5
Release 2.4.0
2021-08-01 08:26:39 +02:00
6d8be01f6f
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-07-14 12:49:22 -05: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
c046439832
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-07-01 20:21:46 -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
079afd32d8
Enable :warnings_as_errors for CI only
2021-06-23 14:33:40 -05:00
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-06-23 13:22:32 -05:00
f51bf72a78
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-06-23 10:09:22 -05:00
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
83c261818c
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-06-10 14:41:32 -05:00
d0147eba78
Use eblurhash 1.1.0 from Hex
2021-06-09 09:28:22 -05:00
7c5e007b9c
mix: Update pot to ~> 1.0
2021-06-03 19:11:16 +02:00
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption
2021-06-03 19:11:16 +02:00
166455c884
mix: Switch hackney & gun to releases
2021-06-03 19:10:47 +02:00
bcf6efce15
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
2021-05-14 09:09:32 -05:00
543e9402d6
Support blurhash
2021-05-14 09:07:16 -05:00
70dd284865
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-05-04 10:41:07 -05:00
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
004bcedb07
Upgrade Earmark 1.4.15
2021-04-30 12:23:11 -05:00
5f440fd839
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-04-16 21:20:13 -05:00
681a42c359
release runtime provider fix for paths
2021-04-08 15:45:31 +03:00
4d046afd27
tests for release config provider
2021-03-27 09:05:33 +03:00
7201fd15ec
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-03-19 12:38:52 -05:00
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
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04:00
ccffa176e9
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-03-04 07:54:17 -06:00
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
2021-03-03 23:09:30 +03:00
c5352e90be
Changelog, mix: merge in stable
2021-03-03 13:56:40 +01:00
0a589c887b
Mix: Update linkify.
2021-03-02 17:03:14 +01:00
cd6aa9bcae
Mix: Update version number
2021-03-01 21:13:43 +01:00
b22f79f287
update project info
2021-02-09 11:31:11 -06: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
b5899fda1a
Merge branch 'copyright-fun' into 'develop'
...
Mix aliases for handling copyright headers
See merge request pleroma/pleroma!3257
2021-01-20 22:51:56 +00:00
3e0d1588a4
mix.exs: Make copyright regexes more precise
...
- Add copyright checks for Pleroma's not any copyright
- Copyright bump fixes the whole line instead of just the year
2021-01-16 02:42:53 +01:00
a17a9dcc4d
mix.exs: Put template into one variable with ~s[]
2021-01-16 02:42:52 +01:00
99c2e8ed5c
mix.exs: GNU sed doesn't into proper getopt()
2021-01-16 02:42:52 +01:00
23c6cea889
Add a mix alias to bump copyright
2021-01-15 17:26:02 -06:00
41a637c3a6
Split out year
2021-01-15 17:25:43 -06:00
3607dfefca
Add mix alias to easily add copyright headers to files
2021-01-15 16:53:55 -06:00
d2382ab5f4
Update Oban to 2.3.4
2021-01-15 15:01:48 -06:00
9106048c61
Password: Replace Pbkdf2 with Password.
2021-01-13 15:11:11 +01: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
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
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
2020-12-14 11:02:32 -06:00
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
7d78c00049
Majic: specify commit so source users do not get surprise updates
2020-12-12 13:04:16 -06:00
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
6520599b7d
Update Earmark to 1.4.13, use the new compact_output mode
2020-12-11 17:23:03 -06:00
e9e17e5df3
Upgrade Earmark to v1.4.10
2020-12-11 17:22:17 -06:00
45949b5cd3
Update Linkify to 0.4.0
2020-12-01 17:26:25 -06:00
5eef4988bf
fix for elixir 1.11
...
load runtime configs in releases with config provider
2020-11-25 14:10:24 +03:00
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
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
b1fc9fe951
mix.exs: bump development version to 2.2.50 after 2.2.0 release
2020-11-17 15:14:35 +03:00
3f69680ed9
mix.exs: Update tesla to 1.4.0
2020-11-17 13:09:56 +01:00
eea962fc10
Fix S3 uploads with Elixir 1.11
2020-11-16 19:51:44 +00:00
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
14900164b8
[ #3059 ] Used forked prometheus-phx to remove log spam.
2020-10-22 17:58:25 +03:00
8a55de1d78
[ #3059 ] Fixed Phoenix 1.5 telemetry processing.
2020-10-22 13:54:15 +03:00
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
c4fae2611f
Switch Majic to a copy hosted in our GitLab
2020-10-12 12:25:45 -05:00
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
f3bc076f09
Temporarily soft-fork prometheus_ex
2020-10-07 10:23:20 -05:00
268f7f492a
Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings
2020-10-07 09:50:51 -05:00
cee1883b35
Update Oban to 2.1.0
2020-09-30 07:53:19 -05:00
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
0c1d243185
bump concurrent_limiter
...
Should fix gun deadlocks
2020-09-09 18:34:07 +03:00
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
8628e1b216
switch back to upstream tesla
...
The patch we required got merged upstream: 9f7261ca49
2020-09-07 15:21:20 +03:00
de7e2ae0b5
use override flag for hackney dependency
2020-09-05 11:15:27 +03:00
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
8bd2b6eb13
temp hackney fix
2020-09-04 14:24:15 +03:00
ce387ce730
mix.exs: bump development version after 2.1.0 release
2020-08-28 16:15:57 +03:00
b141e35d64
Mix: Update version
2020-08-28 11:34:48 +02:00
49a436ad3e
Mix: Make rc version explicit.
2020-08-25 16:07:07 +02:00
ea2b5c07e3
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-25 15:38:12 +02:00
c662b09eee
mix.exs: update fast_sanitize to 0.2.0
2020-08-07 16:45:33 +03:00
4672b61106
Merge branch 'develop' into command-available-check
2020-08-05 19:16:48 +03:00
697e3db01c
Add analyze mix alias to run the same credo checks we use in CI
2020-08-04 08:55:40 -05:00
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
56171cbde6
set versions
2020-07-30 09:23:35 +03:00
b261135683
updated `cors_plug`
2020-07-30 09:12:42 +03:00
aac7e0314e
set `postgrex` version
2020-07-30 09:08:50 +03:00
4f10ef5e46
set `web_push_encryption` version
2020-07-30 09:08:03 +03:00
Your New SJW Waifu
Haelwenn
tusooa
Haelwenn (lanodan) Monnier
Hélène
duponin
Ilja
Sean King
Alex Gleason
rinpatch
lain
Lain Soykaf
a1batross
Mark Felder
Alexander Strizhakov
Ivan Tashkinov
Egor Kislitsyn
rinpatch
Mark Felder
Roman Chvanikov
Maksim Pechnikov