rinpatch
|
f930e83fa2
|
Merge branch 'fix/remove_auto_nsfw' into 'develop'
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
|
4 years ago |
|
rinpatch
|
67bde35e71
|
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
b1d4b2b81e
|
Add support for actor icon being a list (Bridgy)
|
4 years ago |
|
Ivan Tashkinov
|
5856f51717
|
[#3213] ActivityPub hashtags filtering refactoring. Test fix.
|
4 years ago |
|
Ivan Tashkinov
|
882dd46843
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
4 years ago |
|
Mark Felder
|
b1e1db82bc
|
Store application details in the object under the generator key, not application key
|
4 years ago |
|
lain
|
050c4b1f14
|
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336
|
4 years ago |
|
lain
|
e6a14e1cd1
|
Merge branch 'feat/client_app_details' into 'develop'
Support application field
See merge request pleroma/pleroma!3311
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
3bc7d12271
|
Remove sensitive-property setting #nsfw, create HashtagPolicy
|
4 years ago |
|
Mark Felder
|
d35b6254b4
|
Store the client application data in ActivityStreams format
|
4 years ago |
|
Ivan Tashkinov
|
77f3da0358
|
[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
7fc9cd0974
|
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
|
4 years ago |
|
Ivan Tashkinov
|
111bfdd3a0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
4 years ago |
|
Ivan Tashkinov
|
1dac7d1462
|
[#3213] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
|
4 years ago |
|
Mark Felder
|
fb2a8e7ccd
|
Additional validation so we don't get caught off guard with a nil response
if CommonAPI ever prevents us from injecting this data
|
4 years ago |
|
Mark Felder
|
3554a65f45
|
Inject fake application metadata and validate it is stripped by transmogrifier
|
4 years ago |
|
rinpatch
|
76414ad277
|
Merge branch 'bugfix/answer-outbox' into 'develop'
Add test for Answer presence into an authenticated /outbox
See merge request pleroma/pleroma!3269
|
4 years ago |
|
Ivan Tashkinov
|
5992382cf8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
|
4 years ago |
|
rinpatch
|
a853218701
|
Merge branch 'features/ap_id-c2s-authentication' into 'develop'
activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295
|
4 years ago |
|
Mark Felder
|
55a13fc360
|
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
Helps prevent accidental button mashes from submitting incomplete posts
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
8c7b3b20d8
|
activity_pub_controller: Add authentication to object & activity endpoints
|
4 years ago |
|
Ivan Tashkinov
|
d1c6dd97aa
|
[#3213] Partially addressed code review points.
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
fb25231fbe
|
Add test for Answer presence into an authenticated /outbox
|
4 years ago |
|
Ivan Tashkinov
|
4e14945670
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
|
4 years ago |
|
Ivan Tashkinov
|
cf4765af40
|
[#3213] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
|
4 years ago |
|
Ivan Tashkinov
|
1b49b8efe5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Ivan Tashkinov
|
6fd4163ab6
|
[#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
|
4 years ago |
|
Ivan Tashkinov
|
380d0cce6b
|
[#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
|
4 years ago |
|
Mark Felder
|
9272cef500
|
Switch to a build of Majic that does not try to fix extensions by default
|
4 years ago |
|
Mark Felder
|
e854c35e65
|
Convert tests to all use clear_config instead of Pleroma.Config.put
|
4 years ago |
|
Ivan Tashkinov
|
694d98be55
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
4 years ago |
|
Mark Felder
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
4 years ago |
|
Ivan Tashkinov
|
c041e9c630
|
[#3213] HashtagsTableMigrator: failures handling fix, retry function.
Changed default hashtags filtering strategy to non-aggregate approach.
|
4 years ago |
|
Ivan Tashkinov
|
2634a16b4c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
dfc4cb6ebd
|
Special handling for unconfirmed users based on instance config no longer needed.
|
4 years ago |
|
Mark Felder
|
28581e03ad
|
Merge branch 'develop' into refactor/deactivated_user_field
|
4 years ago |
|
Ivan Tashkinov
|
48b399cedb
|
[#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
|
4 years ago |
|
Mark Felder
|
d36182c088
|
Change user.confirmation_pending field to user.is_confirmed
|
4 years ago |
|
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
4 years ago |
|
Ivan Tashkinov
|
e350898828
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
c4439c630f
|
Bump Copyright to 2021
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
|
4 years ago |
|
lain
|
5822338f3a
|
Merge branch 'guppe-example' into 'develop'
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
|
4 years ago |
|
lain
|
80167e62dd
|
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
|
4 years ago |
|
lain
|
bd788c0939
|
ActivtityPub Test: Add example for guppe actor
|
4 years ago |
|
lain
|
cf0eb0c1c5
|
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
|
4 years ago |
|
Mark Felder
|
f9090e00e6
|
Add test to validate URLs to custom emojis are properly encoded
|
4 years ago |
|
lain
|
f0e6cff583
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
|
4 years ago |
|
lain
|
d44850d7a5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
|
4 years ago |
|
lain
|
8e5904daa5
|
SideEffects.DeleteTest: asyncify.
Replace Mock with Mox, mock out Logger.
|
4 years ago |
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
4 years ago |
