390a12d4c8
ConversationControllerTest: fix test
2020-10-30 12:58:51 +01:00
minibikini
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00:00
Haelwenn
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
2020-10-29 23:39:15 +00:00
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
2020-10-29 21:06:15 +00:00
Egor Kislitsyn
d83c2bd330
Add support for install via file and build_url params
2020-10-29 16:37:50 +04:00
Egor Kislitsyn
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
2020-10-29 15:35:42 +04:00
Egor Kislitsyn
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +04:00
Ivan Tashkinov
ba50dc05a8
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# CHANGELOG.md
2020-10-28 19:03:40 +03:00
Mark Felder
d2b140a525
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
2020-10-28 08:48:26 -05:00
Egor Kislitsyn
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-28 15:33:36 +04:00
Egor Kislitsyn
4f90077767
Fix warning
2020-10-28 15:32:44 +04:00
1204aaa2e3
Merge branch 'feature/autofollowing' into 'develop'
...
autofollowing_nicknames
See merge request pleroma/pleroma!3087
2020-10-27 22:55:31 +00:00
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
2020-10-27 22:44:31 +00:00
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 22:13:50 +00:00
Mark Felder
f2b74f60f0
Merge branch 'develop' into feature/account-export
2020-10-27 15:16:22 -05:00
Maksim Pechnikov
d28f72a55a
FrontStatic plug: excluded invalid url
2020-10-27 22:59:27 +03:00
Mark Felder
cbe41408e4
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
2020-10-27 14:37:48 -05:00
minibikini
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
Mark Felder
291189357b
Merge branch 'develop' into feature/account-export
2020-10-27 12:54:33 -05:00
Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
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
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
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
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
add26817e3
update changelog
2020-10-22 11:54:32 +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
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
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
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
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
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
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
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
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
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
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
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
Alexander Strizhakov
6bf85440b3
mix tasks consistency
2020-10-13 16:33:24 +03:00
Alex Gleason
83ae45b000
Preload /api/pleroma/frontend_configurations, fixes #1932
2020-10-12 18:49:37 -05:00
Alex Gleason
cb29769a22
Make User.confirm/1 and User.approve/1 idempotent
2020-10-12 16:42:59 -05:00
Alex Gleason
6ebec50df6
Refactor User.confirm/1, add more tests
2020-10-12 16:32:34 -05:00
Alex Gleason
9ddc292ca8
TwitterAPI: test pending approval user email
2020-10-12 15:25:14 -05:00
03855f9789
Merge branch 'improve/instance-gen' into 'develop'
...
#2159 Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070
2020-10-12 17:24:24 +00:00
Mark Felder
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
Mark Felder
6c61ef14c3
Support enabling upload filters during instance gen
2020-10-12 11:19:48 -05:00
Alex Gleason
521e965884
Registration tests
2020-10-11 21:38:01 -05:00
Alex Gleason
28005563f0
Send approval pending email during registration
2020-10-11 20:50:09 -05:00
Ivan Tashkinov
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-11 22:34:48 +03:00
Ivan Tashkinov
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
2020-10-11 22:34:28 +03:00
Mark Felder
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
2020-10-09 17:08:05 -05:00
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
Alex Gleason
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
2020-10-08 17:24:09 -05:00
Alex Gleason
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
Haelwenn
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
Mark Felder
a702f9fb5b
Lint
2020-10-07 15:07:03 -05:00
Maksim
6ee20eb328
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 19:32:42 +00:00
Maksim
8bfc5d9a0c
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 19:32:09 +00:00
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
2020-10-07 19:16:53 +00:00
Mark Felder
8156940a49
Compatibility with phoenix_pubsub 2.0.0
2020-10-07 13:28:39 -05:00
Mark Felder
570a406b7a
use Phoenix.ConnTest is deprecated
2020-10-07 10:31:08 -05:00
Egor Kislitsyn
bc3db72403
Use ModerationLog instead of Logger
2020-10-07 18:35:29 +04:00
Egor Kislitsyn
f1e4333dd7
Fix test
2020-10-07 18:35:28 +04:00
Egor Kislitsyn
e4792ce76a
Do not limit admins
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
17562bf414
Move API endpoints to /api/v1/pleroma/backups
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
7c22c9afb4
Allow admins request user backups
2020-10-07 18:34:31 +04:00
Egor Kislitsyn
7fdd81d000
Add "Your backup is ready" email
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
27bc121ec0
Require email
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
86ce4afd93
Improve backup urls
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
2c73bfe122
Add API endpoints for Backups
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
abdffc6b8c
Fix Credo warning
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
739cb1463b
Add backups deletion
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
3ad7492f9d
Add config for Pleroma.Backup
2020-10-07 18:34:29 +04:00
Egor Kislitsyn
a0ad9bd734
Add BackupWorker
2020-10-07 18:34:28 +04:00
Egor Kislitsyn
4f3a633745
Add backups table
2020-10-07 18:34:28 +04:00
Egor Kislitsyn
75e07ba206
Fix tests
2020-10-07 18:34:28 +04:00
Egor Kislitsyn
be42ab70dc
Add backup upload
2020-10-07 18:34:28 +04:00
Egor Kislitsyn
c82f912959
Fix credo warning
2020-10-07 18:34:27 +04:00
Egor Kislitsyn
c01a818048
Add tests
2020-10-07 18:34:27 +04:00
Mark Felder
9783e9cd80
Add test for an entry without CIDR format
2020-10-06 17:08:26 -05:00
Mark Felder
d43d05005a
Move hardcoded default configuration into config.exs
2020-10-06 17:02:46 -05:00
Mark Felder
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
2020-10-06 14:25:20 -05:00
rinpatch
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
2020-10-06 18:11:34 +00:00
Ivan Tashkinov
6c2264af24
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-05 23:50:08 +03:00
Ivan Tashkinov
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
2020-10-05 23:48:00 +03:00
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
Ivan Tashkinov
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
2020-10-02 22:18:02 +03:00
Alexander Strizhakov
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
lain
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
lain
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
lain
aa170caa76
Merge branch 'issue/2170' into 'develop'
...
[#2170 ] Can't remove dead relay
See merge request pleroma/pleroma!3041
2020-09-29 14:37:49 +00:00
Mark Felder
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
2020-09-28 18:22:59 -05:00
rinpatch
7bc561127d
Revert citext user URI migration
...
URI paths are not actually case-insesitive, which caused migration issues
on a number of databases.
Closes #2188
2020-09-28 18:34:03 +03:00
Maksim Pechnikov
de993b856b
added force option to the unfollow operation
2020-09-28 09:16:42 +03:00
Ivan Tashkinov
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-26 19:32:16 +03:00
Mark Felder
d1c724ef34
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 13:08:33 -05:00
Mark Felder
93b674b66d
Fix test failures for NoOpPolicy describe/0
2020-09-25 12:46:49 -05:00
Mark Felder
4a30598b9e
Config settings leak and break configdb migration tests when async
2020-09-25 12:20:52 -05:00
Mark Felder
dcdf75fbac
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 11:45:51 -05:00
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
2020-09-25 16:15:01 +00:00
Mark Felder
2bf2c68dee
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 10:48:01 -05:00
rinpatch
5cd71208d9
Merge branch 'search-even-more' into 'develop'
...
More user search improvements
See merge request pleroma/pleroma!3032
2020-09-25 12:56:21 +00:00
rinpatch
f67c967c4a
Merge branch 'features/incoming-create-exists' into 'develop'
...
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
2020-09-25 12:44:33 +00:00
lain
1e0f3f8514
User search: Make uri matches case insensitive.
2020-09-25 08:56:58 +02:00
lain
a8c17ea25a
User Search: Also find user by uri
2020-09-25 08:46:14 +02:00
Mark Felder
3bf3db39f5
Validate emails are sent to the appropriate unconfirmed actors
2020-09-24 18:24:44 -05:00
lain
d0078bc404
User Search: Boost resolved results and exact ap_id matches.
2020-09-24 15:54:55 +02:00
rinpatch
151df9fc17
Merge branch 'fix/test-fix' into 'develop'
...
Fix for test on mac
See merge request pleroma/pleroma!3027
2020-09-24 09:50:39 +00:00
lain
47cd59342f
Merge branch 'smol-test' into 'develop'
...
CommonAPI test: Add test for polls
See merge request pleroma/pleroma!3028
2020-09-24 09:41:28 +00:00
lain
35d62a4a56
CommonAPI test: Add test for polls
2020-09-24 11:12:03 +02:00
Alexander Strizhakov
165961f56d
don't run in async mode
2020-09-24 12:00:39 +03:00
Alexander Strizhakov
aa1f97a5b6
fix for test on mac
2020-09-24 10:46:09 +03:00
Alexander Strizhakov
727a0556a9
fix
2020-09-24 09:47:23 +03:00
Alexander Strizhakov
5d7ec00bed
fixes after rebase
2020-09-24 09:42:30 +03:00
Alexander Strizhakov
8c6ec4c111
pack routes change
2020-09-24 09:16:14 +03:00
Alexander Strizhakov
dbbc801667
pagination for remote emoji packs
2020-09-24 09:12:39 +03:00
Alexander Strizhakov
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
lain
e02101e15c
Merge branch 'issue/2115' into 'develop'
...
[#2115 ] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
2020-09-23 12:09:38 +00:00
lain
4dadb7c433
Merge branch 'user-query/filter-out-internal' into 'develop'
...
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
2020-09-23 11:51:04 +00:00
lain
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 11:49:19 +00:00
Haelwenn (lanodan) Monnier
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
2020-09-23 13:40:45 +02:00
Roman Chvanikov
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
lain
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 09:16:00 +00:00
Maksim Pechnikov
8e4f043ac7
finland-emojis.zip -> emojis.zip
2020-09-22 21:58:30 +03:00
Maksim Pechnikov
72d2b34d3b
Merge branch 'develop' into issue/1975
2020-09-22 21:42:10 +03:00
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
2020-09-22 13:37:02 -05:00
Mark Felder
88653c01c9
Add test for check_activity_expiration_config/0
2020-09-22 11:34:51 -05:00
Mark Felder
7775b1540f
Add deprecation warning test for check_hellthread_threshold/0
2020-09-22 11:22:15 -05:00
Mark Felder
25bdf0d0d9
Add test for welcome message format
2020-09-22 11:19:29 -05:00
Mark Felder
e2dcf039d2
Fix gun_pool_options deprecation warning message
2020-09-22 11:15:40 -05:00
lain
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
2020-09-22 17:13:46 +02:00
Egor Kislitsyn
0e0ece251a
Filter out internal users by default
2020-09-22 16:56:11 +04:00
lain
ee3052a2d8
ActivityPub: Return Announces when filtering by following.
2020-09-22 14:20:19 +02:00
Alex Gleason
bf181ca968
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()
2020-09-21 16:03:22 -05:00
Alex Gleason
0b728ccc44
Pass hackney tls config into email tests, #2101
2020-09-21 15:26:10 -05:00
lain
9108e27c2f
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
...
[#2074 ] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
2020-09-21 17:15:54 +00:00
lain
b36b6259d8
Merge branch 'issue/2099' into 'develop'
...
[#2099 ] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
2020-09-21 16:25:17 +00:00
lain
f2f0a0260f
ActivityPub: Don't block-filter your own posts
...
We are filtering out replies to people you block, but that should
not include your own posts.
2020-09-21 16:08:38 +02:00
Roman Chvanikov
28d0986f83
Refactor mutes removing in CommonAPI and User
2020-09-20 20:58:17 +03:00
Roman Chvanikov
4987ee6256
Merge branch 'develop' into feature/expire-mutes
2020-09-20 19:27:27 +03:00
Ivan Tashkinov
60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
2020-09-19 19:16:55 +03:00
Maksim Pechnikov
ed3bc53fa1
Merge branch 'develop' into issue/2099
2020-09-18 22:13:05 +03:00
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
lain
7e02f4ed3b
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
...
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
2020-09-18 12:25:10 +00:00
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
Maksim Pechnikov
2ec0dcf001
Merge branch 'develop' into issue/2099
2020-09-18 07:08:37 +03:00
Sergey Suprunenko
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
2020-09-17 22:10:55 +02:00
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
2020-09-17 22:22:59 +03:00
Haelwenn (lanodan) Monnier
7bf269fe83
Fix MRF reject for ChatMessage
2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
2020-09-17 22:07:54 +03:00
Haelwenn
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
2020-09-17 17:59:38 +00:00
608824b97e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
2020-09-17 16:54:53 +00:00
rinpatch
608017b7df
Merge branch 'fix/streaming-termination-errors' into 'develop'
...
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
2020-09-17 19:50:51 +03:00
Haelwenn
0465bdbd49
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
2020-09-17 19:50:23 +03:00
lain
bb70b231d0
Merge branch 'reply-visibility-user-guard' into 'develop'
...
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
2020-09-17 19:49:08 +03:00
rinpatch
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
2020-09-17 19:48:33 +03:00
stwf
9d77f4abf8
adapt to new user factory behavior
2020-09-17 12:32:40 -04:00
stwf
dfc621a529
add test and changelog entry
2020-09-17 12:18:07 -04:00
stwf
41939e3175
User search respect discoverable flag
2020-09-17 12:15:50 -04:00
rinpatch
dee4639dbb
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
2020-09-17 19:04:50 +03:00
Mark Felder
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
2020-09-17 09:32:50 -05:00
Ivan Tashkinov
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-17 17:14:20 +03:00
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
lain
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
2020-09-17 14:09:01 +00:00
eugenijm
c711a2b157
Return the file content for GET /api/pleroma/admin/instance_document/:document_name
2020-09-17 16:55:53 +03:00
