mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-13 12:31:13 +00:00
Code Issues Projects Releases Wiki Activity
15574 commits 259 branches 58 tags 358 MiB
Commit graph

525 commits

Author SHA1 Message Date
tusooa
a2766f310c
Bump linkify 2023-01-06 14:12:07 -05:00
tusooa
4b66f2b7f1
Bump earmark to 1.4.22 2022-12-28 11:57:29 -05:00
Haelwenn (lanodan) Monnier
6126f203d3 mix: version 2.5.50 2022-12-23 18:46:14 +01:00
Haelwenn (lanodan) Monnier
91c22637de mix: Release 2.5.0 2022-12-23 17:10:02 +01:00
Lain Soykaf
63d00f8123 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps 2022-12-15 17:19:36 -05:00
Haelwenn (lanodan) Monnier
f6d55e1e77 Mergeback of release 2.4.5 2022-11-27 13:20:42 +01:00
Mark Felder
e9c3be262c Bump credo 
Old credo is throwing errors on my Elixir 1.13 / OTP 25
 2022-11-13 14:17:41 -05:00
Mark Felder
6b87b3f2ea Remove Quack logging backend 2022-11-11 12:36:29 -05:00
tusooa
8d704d384d Merge branch 'ci-coverage' into 'develop' 
Test coverage: Switch to covertool to get cobertura output

See merge request pleroma/pleroma!3745
 2022-11-06 02:19:27 +00:00
Mark Felder
7c64f705f6 Update to Phoenix 1.6 and chase dependencies 
Also bump minimum Elixir to 1.11
 2022-11-03 16:13:07 +00:00
Tusooa Zhu
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4 2022-10-08 22:15:09 -04:00
Haelwenn
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
tusooa
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
tusooa
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
Haelwenn
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
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
ec80a1e405 Bump minimum Elixir version to 1.10 
1.9 being end-of-life
 2022-09-03 03:58:22 +02:00
Haelwenn (lanodan) Monnier
93ed6da4a3 mix: Switch prometheus_ex to fix/elixir-1.14 branch 2022-09-03 03:58:22 +02:00
Tusooa Zhu
6d148b6637 Use Websockex to replace websocket_client 2022-09-03 02:13:00 +02:00
Haelwenn
b439e91f57 Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'" 
This reverts merge request !3649
 2022-09-02 22:35:40 +00:00
Haelwenn (lanodan) Monnier
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
Haelwenn
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
Tusooa Zhu
31fd41de0c
Release 2.4.4 2022-08-19 20:29:06 -04:00
Tusooa Zhu
eb42e90c4f
Use Websockex to replace websocket_client 2022-08-19 20:24:21 -04:00
Hélène
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
duponin
e606b9ab3f add missing extra application to start the SSH BBS 2022-05-18 20:05:42 +02:00
Haelwenn (lanodan) Monnier
f9943b2065 mix: Bump to 2.4.52 for 2.4.3 mergeback 2022-05-06 10:23:43 +02:00
Ilja
c3b2b71ea2 update sweet_xml [Security] 2022-05-06 10:23:25 +02:00
Haelwenn (lanodan) Monnier
57c486014c Release 2.4.3 2022-05-06 09:01:33 +02:00
Ilja
85cbf773f0 update sweet_xml [Security] 2022-05-06 08:36:58 +02:00
Haelwenn
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
Sean King
d0c1997d48
Rewrite integration-test websocket client with Mint.WebSocket 2022-03-19 23:33:37 -06:00
Tusooa Zhu
79ccb6b999
Support fallbacking to other languages 2022-03-06 11:43:31 -05:00
Haelwenn (lanodan) Monnier
56197192bb mix: Check .git presence 2022-02-25 10:39:12 +01:00
Alex Gleason
d5eb44e8b3
Upgrade Linkify to v0.5.2 2022-01-15 12:27:16 -06:00
rinpatch
f4bc2f5975 Add 2.4.2 changelog entry and bump mix version 2022-01-11 13:39:23 +03:00
lain
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
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
Lain Soykaf
6efbd08854 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch 2021-12-26 16:41:17 +01:00
Alex Gleason
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
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
lain
613f55b078 Merge branch 'benchmark' into 'develop' 
Fix benchmarks

See merge request pleroma/pleroma!3551
 2021-12-06 21:16:30 +00:00
Alex Gleason
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
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
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
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
Haelwenn (lanodan) Monnier
28a17c2dc7
Merge branch 'release/2.4.1' into chores/2.4.1-develop 2021-08-28 18:49:04 +02:00
Haelwenn (lanodan) Monnier
7372609c5b
Release 2.4.1 2021-08-28 18:32:21 +02:00
Haelwenn (lanodan) Monnier
8f730f70cb
mix.exs: 2.4.50 2021-08-08 16:00:10 +02:00
Haelwenn (lanodan) Monnier
79e993cae5
Release 2.4.0 2021-08-01 08:26:39 +02:00
Mark Felder
64d009693e Update Linkify to fix crash on posts with a URL we failed to parse correctly 2021-07-08 12:33:17 -05:00
feld
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
079afd32d8
Enable :warnings_as_errors for CI only 2021-06-23 14:33:40 -05: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
166455c884
mix: Switch hackney & gun to releases 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
681a42c359
release runtime provider fix for paths 2021-04-08 15:45:31 +03:00
Alexander Strizhakov
4d046afd27
tests for release config provider 2021-03-27 09:05:33 +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
c5352e90be Changelog, mix: merge in stable 2021-03-03 13:56:40 +01:00
lain
0a589c887b Mix: Update linkify. 2021-03-02 17:03:14 +01:00
lain
cd6aa9bcae Mix: Update version number 2021-03-01 21:13:43 +01:00
Mark Felder
9272cef500 Switch to a build of Majic that does not try to fix extensions by default 2021-01-28 14:03:29 -06:00
feld
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
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
a17a9dcc4d
mix.exs: Put template into one variable with ~s[] 2021-01-16 02:42:52 +01:00
Haelwenn (lanodan) Monnier
99c2e8ed5c
mix.exs: GNU sed doesn't into proper getopt() 2021-01-16 02:42:52 +01:00
Mark Felder
23c6cea889 Add a mix alias to bump copyright 2021-01-15 17:26:02 -06:00
Mark Felder
41a637c3a6 Split out year 2021-01-15 17:25:43 -06:00
Mark Felder
3607dfefca Add mix alias to easily add copyright headers to files 2021-01-15 16:53:55 -06:00
Mark Felder
d2382ab5f4 Update Oban to 2.3.4 2021-01-15 15:01:48 -06:00
lain
9106048c61 Password: Replace Pbkdf2 with Password. 2021-01-13 15:11:11 +01:00
Mark Felder
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
Mark Felder
5b838accc0 Update Linkify to 0.4.1 
Fixes false positive detection of IPv4 addresses
 2020-12-23 09:07:01 -06:00
lain
713612c377 Cachex: Make caching provider switchable at runtime. 
Defaults to Cachex.
 2020-12-18 17:44:46 +01:00
Alexander Strizhakov
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
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