0fe3f749ea
Merge branch 'copyright-bump' into 'develop'
...
Bump copyright year
See merge request pleroma/pleroma!3825
2023-01-02 16:38:34 +00:00
10886eeaa2
Bump copyright year
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-01 12:13:06 +01:00
45646ff52c
TagValidator: Add test for Link tag
2022-12-30 20:55:02 +00:00
39e4b788ad
Remove unwanted code specific to MIX_ENV=test
2022-12-30 15:36:21 -05:00
bea43aba33
Fix rel="me"
...
Cachex for this was not started
2022-12-29 19:42:14 +00:00
c7dc5ce85c
TagValidator: Allow unrecognized Tag types
2022-12-29 14:21:20 +00:00
4b66f2b7f1
Bump earmark to 1.4.22
2022-12-28 11:57:29 -05:00
2bc6911139
Merge branch 'weblate-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3818
2022-12-24 11:01:22 +00:00
64eef1eae4
Extract translatable strings
2022-12-24 06:06:39 +00:00
179efd9467
Make backup parameters configurable
2022-12-24 00:20:25 -05:00
7d3e4eaeb9
Log errors more extensively
2022-12-24 00:04:51 -05:00
070fbb89e1
Lint
2022-12-24 00:04:51 -05:00
a1b95922c5
Fix compile error
2022-12-24 00:04:50 -05:00
46ab97d721
Simplify backup update clause
2022-12-24 00:04:50 -05:00
bdd63d2a3a
Expose backup status via Pleroma API
2022-12-24 00:04:50 -05:00
e4ac2a7cd6
Detail backup states
2022-12-24 00:04:32 -05:00
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
6126f203d3
mix: version 2.5.50
2022-12-23 18:46:14 +01:00
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
91c22637de
mix: Release 2.5.0
2022-12-23 17:10:02 +01:00
ee7694fa91
CHANGELOG: Set 2.5.0
2022-12-23 17:09:57 +01:00
5ce7db455c
Git merge is not my favorite tool
2022-12-23 17:07:26 +01:00
3fbd42061c
Revert "Delete report notifs when demoting from superuser"
...
This reverts commit 4504c81080
2022-12-23 17:06:09 +01:00
7d68d64d63
Merge back 2.4.5
2022-12-23 17:05:05 +01:00
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
2c5bc9cffd
Update PleromaFE bundle to 2.5.0
2022-12-23 15:01:49 +01:00
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
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
90681c720d
Make lint happy
2022-12-21 23:40:39 -07:00
351b5a9df4
Use crazy hack to finally get pleroma:report notifications not visible after revoking privileges
2022-12-21 23:35:39 -07:00
3bb78ac152
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-21 22:36:54 -07:00
cf1d91c718
Update AdminFE bundle to version 2.5.0
2022-12-21 13:03:32 +01:00
398141da68
Merge remote-tracking branch 'upstream/develop' into meilisearch
2022-12-20 21:00:07 +03:00
5910d58cf7
Merge branch 'weblate-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3813
2022-12-20 15:05:21 +00:00
b3d250a70a
Extract translatable strings
2022-12-20 06:11:50 +00:00
e07fb6e7dc
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 22:02:44 -07:00
0840ce5671
Merge branch 'deletion-resilience' into 'develop'
...
Deletion resilience
See merge request pleroma/pleroma!3237
2022-12-20 03:07:59 +00:00
d5d4c7c11d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 18:48:26 -07:00
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
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
1d95012758
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 17:48:11 -07:00
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
3dfa009ec3
Merge branch 'develop' into 'fix/2980-rss-feed-generation'
...
# Conflicts:
# CHANGELOG.md
2022-12-19 23:43:23 +00:00
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
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
c58eb873dd
Fix CommonAPI delete function to use User.privileged? instead of User.superuser?
2022-12-18 22:05:07 -07:00
60df2d8a97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-18 22:03:48 -07:00
fce2998481
use to_rfc2822 instead of pub_date in tests, too
2022-12-19 01:44:47 +05:00
96cfc9575c
document rss/atom fix in changelog
2022-12-19 01:44:47 +05:00
c49316faee
modify user feed controller test to expect summary for title
2022-12-19 01:44:47 +05:00
Haelwenn