faried nawaz
|
86ee4b72f3
|
modify Utils.scrub_html_and_truncate to take omission parameter
|
2023-03-06 02:30:52 +05:00 |
|
faried nawaz
|
117a53b88e
|
format feed_view.ex
|
2023-03-06 01:16:24 +05:00 |
|
faried nawaz
|
d3f22d24f6
|
feed eex templates: use published field from @data, not @activity.data
|
2023-03-06 00:23:31 +05:00 |
|
faried nawaz
|
f33e89765a
|
fix tag feeds: remote activities might not have a summary field
|
2023-03-06 00:20:57 +05:00 |
|
tusooa
|
714bf0cb23
|
Merge branch 'mergeback/2.5.1' into 'develop'
mergeback: 2.5.1
See merge request pleroma/pleroma!3846
|
2023-03-02 02:25:11 +00:00 |
|
tusooa
|
f33401f54b
|
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
|
2023-03-01 20:09:50 -05: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 |
|
tusooa
|
8a0162cd96
|
Merge branch 'weblate-extract' into 'develop'
Extract translatable strings
See merge request pleroma/pleroma!3839
|
2023-02-19 00:21:24 +00:00 |
|
weblate-extractor
|
274b3a0d26
|
Extract translatable strings
|
2023-02-18 06:06:52 +00:00 |
|
lain
|
19933a06bf
|
Merge branch 'tusooa/exiftool' into 'develop'
Ignores in exiftool read descriptions
See merge request pleroma/pleroma!3840
|
2023-02-13 17:10:58 +00:00 |
|
lain
|
a5509de389
|
Merge branch 'upgrade/crypt' into 'develop'
Bump crypt to v1.0.1
See merge request pleroma/pleroma!3838
|
2023-02-13 17:10:17 +00:00 |
|
tusooa
|
024bb27fc7
|
Ignores in exiftool read descriptions
|
2023-02-11 00:30:52 -05:00 |
|
Sean King
|
bf346cf07c
|
Bump crypt to v1.0.1
|
2023-02-09 23:06:04 -07:00 |
|
lain
|
d0b781ab69
|
Merge branch 'from/upstream-develop/tusooa/2974-zwnj' into 'develop'
Bump linkify - Fix zwnj in tags and double-dot links
Closes #2974 and #3022
See merge request pleroma/pleroma!3830
|
2023-02-09 21:25:15 +00:00 |
|
lain
|
7abb248ceb
|
Merge branch 'notification-content-filtering-noobj' into 'develop'
Require related object for content-filtering on notification
See merge request pleroma/pleroma!3837
|
2023-02-09 19:54:59 +00:00 |
|
lain
|
00b39dea5d
|
Merge branch 'tusooa/3059-report-fake-create-render' into 'develop'
Fix inproper content being cached in report content
Closes #3059
See merge request pleroma/pleroma!3836
|
2023-02-09 19:52:01 +00:00 |
|
lain
|
755279e253
|
Merge branch 'tusooa/api-spec-property-map' into 'develop'
OpenApiSpex: overhaul
See merge request pleroma/pleroma!3832
|
2023-02-09 19:50:59 +00:00 |
|
lain
|
a7079057a9
|
Merge branch 'tusooa/docker-hexpm' into 'develop'
Use versioned image from hexpm for docker images
See merge request pleroma/pleroma!3834
|
2023-02-09 19:47:00 +00:00 |
|
lain
|
7138910f30
|
Update mix.exs
|
2023-02-09 14:37:34 -05:00 |
|
lain
|
724bf7c647
|
Merge branch 'tusooa/3055-instance-languages' into 'develop'
Allow customizing instance languages
Closes #3055
See merge request pleroma/pleroma!3835
|
2023-02-09 19:23:29 +00:00 |
|
lain
|
50abb54d15
|
Merge branch 'fix-relme' into 'develop'
Fix rel="me"
See merge request pleroma/pleroma!3824
|
2023-02-09 19:09:54 +00:00 |
|
lain
|
4d3c2fb21b
|
Merge branch 'tusooa/notif-setting' into 'develop'
Fix block_from_stranger setting
See merge request pleroma/pleroma!3833
|
2023-02-09 19:09:23 +00:00 |
|
lain
|
16276c8f87
|
Merge branch 'test-warnings' into 'develop'
Fix warnings in tests, treat warnings as errors in CI.
See merge request pleroma/pleroma!3827
|
2023-02-09 19:05:50 +00:00 |
|
Lain Soykaf
|
8583b3721d
|
B TestHelper, CI: Work with older elixir version.
|
2023-02-09 12:36:02 -05:00 |
|
Lain Soykaf
|
e412363ff8
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into test-warnings
|
2023-02-09 12:28:02 -05:00 |
|
Alexander Tumin
|
55a8aa9787
|
Require related object for notifications to filter on content
|
2023-02-08 13:07:34 +03:00 |
|
tusooa
|
08132002d2
|
Fix inproper content being cached in report content
|
2023-02-03 16:00:39 -05:00 |
|
tusooa
|
bc7ec43179
|
Allow customizing instance languages
|
2023-01-26 20:17:13 -05:00 |
|
tusooa
|
1cf20184ff
|
Use versioned image from hexpm
|
2023-01-18 19:01:10 -05:00 |