tusooa
|
40f14fd31c
|
Merge branch 'remove-crypt' into 'develop'
Remove crypt(3) support
Closes #3030 and #3062
See merge request pleroma/pleroma!3847
|
2023-03-30 12:47:36 +02:00 |
|
Haelwenn
|
937df7e465
|
Merge branch 'fix/tag-feed-crashes' into 'develop'
fix: atom/rss feed issues
Closes #3045
See merge request pleroma/pleroma!3851
|
2023-03-30 12:46:35 +02:00 |
|
Haelwenn
|
d640df3927
|
Merge branch 'fix/static-fe-feed-500' into 'develop'
fix: remove static_fe pipeline for /users/:nickname/feed
See merge request pleroma/pleroma!3852
|
2023-03-30 12:45:39 +02:00 |
|
Haelwenn
|
22b72cd6b8
|
Merge branch 'tusooa/oban-common-pipeline' into 'develop'
Stop oban from retrying if validating errors occur when processing incoming data
See merge request pleroma/pleroma!3844
|
2023-03-30 12:43:58 +02:00 |
|
tusooa
|
fd46f83d2d
|
Merge branch 'release/2.5.1' into 'stable'
release: 2.5.1
See merge request pleroma/pleroma!3841
|
2023-03-02 00:50:02 +00:00 |
|
tusooa
|
938e238ea1
|
Add the security fix to the changelog
|
2023-03-01 18:44:29 -05:00 |
|
tusooa
|
e4925f813a
|
Sanitize filenames when uploading
|
2023-03-01 18:40:02 -05:00 |
|
tusooa
|
5d34fe1868
|
Bundle frontend
|
2023-02-20 12:37:44 -05:00 |
|
tusooa
|
75b76a0666
|
Bump version in mix project to 2.5.1
|
2023-02-20 12:32:45 -05:00 |
|
tusooa
|
db06e445f1
|
Compose changelog for 2.5.1
|
2023-02-20 12:32:18 -05:00 |
|
tusooa
|
410d50afe5
|
Ignores in exiftool read descriptions
|
2023-02-20 12:30:36 -05:00 |
|
Sean King
|
c69ae5f7c7
|
Bump crypt to v1.0.1
|
2023-02-20 12:29:38 -05:00 |
|
lain
|
bb9ed51da7
|
Update mix.exs
|
2023-02-20 12:28:52 -05:00 |
|
tusooa
|
002159fc1c
|
Bump linkify
|
2023-02-20 12:28:52 -05:00 |
|
tusooa
|
f2ed05191c
|
Test double dot link
|
2023-02-20 12:28:42 -05:00 |
|
tusooa
|
0e89a9ad15
|
Test that zwnj is treated as word char in hashtags
|
2023-02-20 12:28:41 -05:00 |
|
Alexander Tumin
|
c3a0703564
|
Require related object for notifications to filter on content
|
2023-02-20 12:27:50 -05:00 |
|
tusooa
|
8e8a0f005c
|
Fix inproper content being cached in report content
|
2023-02-20 12:26:16 -05:00 |
|
tusooa
|
772d99c582
|
Use versioned image from hexpm
|
2023-02-20 12:25:31 -05:00 |
|
tusooa
|
1c225bfd6e
|
Allow customizing instance languages
|
2023-02-20 12:25:00 -05:00 |
|
Mark Felder
|
1b82fd95d4
|
Remove unwanted code specific to MIX_ENV=test
|
2023-02-20 12:24:38 -05:00 |
|
Mark Felder
|
88ce0e8b24
|
Fix rel="me"
Cachex for this was not started
|
2023-02-20 12:24:32 -05:00 |
|
tusooa
|
3ab3404817
|
Fix block_from_stranger setting
|
2023-02-20 12:21:27 -05:00 |
|
Lain Soykaf
|
d5125e6ce7
|
B StripLocation: Add test, work for all svgs.
|
2023-02-20 12:21:04 -05:00 |
|
Dmytro Poltavchenko
|
e8fca8882a
|
Added SVG to formats not compatible with exiftool
|
2023-02-20 12:21:04 -05:00 |
|
tusooa
|
259905a893
|
Bump earmark to 1.4.22
|
2023-02-20 12:20:29 -05:00 |
|
Haelwenn
|
f76c1d4f70
|
Merge branch 'release/2.5.0' into 'stable'
Release 2.5.0
See merge request pleroma/pleroma!3816
|
2022-12-23 17:43:21 +00:00 |
|
Haelwenn (lanodan) Monnier
|
91c22637de
|
mix: Release 2.5.0
|
2022-12-23 17:10:02 +01:00 |
|
Haelwenn (lanodan) Monnier
|
ee7694fa91
|
CHANGELOG: Set 2.5.0
|
2022-12-23 17:09:57 +01:00 |
|
Haelwenn (lanodan) Monnier
|
5ce7db455c
|
Git merge is not my favorite tool
|
2022-12-23 17:07:26 +01:00 |
|
Haelwenn (lanodan) Monnier
|
3fbd42061c
|
Revert "Delete report notifs when demoting from superuser"
This reverts commit 4504c81080.
|
2022-12-23 17:06:09 +01:00 |
|
Haelwenn (lanodan) Monnier
|
7d68d64d63
|
Merge back 2.4.5
|
2022-12-23 17:05:05 +01:00 |
|
Haelwenn
|
6bce88b9e7
|
Merge branch 'pleromafe-2.5.0' into 'develop'
Update PleromaFE bundle to 2.5.0
See merge request pleroma/pleroma!3815
|
2022-12-23 14:32:10 +00:00 |
|
Haelwenn (lanodan) Monnier
|
2c5bc9cffd
|
Update PleromaFE bundle to 2.5.0
|
2022-12-23 15:01:49 +01:00 |
|
Haelwenn
|
99ff91584d
|
Merge branch 'adminfe-2.5.0' into 'develop'
Update AdminFE bundle to version 2.5.0
See merge request pleroma/pleroma!3814
|
2022-12-23 13:48:35 +00:00 |
|
Haelwenn
|
718ff64c3b
|
Merge branch 'fine_grained_moderation_privileges' into 'develop'
fine grained moderation privileges (continued)
See merge request pleroma/pleroma!3812
|
2022-12-23 13:48:07 +00:00 |
|
Sean King
|
90681c720d
|
Make lint happy
|
2022-12-21 23:40:39 -07:00 |
|
Sean King
|
351b5a9df4
|
Use crazy hack to finally get pleroma:report notifications not visible after revoking privileges
|
2022-12-21 23:35:39 -07:00 |
|
Sean King
|
3bb78ac152
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
|
2022-12-21 22:36:54 -07:00 |
|
Haelwenn (lanodan) Monnier
|
cf1d91c718
|
Update AdminFE bundle to version 2.5.0
|
2022-12-21 13:03:32 +01:00 |
|
lain
|
5910d58cf7
|
Merge branch 'weblate-extract' into 'develop'
Extract translatable strings
See merge request pleroma/pleroma!3813
|
2022-12-20 15:05:21 +00:00 |
|
weblate-extractor
|
b3d250a70a
|
Extract translatable strings
|
2022-12-20 06:11:50 +00:00 |
|
Sean King
|
e07fb6e7dc
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
|
2022-12-19 22:02:44 -07:00 |
|
lain
|
0840ce5671
|
Merge branch 'deletion-resilience' into 'develop'
Deletion resilience
See merge request pleroma/pleroma!3237
|
2022-12-20 03:07:59 +00:00 |
|
Sean King
|
d5d4c7c11d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
|
2022-12-19 18:48:26 -07:00 |
|
lain
|
7aa17cd651
|
Merge branch 'doc_readme_nixos' into 'develop'
add nixos to supported distros
See merge request pleroma/pleroma!3600
|
2022-12-20 01:13:03 +00:00 |
|
lain
|
c6dff687c0
|
Merge branch 'from/upstream/develop/tusooa/mrf-updates' into 'develop'
MRFs with Updates
See merge request pleroma/pleroma!3808
|
2022-12-20 00:51:41 +00:00 |
|
Sean King
|
1d95012758
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
|
2022-12-19 17:48:11 -07:00 |
|
lain
|
3311e0efed
|
Merge branch 'fix/2980-rss-feed-generation' into 'develop'
fix atom and rss feeds for users and tags
See merge request pleroma/pleroma!3783
|
2022-12-20 00:19:27 +00:00 |
|
lain
|
3dfa009ec3
|
Merge branch 'develop' into 'fix/2980-rss-feed-generation'
# Conflicts:
# CHANGELOG.md
|
2022-12-19 23:43:23 +00:00 |
|