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
|
2020-10-27 17:47:56 +00:00 |
|
feld
|
e062329a17
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 17:42:24 +00:00 |
|
Egor Kislitsyn
|
03e306785b
|
Add an API endpoint to install a new frontend
|
2020-10-27 19:20:21 +04:00 |
|
lain
|
04b7505c75
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
|
2020-10-26 17:50:34 +01:00 |
|
lain
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
2020-10-26 16:30:48 +01:00 |
|
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
|
2020-10-23 19:39:42 +00:00 |
|
lain
|
60e379ce0b
|
User: Correctly handle whitespace names.
|
2020-10-23 13:53:01 +02:00 |
|
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 |
|
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
|
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 |
|
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 |
|
Egor Kislitsyn
|
ad605e3e16
|
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
|
2020-10-20 17:16:58 +04:00 |
|
Egor Kislitsyn
|
c1976d5b19
|
Fix credo warnings
|
2020-10-19 18:14:49 +04: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 |
|
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 |
|
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 |
|
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 |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-15 16:39:01 -05:00 |
|
Egor Kislitsyn
|
2a475622ee
|
Add Pleroma.Constants.as_local_public/0
|
2020-10-15 19:07:00 +04:00 |
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
2020-10-15 18:37:44 +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 |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
2020-10-14 15:27:15 -05:00 |
|
Alex Gleason
|
83770b7b39
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
2020-10-14 12:33:24 -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 |
|
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 |
|
Alex Gleason
|
dc38dc8472
|
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
|
2020-10-13 22:01:27 -05:00 |
|
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
2020-10-13 19:26:04 -05:00 |
|
Alex Gleason
|
7d8f610720
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
2020-10-13 19:25:18 -05:00 |
|
Alex Gleason
|
b3d6cf9022
|
Merge remote-tracking branch 'upstream/develop' into block-behavior
|
2020-10-13 19:22:32 -05:00 |
|
Alex Gleason
|
c3112fd13a
|
Merge remote-tracking branch 'upstream/develop' into registration-workflow
|
2020-10-13 19:20:00 -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 |
|
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
|
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 |
|
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 |
|
Alexander Strizhakov
|
d6cb1a3b46
|
ExpectAuthenticatedCheckPlug module name
|
2020-10-13 16:43:56 +03:00 |
|
Alexander Strizhakov
|
99e4ed21b1
|
ExpectPublicOrAuthenticatedCheckPlug module name
|
2020-10-13 16:43:56 +03:00 |
|
Alexander Strizhakov
|
8c993c5f63
|
FederatingPlug module name
|
2020-10-13 16:43:55 +03:00 |
|
Alexander Strizhakov
|
5cd7030076
|
IdempotencyPlug module name
|
2020-10-13 16:43:55 +03:00 |
|
Alexander Strizhakov
|
e2332d92ce
|
LegacyAuthenticationPlug module name
|
2020-10-13 16:43:54 +03:00 |
|
Alexander Strizhakov
|
96d320bdfe
|
OAuthPlug module name
|
2020-10-13 16:43:54 +03:00 |
|
Alexander Strizhakov
|
a6d8cef33e
|
OAuthScopesPlug module name
|
2020-10-13 16:43:54 +03:00 |
|
Alexander Strizhakov
|
15772fda57
|
PlugHelper module name
|
2020-10-13 16:43:53 +03:00 |
|
Alexander Strizhakov
|
4b1863ca4e
|
RateLimiter module name
|
2020-10-13 16:43:53 +03:00 |
|
Alexander Strizhakov
|
3be8ab5103
|
RemoteIp module name
|
2020-10-13 16:43:50 +03:00 |
|
Alexander Strizhakov
|
4b4c0eef36
|
SessionAuthenticationPlug module name
|
2020-10-13 16:42:53 +03:00 |
|
Alexander Strizhakov
|
8249b75761
|
SetFormatPlug module name
|
2020-10-13 16:42:53 +03:00 |
|
Alexander Strizhakov
|
c97c7d982f
|
SetLocalePlug module name
|
2020-10-13 16:42:52 +03:00 |
|
Alexander Strizhakov
|
f7614d4718
|
SetUserSessionIdPlug module name
|
2020-10-13 16:42:52 +03:00 |
|
Alexander Strizhakov
|
ebd6dd7c53
|
UserEnabledPlug module name
|
2020-10-13 16:42:51 +03:00 |
|
Alexander Strizhakov
|
61c609884c
|
UserFetcherPlug module name
|
2020-10-13 16:42:51 +03:00 |
|
Alexander Strizhakov
|
1d16cd0c3d
|
UserIsAdminPlug module name
|
2020-10-13 16:42:50 +03:00 |
|
Alexander Strizhakov
|
0374df1d12
|
other files consistency
|
2020-10-13 16:38:19 +03:00 |
|
Alexander Strizhakov
|
7acf09beb8
|
more tests
|
2020-10-13 16:38:18 +03:00 |
|
Alexander Strizhakov
|
103f3dcb9e
|
rich media parser ttl files consistency
|
2020-10-13 16:38:15 +03:00 |
|
Alexander Strizhakov
|
7dffaef479
|
tests consistency
|
2020-10-13 16:35:09 +03:00 |