feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
2020-10-22 20:33:52 +00:00 |
|
Ivan Tashkinov
|
14900164b8
|
[#3059] Used forked prometheus-phx to remove log spam.
|
2020-10-22 17:58:25 +03:00 |
|
Ivan Tashkinov
|
8a68673eed
|
[#3059] Formatting fix.
|
2020-10-22 14:07:33 +03:00 |
|
rinpatch
|
d031b185e2
|
Merge branch '2257-self-chat' into 'develop'
Resolve "Can't message yourself in a chat (but can start it)"
Closes #2257
See merge request pleroma/pleroma!3099
|
2020-10-22 10:56:17 +00:00 |
|
Ivan Tashkinov
|
8a55de1d78
|
[#3059] Fixed Phoenix 1.5 telemetry processing.
|
2020-10-22 13:54:15 +03:00 |
|
lain
|
3fdc2a0d1e
|
Changelog: Add information about self-chats
|
2020-10-22 12:23:07 +02:00 |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
2020-10-22 12:22:08 +02:00 |
|
Maksim Pechnikov
|
ef627b9391
|
fix module name
|
2020-10-22 12:04:23 +03:00 |
|
Maksim Pechnikov
|
add26817e3
|
update changelog
|
2020-10-22 11:54:32 +03:00 |
|
Maksim Pechnikov
|
51189ad365
|
update docs
|
2020-10-22 11:53:28 +03:00 |
|
Maksim Pechnikov
|
44e5a57d1a
|
admin api: added user filters by actor_types
|
2020-10-22 11:53:28 +03:00 |
|
Maksim Pechnikov
|
60663150b5
|
admin user search: added filter by actor_type
|
2020-10-22 11:53:28 +03:00 |
|
Maksim Pechnikov
|
46b420aa60
|
need_confirmed -> unconfirmed
|
2020-10-22 11:50:49 +03:00 |
|
Maksim Pechnikov
|
cf4f393794
|
added AdminApi.UserController
|
2020-10-22 11:50:49 +03:00 |
|
Maksim Pechnikov
|
9ef46ce410
|
added 'unconfirmed' filter to admin/users
|
2020-10-22 11:50:49 +03:00 |
|
Haelwenn
|
2ca98f2d94
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-21 19:40:37 +00:00 |
|
rinpatch
|
fb0e340363
|
Rip out fedsockets from the release branch
|
2020-10-21 21:14:58 +03:00 |
|
Egor Kislitsyn
|
b18b93bbed
|
Fix formatting and typos in "Managing frontends" guide
|
2020-10-21 21:42:21 +04:00 |
|
Haelwenn
|
77e827bb66
|
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install libmagic-dev in debian release targets
See merge request pleroma/pleroma!3096
|
2020-10-20 21:15:48 +00:00 |
|
Haelwenn (lanodan) Monnier
|
54d99cbb72
|
CI: Install libmagic-dev in debian release targets
|
2020-10-20 22:10:20 +02:00 |
|
Egor Kislitsyn
|
034ac43f3a
|
Fix credo warnings
|
2020-10-20 17:47:04 +04:00 |
|
Egor Kislitsyn
|
e87901c424
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
2020-10-20 17:27:29 +04:00 |
|
Ivan Tashkinov
|
50d4280880
|
[#1668] Formatting fix.
|
2020-10-20 16:18:24 +03:00 |
|
Egor Kislitsyn
|
ad605e3e16
|
Rename Pleroma.Backup to Pleroma.User.Backup
|
2020-10-20 17:16:58 +04:00 |
|
Ivan Tashkinov
|
3a28aa8814
|
[#1668] Added :prometheus group config to config/description.exs.
|
2020-10-20 15:13:20 +03:00 |
|
Haelwenn
|
44b2a137d1
|
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install file-dev in alpine release targets
See merge request pleroma/pleroma!3095
|
2020-10-20 00:47:44 +00:00 |
|
Haelwenn (lanodan) Monnier
|
ccd1e75e35
|
CI: Install file-dev in alpine release targets
|
2020-10-20 02:37:08 +02:00 |
|
Haelwenn
|
fe160330e6
|
Merge branch 'fix/autofollower-suggestions' into 'develop'
Remove suggestions for autofollower_nicknames
See merge request pleroma/pleroma!3088
|
2020-10-19 23:16:24 +00:00 |
|
Egor Kislitsyn
|
c1976d5b19
|
Fix credo warnings
|
2020-10-19 18:14:49 +04:00 |
|
lain
|
e97b254c6b
|
Transmogrifier: Refactor and unify incoming tag handling
|
2020-10-19 15:46:24 +02:00 |
|
lain
|
39fd4d7639
|
Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
|
2020-10-19 15:40:50 +02:00 |
|
Egor Kislitsyn
|
98f32cf820
|
Fix tests
|
2020-10-19 17:19:45 +04:00 |
|
Egor Kislitsyn
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
2020-10-19 15:40:03 +04:00 |
|
Egor Kislitsyn
|
18a91d85e5
|
Merge branch 'develop' into feature/local-only-scope
|
2020-10-19 15:31:56 +04:00 |
|
Haelwenn
|
0495a07dc7
|
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
|
2020-10-19 04:26:35 +00:00 |
|
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.
|
2020-10-18 21:22:21 +03:00 |
|
feld
|
be611b143b
|
Merge branch 'chore/changelogfix' into 'develop'
Fix duplicate Added sections in the changelog
See merge request pleroma/pleroma!3091
|
2020-10-17 17:45:51 +00:00 |
|
Mark Felder
|
d16336e7fb
|
Document autofollowing_nicknames
|
2020-10-17 16:54:05 +00:00 |
|
Mark Felder
|
cb3ee4d543
|
Fix duplicate Added sections in the changelog
|
2020-10-17 11:52:52 -05:00 |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
2020-10-17 17:53:47 +03:00 |
|
Ivan Tashkinov
|
d54233760f
|
[#3053] Post-merge fix.
|
2020-10-17 13:33:57 +03:00 |
|
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
|
2020-10-17 13:12:39 +03:00 |
|
Mark Felder
|
efd6572ffb
|
Remove suggestions
|
2020-10-16 17:43:44 +00:00 |
|
Mark Felder
|
405f27b4f8
|
The suggestions are problematic as they need to be real local account names
|
2020-10-16 17:41:44 +00:00 |
|
Mark Felder
|
1b8fd7e65a
|
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
|
2020-10-16 17:36:02 +00:00 |
|
Haelwenn (lanodan) Monnier
|
aafdc975bd
|
federation_status: Add ApiSpec
|
2020-10-16 01:14:15 +02:00 |
|
Haelwenn (lanodan) Monnier
|
3b5a7a6b14
|
federation_status: New endpoint showing unreachable instances
|
2020-10-16 01:14:04 +02:00 |
|
feld
|
023f726d7f
|
Merge branch 'refactor/discoverable_user_field' into 'develop'
Change user.discoverable field to user.is_discoverable
See merge request pleroma/pleroma!3078
|
2020-10-15 21:49:15 +00:00 |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-15 16:39:01 -05:00 |
|
Haelwenn
|
724e4b7f00
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-15 21:03:48 +00:00 |
|