FloatingGhost
|
502382da45
|
cherry-pick security from upstream
|
2022-06-22 16:25:05 +01:00 |
|
FloatingGhost
|
3bc4c3baf4
|
bump version
|
2022-06-14 16:35:55 +01:00 |
|
FloatingGhost
|
fd0cb148b9
|
bump version, 2.5.1
|
2022-06-12 14:01:23 +01:00 |
|
FloatingGhost
|
6ee32cbdc9
|
bump version
|
2022-06-11 18:16:34 +01:00 |
|
FloatingGhost
|
142646426e
|
fix emoji tests
|
2022-06-11 14:08:54 +01:00 |
|
FloatingGhost
|
8c967311b3
|
format
|
2022-06-10 14:25:51 +01:00 |
|
FloatingGhost
|
c07fcdbf2b
|
just test 1.13
|
2022-06-10 14:20:47 +01:00 |
|
FloatingGhost
|
ed58a6b070
|
run mix format
|
2022-06-10 13:41:08 +01:00 |
|
FloatingGhost
|
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 |
|
FloatingGhost
|
9542709f72
|
update linkify
|
2021-12-30 20:01:25 +00:00 |
|
FloatingGhost
|
12a171844b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-12-30 18:05:22 +00: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 |
|
FloatingGhost
|
de60b1f3c1
|
make search provider configurable
|
2021-12-12 17:35:35 +00:00 |
|
FloatingGhost
|
9002e5155b
|
Add import functionality
|
2021-12-12 17:35:35 +00:00 |
|
Alex Gleason
|
2ac3d341b0
|
Fix benchmarks
|
2021-12-12 17:35:02 +00: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 |
|