Haelwenn
|
d8d4bd15d0
|
Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
|
4 years ago |
|
feld
|
03a318af9a
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Maksim Pechnikov
|
d28f72a55a
|
FrontStatic plug: excluded invalid url
|
4 years ago |
|
Mark Felder
|
291189357b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Mark Felder
|
9e54ef086b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
5aff479951
|
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
|
4 years ago |
|
feld
|
e062329a17
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
lain
|
de6d49c8ce
|
ActivityPub: Add back debug call + explanation.
|
4 years ago |
|
lain
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
4 years ago |
|
Haelwenn
|
073ad7e6d9
|
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
|
4 years ago |
|
rinpatch
|
df61071422
|
Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
|
4 years ago |
|
lain
|
60e379ce0b
|
User: Correctly handle whitespace names.
|
4 years ago |
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
4 years ago |
|
Ivan Tashkinov
|
8a68673eed
|
[#3059] Formatting fix.
|
4 years ago |
|
Ivan Tashkinov
|
8a55de1d78
|
[#3059] Fixed Phoenix 1.5 telemetry processing.
|
4 years ago |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
4 years ago |
|
Maksim Pechnikov
|
ef627b9391
|
fix module name
|
4 years ago |
|
Maksim Pechnikov
|
44e5a57d1a
|
admin api: added user filters by `actor_types`
|
4 years ago |
|
Maksim Pechnikov
|
60663150b5
|
admin user search: added filter by `actor_type`
|
4 years ago |
|
Maksim Pechnikov
|
46b420aa60
|
need_confirmed -> unconfirmed
|
4 years ago |
|
Maksim Pechnikov
|
cf4f393794
|
added AdminApi.UserController
|
4 years ago |
|
Maksim Pechnikov
|
9ef46ce410
|
added 'unconfirmed' filter to admin/users
|
4 years ago |
|
Haelwenn
|
2ca98f2d94
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Egor Kislitsyn
|
034ac43f3a
|
Fix credo warnings
|
4 years ago |
|
Egor Kislitsyn
|
e87901c424
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
ad605e3e16
|
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
|
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 |
|
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
|
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 |
|
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 |
|
Maksim Pechnikov
|
2030ffd490
|
fix test
|
4 years ago |
|
Maksim Pechnikov
|
cf53e300f8
|
added generate the release env to `pleroma.instance gen`
|
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
|
3985c1b450
|
Fix warnings
|
4 years ago |
|
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
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 |
|
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 |
|
Egor Kislitsyn
|
6734abcbd4
|
Add pagination for Mutes
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f5d8af1db1
|
Move Consistency.FileLocation to ./test
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
|
4 years ago |
|
Egor Kislitsyn
|
33f4f39b1c
|
Add pagination for Blocks
|
4 years ago |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
4 years ago |
|
Mark Felder
|
4ead0d564f
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
Mark Felder
|
8bacdc3680
|
Change user.discoverable field to user.is_discoverable
|
4 years ago |
|
Mark Felder
|
9968b7efed
|
Change user.locked field to user.is_locked
|
4 years ago |
|
Alexander Strizhakov
|
4c4ea9a348
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
3cb9c88837
|
migration and warning for RemoteIp plug rename
|
4 years ago |
|
Alexander Strizhakov
|
5f2071c458
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
7f5dbb0201
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
b081080dd9
|
fixes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
c4c5caedd8
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
1d0e130cb3
|
fixes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
0f8ab46a0e
|
fix after rebase
|
4 years ago |
|
Alexander Strizhakov
|
207211a2b3
|
update files consistency after rebase
|
4 years ago |
|
Alexander Strizhakov
|
3c8c540707
|
copyright
|
4 years ago |
|
Alexander Strizhakov
|
b6eb7997f5
|
special namespaces for phoenix and api_spec
|
4 years ago |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
4 years ago |
|
Alexander Strizhakov
|
3ef4e9d170
|
AdminSecretAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
c497558d43
|
AuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
c1777e7479
|
BasicAuthDecoderPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
970932689f
|
DigestPlug rename
|
4 years ago |
|
Alexander Strizhakov
|
66e0b0065b
|
Cache plug module name
|
4 years ago |
|
Alexander Strizhakov
|
c6baa811d6
|
EnsureAuthenticatedPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
011525a3d1
|
EnsurePublicOrAuthenticatedPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8e301a4c37
|
EnsureUserKeyPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
d6cb1a3b46
|
ExpectAuthenticatedCheckPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
99e4ed21b1
|
ExpectPublicOrAuthenticatedCheckPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8c993c5f63
|
FederatingPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
abc3c7689b
|
HTTPSecurityPlug module name and filename
|
4 years ago |
|
Alexander Strizhakov
|
5cd7030076
|
IdempotencyPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8dfaa54ffc
|
InstanceStatic module name
|
4 years ago |
|
Alexander Strizhakov
|
e2332d92ce
|
LegacyAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
96d320bdfe
|
OAuthPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
a6d8cef33e
|
OAuthScopesPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
15772fda57
|
PlugHelper module name
|
4 years ago |
|
Alexander Strizhakov
|
4b1863ca4e
|
RateLimiter module name
|
4 years ago |
|
Alexander Strizhakov
|
3be8ab5103
|
RemoteIp module name
|
4 years ago |
|
Alexander Strizhakov
|
4b4c0eef36
|
SessionAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8249b75761
|
SetFormatPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
c97c7d982f
|
SetLocalePlug module name
|
4 years ago |
