mint/pleroma
1
0
Fork 0
Code Releases Activity
15,159 Commits 1 Branch 0 Tags
ryona-dev
Commit Graph

9108 Commits

Author SHA1 Message Date
KiwiFarms 806352db1d Use get_cached just in case 2023-04-30 13:55:35 +03:00
KiwiFarms d563ba1b09 RULES OF NATURE 2023-04-28 22:57:46 +03:00
KiwiFarms 4293128496 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2023-04-28 22:56:30 +03:00
tusooa 248f914e6e Merge branch 'list-installed-frontends' into 'develop' 
List installed frontend refs in admin API

See merge request pleroma/pleroma!3862
 2023-04-27 02:56:19 +00:00
tusooa ddf57596be Merge branch 'bugfix/content-disposition' into 'develop' 
UploadedMedia: Add missing disposition_type to Content-Disposition

Closes #3114

See merge request pleroma/pleroma!3873
 2023-04-26 15:39:20 +00:00
duponin 0231a09310 Remove SSH/BBS feature from core 
And link to sshocial, the replacement client for this removed feature
 2023-04-23 10:47:07 +02:00
Haelwenn (lanodan) Monnier 2148ef5e2f UploadedMedia: Increase readability via ~s sigil 2023-04-18 00:12:42 +02:00
Haelwenn (lanodan) Monnier 8f0f58e28b UploadedMedia: Add missing disposition_type to Content-Disposition 
Set it to `inline` because the vast majority of what's sent is multimedia
content while `attachment` would have the side-effect of triggering a
download dialog.

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3114
 2023-04-18 00:09:19 +02:00
KiwiFarms da1cb1d3c4 Somewhat smarter rate limiting 2023-04-16 17:46:36 +03:00
KiwiFarms 21b1d99e69 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2023-04-16 15:15:23 +03:00
KiwiFarms 59c86300ae One policy to rule them all 2023-04-16 15:15:04 +03:00
KiwiFarms 4401beb8c0 Remove duplicate and outdated policies 2023-04-16 12:40:56 +03:00
Haelwenn 3867b52aef Merge branch 'tusooa/3027-dedupe-poll' into 'develop' 
Dedupe poll options

Closes #3027

See merge request pleroma/pleroma!3860
 2023-04-13 08:40:04 +00:00
KiwiFarms 65ff658994 Use cond & better non-matching clause handling 2023-04-02 19:06:11 +03:00
KiwiFarms 7afa34a336 Putting back the redundant filter blocks thanks to the FunctionClauseError 2023-04-02 18:07:20 +03:00
KiwiFarms aec5649c6a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2023-04-02 17:54:55 +03:00
KiwiFarms 980d7eec8a MediaRemovalPerActor policy 2023-04-02 17:54:24 +03:00
KiwiFarms 79f6e52c5d Frontend & custom policy update 2023-04-02 16:33:12 +03:00
Ekaterina Vaartis 6a63dced4a Fix tests for frontend installation 2023-03-30 19:25:35 +03:00
Ekaterina Vaartis 3037d2780c Also list frontends that are not in the config file 2023-03-30 11:16:40 +03:00
Ekaterina Vaartis d3b27d45a9 List installed frontend refs in admin API 2023-03-29 23:23:06 +03:00
tusooa c5d946bc92 Fix emoji reactions for legacy 2-tuple formats 2023-03-26 15:12:40 -04:00
tusooa 10930f7507 Dedupe poll options 2023-03-25 23:20:07 -04:00
KiwiFarms 842d748eaf Presented without commentary 2023-03-26 03:00:43 +03:00
KiwiFarms 88499215cf Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2023-03-26 03:00:28 +03:00
Haelwenn 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
anemone f463b7570e Set background worker timeout to 15 minutes 2023-03-23 23:14:52 -07:00
KiwiFarms 5b29e152a9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2023-03-16 18:05:26 +03:00
KiwiFarms 12261a05e8 Reverting my own custom reacts backport in preparation for upstream merge 2023-03-16 18:05:20 +03:00
Haelwenn 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
Haelwenn 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
kPherox 83c7415803 fix: append field values to bio before parsing 2023-03-15 23:55:24 +09:00
tusooa 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
Alexander Tumin 2c2ea16b50 Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes 2023-03-12 11:39:17 +03:00
Haelwenn (lanodan) Monnier ea07ec51ef Add support for Image objects 2023-03-09 14:21:12 +01: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
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
Haelwenn (lanodan) Monnier 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
KiwiFarms d22434707d Merge remote-tracking branch 'upstream/develop' into ryona-dev 2023-03-02 12:35:37 +03:00
Alexander Tumin 8d3b29aaba Allow custom emoji reactions: add test for mixed emoji react, fix credo errors 2023-03-02 11:18:16 +03:00
Alexander Tumin 4b85d1c617 Allow custom emoji reactions: Fix tests, mixed custom and unicode reactions 2023-03-02 11:18:16 +03:00
floatingghost 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