summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-02-09Merge branch 'fix-relme' into 'develop'lain
Fix rel="me" See merge request pleroma/pleroma!3824
2023-02-09Merge branch 'tusooa/notif-setting' into 'develop'lain
Fix block_from_stranger setting See merge request pleroma/pleroma!3833
2023-02-09Merge branch 'test-warnings' into 'develop'lain
Fix warnings in tests, treat warnings as errors in CI. See merge request pleroma/pleroma!3827
2023-02-09B TestHelper, CI: Work with older elixir version.Lain Soykaf
2023-02-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into test-warningsLain Soykaf
2023-01-18Fix block_from_stranger settingtusooa
2023-01-05Merge branch '2768-strip-location' into 'develop'lain
Resolve "Exiftool may conflict with SVG files" Closes #2768 See merge request pleroma/pleroma!3829
2023-01-05B StripLocation: Add test, work for all svgs.Lain Soykaf
2023-01-05Added SVG to formats not compatible with exiftoolDmytro Poltavchenko
2023-01-03Merge branch 'tusooa/earmark' into 'develop'lain
Bump earmark to 1.4.~34~22 Closes #3033 See merge request pleroma/pleroma!3820
2023-01-03B TestHelper: Remove warnings-as-errorsLain Soykaf
It's already set in mix.exs
2023-01-03Tests: Capture logs to clean up the test output.Lain Soykaf
2023-01-03Fix warnings in tests, treat warnings as errors in CI.Lain Soykaf
The warnings revealed two bad tests, the code still worked but the test didn't actually test for it. Activating this for CI to prevent issues like these in the future.
2023-01-02Merge branch 'revert-0fe3f749' into 'develop'lain
Revert "Merge branch 'copyright-bump' into 'develop'" See merge request pleroma/pleroma!3826
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-30Remove unwanted code specific to MIX_ENV=testMark Felder
2022-12-29Fix rel="me"Mark Felder
Cachex for this was not started
2022-12-28Bump earmark to 1.4.22tusooa
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 17:54:12 +0000