Mark Felder
bea43aba33
Fix rel="me"
...
Cachex for this was not started
2022-12-29 19:42:14 +00:00
tusooa
4b66f2b7f1
Bump earmark to 1.4.22
2022-12-28 11:57:29 -05:00
Haelwenn
2bc6911139
Merge branch 'weblate-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3818
2022-12-24 11:01:22 +00:00
weblate-extractor
64eef1eae4
Extract translatable strings
2022-12-24 06:06:39 +00:00
Haelwenn
b367f22256
Merge branch 'mergeback/2.5.0' into 'develop'
...
Mergeback: 2.5.0
See merge request pleroma/pleroma!3817
2022-12-23 18:15:52 +00:00
Haelwenn (lanodan) Monnier
6126f203d3
mix: version 2.5.50
2022-12-23 18:46:14 +01:00
Haelwenn
f76c1d4f70
Merge branch 'release/2.5.0' into 'stable'
...
Release 2.5.0
See merge request pleroma/pleroma!3816
2022-12-23 17:43:21 +00:00
Haelwenn (lanodan) Monnier
91c22637de
mix: Release 2.5.0
2022-12-23 17:10:02 +01:00
Haelwenn (lanodan) Monnier
ee7694fa91
CHANGELOG: Set 2.5.0
2022-12-23 17:09:57 +01:00
Haelwenn (lanodan) Monnier
5ce7db455c
Git merge is not my favorite tool
2022-12-23 17:07:26 +01:00
Haelwenn (lanodan) Monnier
3fbd42061c
Revert "Delete report notifs when demoting from superuser"
...
This reverts commit 4504c81080
.
2022-12-23 17:06:09 +01:00
Haelwenn (lanodan) Monnier
7d68d64d63
Merge back 2.4.5
2022-12-23 17:05:05 +01:00
Haelwenn
6bce88b9e7
Merge branch 'pleromafe-2.5.0' into 'develop'
...
Update PleromaFE bundle to 2.5.0
See merge request pleroma/pleroma!3815
2022-12-23 14:32:10 +00:00
Haelwenn (lanodan) Monnier
2c5bc9cffd
Update PleromaFE bundle to 2.5.0
2022-12-23 15:01:49 +01:00
Haelwenn
99ff91584d
Merge branch 'adminfe-2.5.0' into 'develop'
...
Update AdminFE bundle to version 2.5.0
See merge request pleroma/pleroma!3814
2022-12-23 13:48:35 +00:00
Haelwenn
718ff64c3b
Merge branch 'fine_grained_moderation_privileges' into 'develop'
...
fine grained moderation privileges (continued)
See merge request pleroma/pleroma!3812
2022-12-23 13:48:07 +00:00
Sean King
90681c720d
Make lint happy
2022-12-21 23:40:39 -07:00
Sean King
351b5a9df4
Use crazy hack to finally get pleroma:report notifications not visible after revoking privileges
2022-12-21 23:35:39 -07:00
Sean King
3bb78ac152
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-21 22:36:54 -07:00
Haelwenn (lanodan) Monnier
cf1d91c718
Update AdminFE bundle to version 2.5.0
2022-12-21 13:03:32 +01:00
lain
5910d58cf7
Merge branch 'weblate-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3813
2022-12-20 15:05:21 +00:00
weblate-extractor
b3d250a70a
Extract translatable strings
2022-12-20 06:11:50 +00:00
Sean King
e07fb6e7dc
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 22:02:44 -07:00
lain
0840ce5671
Merge branch 'deletion-resilience' into 'develop'
...
Deletion resilience
See merge request pleroma/pleroma!3237
2022-12-20 03:07:59 +00:00
Sean King
d5d4c7c11d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 18:48:26 -07:00
lain
7aa17cd651
Merge branch 'doc_readme_nixos' into 'develop'
...
add nixos to supported distros
See merge request pleroma/pleroma!3600
2022-12-20 01:13:03 +00:00
lain
c6dff687c0
Merge branch 'from/upstream/develop/tusooa/mrf-updates' into 'develop'
...
MRFs with Updates
See merge request pleroma/pleroma!3808
2022-12-20 00:51:41 +00:00
Sean King
1d95012758
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 17:48:11 -07:00
lain
3311e0efed
Merge branch 'fix/2980-rss-feed-generation' into 'develop'
...
fix atom and rss feeds for users and tags
See merge request pleroma/pleroma!3783
2022-12-20 00:19:27 +00:00
lain
3dfa009ec3
Merge branch 'develop' into 'fix/2980-rss-feed-generation'
...
# Conflicts:
# CHANGELOG.md
2022-12-19 23:43:23 +00:00
feld
1946b49ebe
Merge branch 'fix-twittercard-tags' into 'develop'
...
Fix TwitterCard meta tags
See merge request pleroma/pleroma!3811
2022-12-19 23:13:53 +00:00
Mark Felder
72d4d1b392
Fix TwitterCard meta tags
...
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-19 17:23:12 -05:00
Sean King
c58eb873dd
Fix CommonAPI delete function to use User.privileged? instead of User.superuser?
2022-12-18 22:05:07 -07:00
Sean King
60df2d8a97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-18 22:03:48 -07:00
faried nawaz
fce2998481
use to_rfc2822 instead of pub_date in tests, too
2022-12-19 01:44:47 +05:00
faried nawaz
96cfc9575c
document rss/atom fix in changelog
2022-12-19 01:44:47 +05:00
faried nawaz
c49316faee
modify user feed controller test to expect summary for title
2022-12-19 01:44:47 +05:00
faried nawaz
0f67eab384
remove pub_date() -- use to_rfc2822 instead
...
_tag_activity.xml.eex used activity_content() instead
of activity_description(), and did not escape html properly.
2022-12-19 01:44:46 +05:00
faried nawaz
f597b1b3e6
remove ap_id test -- the element makes the feed break
2022-12-19 01:44:46 +05:00
faried nawaz
3f63caee2a
fix: add xmlns:thr for in-reply-to refs
2022-12-19 01:44:46 +05:00
faried nawaz
8d500977a6
fix: feed item title was escaped twice
2022-12-19 01:44:46 +05:00
Mark Felder
f3253c0c6a
Implement RFC2822 timestamp formatting
2022-12-19 01:44:46 +05:00
faried nawaz
3f0783c0a5
fix atom and rss feeds for users and tags
...
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-19 01:44:41 +05:00
lain
8db82932a7
Merge branch 'fix-amd64-musl' into 'develop'
...
CI: Fix image for amd64-musl
See merge request pleroma/pleroma!3810
2022-12-16 20:29:48 +00:00
Lain Soykaf
8e6f2624a8
CI: Fix image for amd64-musl
2022-12-16 14:32:30 -05:00
tusooa
59eaab3e7d
Merge branch 'weblate-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3764
2022-12-16 17:20:16 +00:00
weblate-extractor
cfca9544e8
Extract translatable strings
2022-12-16 16:59:26 +00:00
tusooa
a3985aac91
Merge branch 'fix-2856' into 'develop'
...
Uploading an avatar media exceeding max size returns a 413
Closes #2856
See merge request pleroma/pleroma!3804
2022-12-16 16:15:36 +00:00
lain
301eb86b35
Merge branch 'update-deps' into 'develop'
...
Update to Phoenix 1.6, Elixir 1.11, and chase dependencies
See merge request pleroma/pleroma!3766
2022-12-16 00:36:59 +00:00
lain
c0cfc454ba
Merge branch 'from/upstream-develop/tusooa/register-approval' into 'develop'
...
Fix failure when registering a user with no email when approval required
Closes #3021
See merge request pleroma/pleroma!3807
2022-12-15 23:07:49 +00:00