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 |
|
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 |
|
Ivan Tashkinov
|
2634a16b4c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Alexander Strizhakov
|
6d48144a9d
|
use proper naming
for MediaProxyWarmingPolicy in ConcurrentLimiter
|
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
|
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
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
4 years ago |
|
Haelwenn
|
3966add048
|
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
|
4 years ago |
|
Haelwenn
|
b122b6ffa3
|
Merge branch 'features/hashtag-column' into 'develop'
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
18b536c176
|
Pleroma.Object/1: take %Object{} as argument instead
|
4 years ago |
|
Alexander Strizhakov
|
2e859794ee
|
non condition dir creation
|
4 years ago |
|
Alexander Strizhakov
|
7bfb041658
|
insreasing test coverage for StealEmojiPolicy
|
4 years ago |
|
Alexander Strizhakov
|
aafd7b44ce
|
check dir existence in policy
|
4 years ago |
|
Ivan Tashkinov
|
4134abef63
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
87b13c5430
|
Create Object.hashtags/1 wrapper
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
acb03d591b
|
Insert text representation of hashtags into object["hashtags"]
Includes a new mix task: pleroma.database fill_old_hashtags
|
4 years ago |
|
Ivan Tashkinov
|
ee221277b0
|
Encapsulation of tags / hashtags fetching from objects.
|
4 years ago |
|
lain
|
ab633e51ab
|
Linting
|
4 years ago |
|
feld
|
cd1b4155d5
|
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
|
4 years ago |
|
Alexander Strizhakov
|
8d218ebaf5
|
Moving some background jobs into simple tasks
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
|
4 years ago |
|
Alexander Strizhakov
|
f97f24b067
|
making credo happy and test fix
|
4 years ago |
|
Alexander Strizhakov
|
efc27f6464
|
fix for adminFE
- revert UserAllowPolicy description
- MRF descriptions order
|
4 years ago |
|
Alexander Strizhakov
|
485697d96c
|
config descriptions for custom MRF policies
|
4 years ago |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
abf25e5d52
|
Create MRF.filter_pipeline to inject :object_data when present
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
3a0f99ed35
|
KeywordPolicy: Still match when fields are absent
|
4 years ago |
|
Ivan Tashkinov
|
2f155fb89f
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
4 years ago |
|
Mark Felder
|
c0b36621f1
|
Ensure we only apply NSFW Simple policy on parsable objects
|
4 years ago |
|
Ivan Tashkinov
|
0bda85857e
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
|
4 years ago |
|
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
4 years ago |
|
Ivan Tashkinov
|
148bc24435
|
[#2497] Removed Hackney-specific code
(no longer needed due to adapter options unification).
|
4 years ago |
|
Mark Felder
|
4ee99dafcc
|
Merge branch 'develop' into media-preview-proxy
|
4 years ago |
|
Mark Felder
|
21efda2edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
|
4 years ago |
|
Alibek Omarov
|
95688c90ad
|
ForceBotUnlistedPolicy: simplify code
|
4 years ago |
|
Alibek Omarov
|
8b695c3eeb
|
ForceBotUnlistedPolicy: format
|
4 years ago |
|
Alibek Omarov
|
699224a900
|
ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version
|
4 years ago |
|
Alexander Strizhakov
|
696bf09433
|
passing adapter options directly without adapter key
|
4 years ago |
|
Alexander Strizhakov
|
a83916fdac
|
adapter options unification
not needed options deletion
|
4 years ago |
|
Ivan Tashkinov
|
88a6ee4a59
|
[#2497] Func defs grouping fix.
|
4 years ago |
|
Ivan Tashkinov
|
f170d47130
|
[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
Removed :preview pool in favor of existing :media one. Misc. refactoring.
|
4 years ago |
|
Mark Felder
|
4e6eb22b4a
|
Try to warm the cache with the preview image if preview proxy enabled
|
4 years ago |
|
Egor Kislitsyn
|
91fbb5b21f
|
Fix ActivityExpirationPolicy
|
4 years ago |
|
lain
|
56b5b9aa27
|
Merge branch 'follower-mrf-again' into 'develop'
Follower mrf again
See merge request pleroma/pleroma!2833
|
4 years ago |
|
lain
|
10c792110e
|
MRF Object Age Policy: Don't break on messages without cc/to
|
4 years ago |
|
lain
|
4b18a07392
|
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
This reverts merge request !2825
|
4 years ago |
|
lain
|
010d77ec85
|
Revert "Merge branch 'mrf-silence-2' into 'develop'"
This reverts merge request !2820
|
4 years ago |
|
lain
|
1dd162a5f7
|
SimplePolicy: Fix problem with DM leaks.
|
4 years ago |
|
Alex Gleason
|
702f0fb822
|
Merge remote-tracking branch 'upstream/develop' into mrf-silence
|
4 years ago |
|
Alex Gleason
|
93638935d7
|
SimpleMRF: :silence --> :followers_only
|
4 years ago |
