summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-02Revert "Merge branch 'copyright-bump' into 'develop'"lain
This reverts merge request !3825
2023-01-02Merge branch 'copyright-bump' into 'develop'Haelwenn
Bump copyright year See merge request pleroma/pleroma!3825
2023-01-01Bump copyright yearmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-24Merge branch 'weblate-extract' into 'develop'Haelwenn
Extract translatable strings See merge request pleroma/pleroma!3818
2022-12-24Extract translatable stringsweblate-extractor
2022-12-23Merge branch 'mergeback/2.5.0' into 'develop'Haelwenn
Mergeback: 2.5.0 See merge request pleroma/pleroma!3817
2022-12-23mix: version 2.5.50Haelwenn (lanodan) Monnier
2022-12-23Merge branch 'release/2.5.0' into 'stable'Haelwenn
Release 2.5.0 See merge request pleroma/pleroma!3816
2022-12-23mix: Release 2.5.0Haelwenn (lanodan) Monnier
2022-12-23CHANGELOG: Set 2.5.0Haelwenn (lanodan) Monnier
2022-12-23Git merge is not my favorite toolHaelwenn (lanodan) Monnier
2022-12-23Revert "Delete report notifs when demoting from superuser"Haelwenn (lanodan) Monnier
This reverts commit 4504c810802e2253599f06ddf6d58d3389fb23ac.
2022-12-23Merge back 2.4.5Haelwenn (lanodan) Monnier
2022-12-23Merge branch 'pleromafe-2.5.0' into 'develop'Haelwenn
Update PleromaFE bundle to 2.5.0 See merge request pleroma/pleroma!3815
2022-12-23Update PleromaFE bundle to 2.5.0Haelwenn (lanodan) Monnier
2022-12-23Merge branch 'adminfe-2.5.0' into 'develop'Haelwenn
Update AdminFE bundle to version 2.5.0 See merge request pleroma/pleroma!3814
2022-12-23Merge branch 'fine_grained_moderation_privileges' into 'develop'Haelwenn
fine grained moderation privileges (continued) See merge request pleroma/pleroma!3812
2022-12-21Make lint happySean King
2022-12-21Use crazy hack to finally get pleroma:report notifications not visible after ↵Sean King
revoking privileges
2022-12-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Sean King
fine_grained_moderation_privileges
2022-12-21Update AdminFE bundle to version 2.5.0Haelwenn (lanodan) Monnier
2022-12-20Merge branch 'weblate-extract' into 'develop'lain
Extract translatable strings See merge request pleroma/pleroma!3813
2022-12-20Extract translatable stringsweblate-extractor
2022-12-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Sean King
fine_grained_moderation_privileges
2022-12-20Merge branch 'deletion-resilience' into 'develop'lain
Deletion resilience See merge request pleroma/pleroma!3237
2022-12-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Sean King
fine_grained_moderation_privileges
2022-12-20Merge branch 'doc_readme_nixos' into 'develop'lain
add nixos to supported distros See merge request pleroma/pleroma!3600
2022-12-20Merge branch 'from/upstream/develop/tusooa/mrf-updates' into 'develop'lain
MRFs with Updates See merge request pleroma/pleroma!3808
2022-12-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Sean King
fine_grained_moderation_privileges
2022-12-20Merge branch 'fix/2980-rss-feed-generation' into 'develop'lain
fix atom and rss feeds for users and tags See merge request pleroma/pleroma!3783
2022-12-19Merge branch 'develop' into 'fix/2980-rss-feed-generation'lain
# Conflicts: # CHANGELOG.md
2022-12-19Merge branch 'fix-twittercard-tags' into 'develop'feld
Fix TwitterCard meta tags See merge request pleroma/pleroma!3811
2022-12-19Fix TwitterCard meta tagsMark Felder
TwitterCard meta tags are supposed to use the attributes "name" and "content". OpenGraph tags use the attributes "property" and "content". Twitter itself is smart enough to detect broken meta tags and discover the TwitterCard using "property" and "content", but other platforms that only implement parsing of TwitterCards and not OpenGraph may fail to correctly detect the tags as they're under the wrong attributes. > "Open Graph protocol also specifies the use of property and content attributes for markup while > Twitter cards use name and content. Twitter’s parser will fall back to using property and content, > so there is no need to modify existing Open Graph protocol markup if it already exists." [0] [0] https://developer.twitter.com/en/docs/twitter-for-websites/cards/guides/getting-started
2022-12-18Fix CommonAPI delete function to use User.privileged? instead of User.superuser?Sean King
2022-12-18Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Sean King
fine_grained_moderation_privileges
2022-12-19use to_rfc2822 instead of pub_date in tests, toofaried nawaz
2022-12-19document rss/atom fix in changelogfaried nawaz
2022-12-19modify user feed controller test to expect summary for titlefaried nawaz
2022-12-19remove pub_date() -- use to_rfc2822 insteadfaried nawaz
_tag_activity.xml.eex used activity_content() instead of activity_description(), and did not escape html properly.
2022-12-19remove ap_id test -- the element makes the feed breakfaried nawaz
2022-12-19fix: add xmlns:thr for in-reply-to refsfaried nawaz
2022-12-19fix: feed item title was escaped twicefaried nawaz
2022-12-19Implement RFC2822 timestamp formattingMark Felder
2022-12-19fix atom and rss feeds for users and tagsfaried nawaz
Changes: - make the XML closer to spec (RSS does not pass w3c's validator, but works) - fix dates (RFC3339 for Atom, doc says RFC822 for RSS but RFC1123 is closer) - fix attachment/enclosure links (but see below) - set feed item title to post's "summary" if present - pruned several elements that validators did not like - examples: ap_enabled, user banner urls. Specs: - https://www.rssboard.org/rss-specification - https://validator.w3.org/feed/docs/atom.html - https://www.intertwingly.net/wiki/pie/Rss20AndAtom10Compared Validators: - https://validator.w3.org/feed/ - https://rssatom.com/feedvalidator.php Attachment/enclosure links should have a "length" field (mandatory according to the spec). This is not present in the object's data map.
2022-12-16Merge branch 'fix-amd64-musl' into 'develop'lain
CI: Fix image for amd64-musl See merge request pleroma/pleroma!3810
2022-12-16CI: Fix image for amd64-muslLain Soykaf
2022-12-16Merge branch 'weblate-extract' into 'develop'tusooa
Extract translatable strings See merge request pleroma/pleroma!3764
2022-12-16Extract translatable stringsweblate-extractor
2022-12-16Merge branch 'fix-2856' into 'develop'tusooa
Uploading an avatar media exceeding max size returns a 413 Closes #2856 See merge request pleroma/pleroma!3804
2022-12-16Merge branch 'update-deps' into 'develop'lain
Update to Phoenix 1.6, Elixir 1.11, and chase dependencies See merge request pleroma/pleroma!3766
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 21:10:12 +0000