hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14,958 commits 1 branch 0 tags 221 MiB
Commit graph

14,958 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Jameson
ece1f7bca6 Revert "testing newer pot" 
This reverts commit f72beb6c26.
 2023-03-20 21:29:24 +02:00
Henry Jameson
f72beb6c26 testing newer pot 2023-03-10 00:08:08 +02:00
Henry Jameson
5f29bf2e4f Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (57 commits)
  remove static_fe pipeline for /users/:nickname/feed
  oops, remove unused import
  use scrub_html_and_truncate instead of scrub_html for feed item title
  modify Utils.scrub_html_and_truncate to take omission parameter
  format feed_view.ex
  feed eex templates: use published field from @data, not @activity.data
  fix tag feeds: remote activities might not have a summary field
  Make clear the test names
  Fix FederatorTest
  Stop oban from retrying if validating errors occur when processing incoming data
  Add the security fix to the changelog
  Sanitize filenames when uploading
  Allow with_relationships param for blocks
  Bundle frontend
  Bump version in mix project to 2.5.1
  Compose changelog for 2.5.1
  Ignores in exiftool read descriptions
  Bump crypt to v1.0.1
  Update mix.exs
  Bump linkify
  ...
 2023-03-09 23:19:11 +02:00
Haelwenn
f5c6e44731 Merge branch 'tusooa/block-rel' into 'develop' 
Allow with_relationships param for blocks

See merge request pleroma/pleroma!3843
 2023-03-09 13:13:14 +00:00
Haelwenn
5cc23dc382 Merge branch 'fix/tag-feed-crashes' into 'develop' 
fix: atom/rss feed issues

Closes #3045

See merge request pleroma/pleroma!3851
 2023-03-06 22:55:24 +00:00
Haelwenn
0a042979b8 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-06 21:08:27 +00:00
faried nawaz
8241eff05b remove static_fe pipeline for /users/:nickname/feed 2023-03-06 23:34:00 +05:00
faried nawaz
7b42ec5633 oops, remove unused import 2023-03-06 02:44:36 +05:00
faried nawaz
141146d1f1 use scrub_html_and_truncate instead of scrub_html for feed item title 
Sometimes this truncated properly encoded HTML entities in the
wrong place.  The new flow calls scrub_html, removes emojis,
decodes entities (a second time), truncates, and then re-encodes.

Fixes #3045.
 2023-03-06 02:38:02 +05:00
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
Haelwenn
c00a19f371 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-05 06:37:59 +00: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
a0ec66ce7e
 		Make clear the test names 2023-03-01 21:14:52 -05:00
tusooa
bec4e5ac31
 		Fix FederatorTest 2023-03-01 21:04:19 -05:00
tusooa
1babd0798f
 		Stop oban from retrying if validating errors occur when processing incoming data 2023-03-01 21:03:30 -05: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
d83f16fe44
 		Allow with_relationships param for blocks 2023-02-28 22:16:01 -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