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 |
|
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 |
|
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
|
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
|
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 |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-15 16:39:01 -05:00 |
|
Maksim Pechnikov
|
2030ffd490
|
fix test
|
2020-10-15 22:31:52 +03:00 |
|
Maksim Pechnikov
|
20e68b30f0
|
added generated pleroma.env
|
2020-10-15 22:28:26 +03: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 |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
2020-10-14 15:27:15 -05: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 |
|
Egor Kislitsyn
|
6734abcbd4
|
Add pagination for Mutes
|
2020-10-13 21:58:18 +04:00 |
|
Haelwenn (lanodan) Monnier
|
f5d8af1db1
|
Move Consistency.FileLocation to ./test
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
|
2020-10-13 19:57:45 +02:00 |
|
Mark Felder
|
09be8cb336
|
Credo
|
2020-10-13 12:49:43 -05:00 |
|
Egor Kislitsyn
|
33f4f39b1c
|
Add pagination for Blocks
|
2020-10-13 21:39:41 +04:00 |
|
Mark Felder
|
40f3cdc030
|
JPEG content_type must be image/jpeg
|
2020-10-13 10:37:24 -05:00 |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
2020-10-13 10:08:38 -05:00 |
|
Mark Felder
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
2020-10-13 09:54:53 -05:00 |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
2020-10-13 09:54:29 -05:00 |
|
Mark Felder
|
4ead0d564f
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-13 09:54:11 -05:00 |
|
Mark Felder
|
8bacdc3680
|
Change user.discoverable field to user.is_discoverable
|
2020-10-13 09:45:08 -05:00 |
|
Mark Felder
|
9968b7efed
|
Change user.locked field to user.is_locked
|
2020-10-13 09:31:13 -05:00 |
|
Alexander Strizhakov
|
4c4ea9a348
|
changes after rebase
|
2020-10-13 17:10:34 +03:00 |
|
Alexander Strizhakov
|
5f2071c458
|
changes after rebase
|
2020-10-13 16:44:03 +03:00 |
|
Alexander Strizhakov
|
bb111465a1
|
credo fix after rebase
|
2020-10-13 16:44:03 +03:00 |
|
Alexander Strizhakov
|
7f5dbb0201
|
changes after rebase
|
2020-10-13 16:44:03 +03:00 |
|
Alexander Strizhakov
|
b081080dd9
|
fixes after rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
f679486540
|
rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
c4c5caedd8
|
changes after rebase
|
2020-10-13 16:44:02 +03:00 |
|
Alexander Strizhakov
|
c8418e2d1f
|
fix after rebase
|
2020-10-13 16:44:01 +03:00 |
|
Alexander Strizhakov
|
b720ad2264
|
files consistency after rebase
|
2020-10-13 16:44:01 +03:00 |
|
Alexander Strizhakov
|
c5efded5fd
|
files consistency for new files
|
2020-10-13 16:44:00 +03:00 |
|
Alexander Strizhakov
|
207211a2b3
|
update files consistency after rebase
|
2020-10-13 16:44:00 +03:00 |
|
Alexander Strizhakov
|
e33782455d
|
updates after rebase
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
3ef4e9d170
|
AdminSecretAuthenticationPlug module name
|
2020-10-13 16:43:58 +03:00 |
|
Alexander Strizhakov
|
c497558d43
|
AuthenticationPlug module name
|
2020-10-13 16:43:58 +03:00 |
|
Alexander Strizhakov
|
c1777e7479
|
BasicAuthDecoderPlug module name
|
2020-10-13 16:43:58 +03:00 |
|
Alexander Strizhakov
|
66e0b0065b
|
Cache plug module name
|
2020-10-13 16:43:57 +03:00 |
|
Alexander Strizhakov
|
c6baa811d6
|
EnsureAuthenticatedPlug module name
|
2020-10-13 16:43:57 +03:00 |
|
Alexander Strizhakov
|
011525a3d1
|
EnsurePublicOrAuthenticatedPlug module name
|
2020-10-13 16:43:57 +03:00 |
|
Alexander Strizhakov
|
8e301a4c37
|
EnsureUserKeyPlug module name
|
2020-10-13 16:43:56 +03:00 |
|