7ee63904ec
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-22 19:20:52 +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
lain
0840ce5671
Merge branch 'deletion-resilience' into 'develop'
...
Deletion resilience
See merge request pleroma/pleroma!3237
2022-12-20 03:07:59 +00: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
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
marcin mikołajczak
2eaa1976ce
Merge branch 'translations-config' into 'develop'
...
Allow to enable translations for unauthenticated users or disable translating remote content
See merge request soapbox-pub/rebased!228
2022-12-19 23:57:13 +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
1f981686cd
Allow to enable translations for unauthenticated or disable translating remote content
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-19 23:55:09 +01: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
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
marcin mikołajczak
8a1898591e
Merge branch 'target-languages' into 'develop'
...
Include unspecified variants in target languages list for DeepL
See merge request soapbox-pub/rebased!227
2022-12-16 15:10:16 +00:00
214e8d7172
Include unspecified variants in target languages list for DeepL
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-16 15:55:28 +01: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
Lain Soykaf
bb27e4134b
AudioVideoValidator: Fix embedded attachment requirements
2022-12-15 18:06:28 -05:00
Lain Soykaf
4a32b584e1
StatusView: Fix warning
2022-12-15 18:02:33 -05:00
Lain Soykaf
9838790a7d
AttachmentValidator: Actually require url
2022-12-15 17:46:20 -05:00
Lain Soykaf
63d00f8123
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
2022-12-15 17:19:36 -05:00
tusooa
2554028097
Make SimplePolicy Update-aware
...
This is inspired by d5828f1c5e
2022-12-15 11:57:45 -05:00
tusooa
dc7efcd08b
Make TagPolicy Update-aware
...
This is inspired by d5828f1c5e
2022-12-15 11:08:24 -05:00
tusooa
62c27e0164
Fix failure when registering a user with no email when approval required
2022-12-14 01:04:42 -05:00
Alex Gleason
bed6f1c00c
Merge branch 'mix-user-approve' into 'develop'
...
Approve & confirm users created through the CLI
Closes #157
See merge request soapbox-pub/rebased!226
2022-12-14 00:09:18 +00:00
Alex Gleason
63757fd1fa
Approve & confirm users created through the CLI
2022-12-13 17:07:53 -06:00
duponin
9876742358
Return 413 when an actor's banner or background exceeds the size limit
2022-12-11 23:15:08 +01:00
duponin
452595baed
Uploading an avatar media exceeding max size returns a 413
...
Until now it was returning a 500 because the upload plug were going
through the changeset and ending in the JSON encoder, which raised
because struct has to @derive the encoder.
2022-12-11 22:54:47 +01:00
marcin mikołajczak
4c0b30e327
Merge branch 'post-languages' into 'develop'
...
Add supported languages list to /api/v2/instance
See merge request soapbox-pub/rebased!209
2022-12-11 12:12:58 +00:00
a30ac650bc
Merge remote-tracking branch 'soapbox/develop' into post-languages
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-10 23:17:44 +01:00
8447fbfba2
InstanceView: Move supported languages to pleroma.metadata
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-10 21:21:38 +01:00
Haelwenn
204fd6faae
Merge branch 'from/upstream-develop/tusooa/report-fake' into 'develop'
...
Report an Object, not a Create Activity
Closes #2986
See merge request pleroma/pleroma!3788
2022-12-09 14:25:24 +00:00
tusooa
da0c684344
Add tests for flagging non-Create activities
2022-12-08 20:51:08 -05:00
Alex Gleason
f435f364d7
Merge branch 'delete-chat' into 'develop'
...
Add ability to delete a chat
See merge request soapbox-pub/rebased!225
2022-12-08 17:23:13 +00:00
Alex Gleason
ab2d8817a9
Merge remote-tracking branch 'pleroma/2061-chat-deletion' into delete-chat
2022-12-08 11:06:12 -06:00
marcin mikołajczak
be301f1d92
Merge branch 'events-csp' into 'develop'
...
Add OSM tile server to CSP
See merge request soapbox-pub/rebased!224
2022-12-08 16:45:16 +00:00
Alex Gleason
100a744b61
Merge branch 'events-index' into 'develop'
...
Add events index
See merge request soapbox-pub/rebased!223
2022-12-08 16:06:30 +00:00