b7a831ca55
Merge branch 'from/upstream-develop/tusooa/require-changelog' into 'develop'
...
require changelog
See merge request pleroma/pleroma!3739
2023-04-05 07:53:11 +00:00
686c3e03bd
Fix counting
2023-04-04 12:24:45 -04:00
89a40b867d
Allow more than 1 changelog entry
2023-04-04 16:20:46 +00:00
ce16ff7ae8
mix: Update all dependencies
2023-04-04 11:19:38 +02:00
78a6f56295
Merge branch 'doc/add-fedistar' into 'develop'
...
Add Fedistar as a desktop client in docs
See merge request pleroma/pleroma!3866
2023-04-01 17:46:30 +00:00
e5f36f9f8d
Update contact information for Whalebird and Fedistar
2023-04-02 01:07:07 +09:00
17f1b8d133
Remove Roma from docs
...
Because this app is no longer maintained
2023-04-02 01:03:15 +09:00
81e1d6d9d0
Add Fedistar as a desktop client in docs
2023-04-02 01:02:22 +09:00
6a63dced4a
Fix tests for frontend installation
2023-03-30 19:25:35 +03:00
3037d2780c
Also list frontends that are not in the config file
2023-03-30 11:16:40 +03:00
d3b27d45a9
List installed frontend refs in admin API
2023-03-29 23:23:06 +03:00
4f7c11b281
Merge branch 'tusooa/3073-react-legacy' into 'develop'
...
Fix emoji reactions for legacy 2-tuple formats
Closes #3073
See merge request pleroma/pleroma!3861
2023-03-27 10:05:47 +00:00
c5d946bc92
Fix emoji reactions for legacy 2-tuple formats
2023-03-26 15:12:40 -04:00
67d1897c6e
Fix existing tests
2023-03-26 11:19:44 -04:00
10930f7507
Dedupe poll options
2023-03-25 23:20:07 -04:00
6d0cc8fa2a
Merge branch 'features/image-object' into 'develop'
...
Add support for Image objects
Closes #1581
See merge request pleroma/pleroma!3145
2023-03-25 06:35:55 +00:00
9c53d1fe19
Merge branch 'background-timeout' into 'develop'
...
Set background worker timeout to 15 minutes
See merge request pleroma/pleroma!3857
2023-03-25 05:40:35 +00:00
f463b7570e
Set background worker timeout to 15 minutes
2023-03-23 23:14:52 -07:00
bf9db78426
Merge branch 'docs-otp-support' into 'develop'
...
docs: Be more explicit about the level of compatibility of OTP releases
See merge request pleroma/pleroma!3849
2023-03-16 08:11:44 +00:00
353538d16c
Merge branch 'pleroma-akkoma-emoji-port' into 'develop'
...
Custom emoji reactions support
See merge request pleroma/pleroma!3845
2023-03-16 08:00:00 +00:00
c3600b6104
Merge branch 'feat/fields-rel-me-tag' into 'develop'
...
feat: build rel me tags with profile fields
See merge request pleroma/pleroma!3850
2023-03-16 07:53:27 +00:00
83c7415803
fix: append field values to bio before parsing
2023-03-15 23:55:24 +09:00
9145fd04f2
Merge branch 'remove-crypt' into 'develop'
...
Remove crypt(3) support
Closes #3030 and #3062
See merge request pleroma/pleroma!3847
2023-03-12 16:06:00 +00:00
d18441e9c4
Indicate in changelog that removal of crypt is breaking
2023-03-12 16:04:43 +00:00
2c2ea16b50
Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes
2023-03-12 11:39:17 +03:00
ea07ec51ef
Add support for Image objects
2023-03-09 14:21:12 +01:00
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
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
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
8241eff05b
remove static_fe pipeline for /users/:nickname/feed
2023-03-06 23:34:00 +05:00
7b42ec5633
oops, remove unused import
2023-03-06 02:44:36 +05:00
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
86ee4b72f3
modify Utils.scrub_html_and_truncate to take omission parameter
2023-03-06 02:30:52 +05:00
117a53b88e
format feed_view.ex
2023-03-06 01:16:24 +05:00
d3f22d24f6
feed eex templates: use published field from @data, not @activity.data
2023-03-06 00:23:31 +05:00
f33e89765a
fix tag feeds: remote activities might not have a summary field
2023-03-06 00:20:57 +05:00
8e072baed0
docs: Be more explicit about the level of compatibility of OTP releases
2023-03-05 08:55:18 +01:00
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
5716654d12
Remove crypt(3) support
...
This was used to support migration from GNU Social, which was used by at least
shitposter.club, should be entirely irrelevant now.
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3030
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3062
2023-03-05 01:37:57 +01:00
8d3b29aaba
Allow custom emoji reactions: add test for mixed emoji react, fix credo errors
2023-03-02 11:18:16 +03:00
4b85d1c617
Allow custom emoji reactions: Fix tests, mixed custom and unicode reactions
2023-03-02 11:18:16 +03:00
787e30c5fd
Allow reacting with remote emoji when they exist on the post ( #200 )
...
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/200
2023-03-02 11:18:16 +03:00
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
a0ec66ce7e
Make clear the test names
2023-03-01 21:14:52 -05:00
bec4e5ac31
Fix FederatorTest
2023-03-01 21:04:19 -05:00
1babd0798f
Stop oban from retrying if validating errors occur when processing incoming data
2023-03-01 21:03:30 -05:00
f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1
2023-03-01 20:09:50 -05:00
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
938e238ea1
Add the security fix to the changelog
2023-03-01 18:44:29 -05:00
e4925f813a
Sanitize filenames when uploading
2023-03-01 18:40:02 -05:00
Haelwenn