|
502382da45
|
cherry-pick security from upstream
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline failed
ci/woodpecker/push/test unknown status
|
2022-06-22 16:25:05 +01:00 |
|
|
142646426e
|
fix emoji tests
|
2022-06-11 14:08:54 +01:00 |
|
|
c07fcdbf2b
|
just test 1.13
ci/woodpecker/push/lint Pipeline failed
ci/woodpecker/push/test unknown status
|
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 |
|