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 |
|
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 |
|
Ivan Tashkinov
|
50d4280880
|
[#1668] Formatting fix.
|
2020-10-20 16:18:24 +03: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 |
|
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
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
2020-10-19 15:40:03 +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 |
|
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 |
|
feld
|
5703fb6d2a
|
Merge branch 'issue/2009' into 'develop'
[#2009] fixed install docs (release env)
See merge request pleroma/pleroma!2854
|
2020-10-15 20:21:57 +00:00 |
|
Maksim Pechnikov
|
2030ffd490
|
fix test
|
2020-10-15 22:31:52 +03:00 |
|
Maksim Pechnikov
|
cf53e300f8
|
added generate the release env to pleroma.instance gen
|
2020-10-15 22:31:00 +03:00 |
|
Maksim Pechnikov
|
595da6080d
|
fixed install docs
|
2020-10-15 22:30:03 +03:00 |
|
Maksim Pechnikov
|
2f6bbd53b5
|
fix docs
|
2020-10-15 22:29:37 +03:00 |
|
Maksim
|
e2333f757a
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-15 22:29:28 +03:00 |
|
Maksim
|
499df7b73a
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-15 22:29:18 +03:00 |
|
Maksim Pechnikov
|
14054cd004
|
update task messages
|
2020-10-15 22:28:49 +03:00 |
|
Maksim Pechnikov
|
20e68b30f0
|
added generated pleroma.env
|
2020-10-15 22:28:26 +03:00 |
|
Egor Kislitsyn
|
a859d9bc15
|
Update dependencies
|
2020-10-15 18:05:54 +04:00 |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
2020-10-15 16:54:59 +04:00 |
|
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
2020-10-15 12:28:25 +02:00 |
|
feld
|
b48724afcd
|
Merge branch 'docs-indigenous' into 'develop'
Change handle and url of contact person for Indigenous client
See merge request pleroma/pleroma!3082
|
2020-10-14 20:31:23 +00:00 |
|
feld
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
2020-10-14 19:33:54 +00:00 |
|
swentel
|
42112b842c
|
Change handle and url of contact person for Indigenous client
|
2020-10-14 21:32:18 +02:00 |
|
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
2020-10-14 17:31:45 +00:00 |
|
Haelwenn
|
9a85ec0da0
|
Merge branch 'refactor/locked_user_field' into 'develop'
Change user.locked field to user.is_locked
See merge request pleroma/pleroma!3077
|
2020-10-14 16:17:32 +00:00 |
|
Mark Felder
|
ed61002815
|
Undo API breaking changes
|
2020-10-14 11:03:17 -05:00 |
|
Mark Felder
|
b001237b79
|
Finish undoing API breakage
|
2020-10-14 10:44:18 -05:00 |
|
Mark Felder
|
3242cfef20
|
Undo API breaking changes
|
2020-10-14 09:54:07 -05:00 |
|
Mark Felder
|
8b20c4d275
|
Missed tests
|
2020-10-13 16:15:28 -05:00 |
|
Haelwenn
|
481906207e
|
Merge branch 'bugfix/file-consistency-prod' into 'develop'
Move Consistency.FileLocation to ./test
See merge request pleroma/pleroma!3079
|
2020-10-13 18:19:24 +00:00 |
|
Egor Kislitsyn
|
2b58b0dbce
|
Update CHANGELOG
|
2020-10-13 21:58:26 +04:00 |
|