Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Haelwenn
|
131f3219e6
|
Merge branch 'issue/2069' into 'develop'
[#2069] unread_conversation_count
See merge request pleroma/pleroma!2939
|
4 years ago |
|
feld
|
1cce1bd729
|
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
[#2137] admin/users filters
See merge request pleroma/pleroma!3016
|
4 years ago |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
4 years ago |
|
Ivan Tashkinov
|
9f5f7dc9f9
|
Fixed User.is_discoverable attribute rendering in Admin API User view.
|
4 years ago |
|
Ivan Tashkinov
|
da4a1e57b1
|
@doc fix.
|
4 years ago |
|
Ivan Tashkinov
|
ba50dc05a8
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
d2b140a525
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
|
4 years ago |
|
Egor Kislitsyn
|
4a2d7a7a5d
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
feld
|
1204aaa2e3
|
Merge branch 'feature/autofollowing' into 'develop'
autofollowing_nicknames
See merge request pleroma/pleroma!3087
|
4 years ago |
|
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 |
|
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 |
|
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 |
