Haelwenn
|
44b2a137d1
|
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install file-dev in alpine release targets
See merge request pleroma/pleroma!3095
|
4 years ago |
Haelwenn (lanodan) Monnier
|
ccd1e75e35
|
CI: Install file-dev in alpine release targets
|
4 years ago |
Haelwenn
|
fe160330e6
|
Merge branch 'fix/autofollower-suggestions' into 'develop'
Remove suggestions for autofollower_nicknames
See merge request pleroma/pleroma!3088
|
4 years ago |
Egor Kislitsyn
|
c1976d5b19
|
Fix credo warnings
|
4 years ago |
lain
|
e97b254c6b
|
Transmogrifier: Refactor and unify incoming tag handling
|
4 years ago |
lain
|
39fd4d7639
|
Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
|
4 years ago |
Egor Kislitsyn
|
98f32cf820
|
Fix tests
|
4 years ago |
Egor Kislitsyn
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
4 years ago |
Haelwenn
|
0495a07dc7
|
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
|
4 years ago |
Ivan Tashkinov
|
524fb0e4c2
|
[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
Added tests and documentation.
|
4 years ago |
feld
|
be611b143b
|
Merge branch 'chore/changelogfix' into 'develop'
Fix duplicate Added sections in the changelog
See merge request pleroma/pleroma!3091
|
4 years ago |
Mark Felder
|
d16336e7fb
|
Document autofollowing_nicknames
|
4 years ago |
Mark Felder
|
cb3ee4d543
|
Fix duplicate Added sections in the changelog
|
4 years ago |
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
Ivan Tashkinov
|
d54233760f
|
[#3053] Post-merge fix.
|
4 years ago |
Ivan Tashkinov
|
049ece1ef3
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
|
4 years ago |
Mark Felder
|
efd6572ffb
|
Remove suggestions
|
4 years ago |
Mark Felder
|
405f27b4f8
|
The suggestions are problematic as they need to be real local account names
|
4 years ago |
Mark Felder
|
1b8fd7e65a
|
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
|
4 years ago |
Haelwenn (lanodan) Monnier
|
aafdc975bd
|
federation_status: Add ApiSpec
|
4 years ago |
Haelwenn (lanodan) Monnier
|
3b5a7a6b14
|
federation_status: New endpoint showing unreachable instances
|
4 years ago |
feld
|
023f726d7f
|
Merge branch 'refactor/discoverable_user_field' into 'develop'
Change user.discoverable field to user.is_discoverable
See merge request pleroma/pleroma!3078
|
4 years ago |
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
Haelwenn
|
724e4b7f00
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
feld
|
5703fb6d2a
|
Merge branch 'issue/2009' into 'develop'
[#2009] fixed install docs (release env)
See merge request pleroma/pleroma!2854
|
4 years ago |
Maksim Pechnikov
|
2030ffd490
|
fix test
|
4 years ago |
Maksim Pechnikov
|
cf53e300f8
|
added generate the release env to `pleroma.instance gen`
|
4 years ago |
Maksim Pechnikov
|
595da6080d
|
fixed install docs
|
4 years ago |
Maksim Pechnikov
|
2f6bbd53b5
|
fix docs
|
4 years ago |
Maksim
|
e2333f757a
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
Maksim
|
499df7b73a
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
Maksim Pechnikov
|
14054cd004
|
update task messages
|
4 years ago |
Maksim Pechnikov
|
20e68b30f0
|
added generated `pleroma.env`
|
4 years ago |
Egor Kislitsyn
|
a859d9bc15
|
Update dependencies
|
4 years ago |
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
4 years ago |
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
4 years ago |
feld
|
b48724afcd
|
Merge branch 'docs-indigenous' into 'develop'
Change handle and url of contact person for Indigenous client
See merge request pleroma/pleroma!3082
|
4 years ago |
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
feld
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
4 years ago |
swentel
|
42112b842c
|
Change handle and url of contact person for Indigenous client
|
4 years ago |
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
4 years ago |
Haelwenn
|
9a85ec0da0
|
Merge branch 'refactor/locked_user_field' into 'develop'
Change user.locked field to user.is_locked
See merge request pleroma/pleroma!3077
|
4 years ago |
Mark Felder
|
ed61002815
|
Undo API breaking changes
|
4 years ago |
Mark Felder
|
b001237b79
|
Finish undoing API breakage
|
4 years ago |
Mark Felder
|
3242cfef20
|
Undo API breaking changes
|
4 years ago |
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
4 years ago |
Mark Felder
|
8b20c4d275
|
Missed tests
|
4 years ago |
Ali Riza Keles
|
943f65c739
|
Include python script and description
|
4 years ago |
Haelwenn
|
481906207e
|
Merge branch 'bugfix/file-consistency-prod' into 'develop'
Move Consistency.FileLocation to ./test
See merge request pleroma/pleroma!3079
|
4 years ago |
Egor Kislitsyn
|
2b58b0dbce
|
Update CHANGELOG
|
4 years ago |