lain
631def2df2
RedirectController: Don't replace title, but inject into the meta
2020-11-11 17:10:59 +01:00
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
Alexander Strizhakov
8da9f919f8
little changes for MRF config descriptions
...
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
2020-11-11 18:49:15 +03:00
Egor Kislitsyn
af3f00292c
Fix formatting
2020-11-11 19:12:46 +04:00
Egor Kislitsyn
0118ccb53c
Add local visibility
2020-11-11 18:54:01 +04:00
feld
3cd7ea693f
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
...
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
2020-11-11 13:48:03 +00:00
Alexander Strizhakov
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
2020-11-11 13:39:49 +03:00
Alexander Strizhakov
f97f24b067
making credo happy and test fix
2020-11-11 10:48:03 +03:00
Alexander Strizhakov
efc27f6464
fix for adminFE
...
- revert UserAllowPolicy description
- MRF descriptions order
2020-11-11 10:10:57 +03:00
Alexander Strizhakov
485697d96c
config descriptions for custom MRF policies
2020-11-10 19:20:14 +03:00
lain
d77fd6b3d0
Merge branch 'fix/html-title-load' into 'develop'
...
Fix title on load of Pleroma HTML, fixes #2281
Closes #2281
See merge request pleroma/pleroma!3125
2020-11-10 10:05:15 +00:00
Alexander Strizhakov
0c68b9ac13
escaping summary and other fields in xml templates
2020-11-10 10:46:57 +03:00
Sean King
e4a21084f0
Fix title on load of Pleroma HTML
2020-11-08 16:16:20 -07:00
lain
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
lain
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
2020-11-04 15:00:52 +00:00
lain
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
2020-11-04 14:54:53 +00:00
Ivan Tashkinov
73e66fd31f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-04 17:48:10 +03:00
Haelwenn
9c09ea01aa
Merge branch '2284-voters-count' into 'develop'
...
Always return voters_count in polls
See merge request pleroma/pleroma!3120
2020-11-04 14:44:45 +00:00
lain
504a829edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
2020-11-04 15:38:10 +01:00
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
lain
bc4d9c4ffc
Merge branch 'hide-muted-chats' into 'develop'
...
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
2020-11-04 13:48:15 +00:00
Egor Kislitsyn
ca95cbe0b4
Add with_muted param to ChatController.index/2
2020-11-04 16:40:12 +04:00
lain
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
2020-11-04 13:23:18 +01:00
lain
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
lain
92d252f364
Poll Schema: Update and fix.
2020-11-04 10:20:09 +01:00
lain
1cfc3278c0
Poll View: Always return voters_count.
2020-11-04 10:14:00 +01:00
lain
c37118e6f2
Conversations: A few refactors
2020-11-03 13:56:12 +01:00
lain
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
2020-11-03 13:45:09 +01:00
Mark Felder
7efc074ead
Permit fetching individual reports with notes preloaded
2020-11-02 13:06:59 -06:00
Egor Kislitsyn
be52819a11
Hide chats from muted users
2020-11-02 17:51:54 +04:00
lain
24ce324973
Merge branch 'bugfix/poll_replies_count' into 'develop'
...
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
2020-11-02 12:08:20 +00:00
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
Haelwenn (lanodan) Monnier
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
2020-11-02 05:56:17 +01:00
feld
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
2020-10-31 17:03:40 +00:00
Ivan Tashkinov
04f6b48ac1
Auth subsystem refactoring and tweaks.
...
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
2020-10-31 13:38:35 +03:00
eugenijm
8e41baff40
Add idempotency_key to the chat_message entity.
2020-10-31 05:50:59 +03:00
Egor Kislitsyn
d1698267a2
Fix credo warning
2020-10-31 00:26:11 +04:00
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
Alibek Omarov
d63ec02f31
ConversationView: fix formatting
2020-10-30 13:59:53 +01:00
Alibek Omarov
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
2020-10-30 13:59:53 +01:00
Alibek Omarov
241bd061fc
ConversationView: add current user to conversations, according to Mastodon behaviour
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
feld
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
9f5f7dc9f9
Fixed User.is_discoverable attribute rendering in Admin API User view.
2020-10-28 22:29:52 +03:00
Ivan Tashkinov
da4a1e57b1
@doc fix.
2020-10-28 19:09:38 +03: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
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
Maksim Pechnikov
d28f72a55a
FrontStatic plug: excluded invalid url
2020-10-27 22:59:27 +03: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
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
Egor Kislitsyn
03e306785b
Add an API endpoint to install a new frontend
2020-10-27 19:20:21 +04:00
lain
de6d49c8ce
ActivityPub: Add back debug call + explanation.
2020-10-26 16:33:26 +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
Haelwenn
073ad7e6d9
Merge branch 'docs/ap_c2s' into 'develop'
...
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
2020-10-26 02:09:20 +00: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
Ivan Tashkinov
8a68673eed
[ #3059 ] Formatting fix.
2020-10-22 14:07:33 +03:00
Ivan Tashkinov
8a55de1d78
[ #3059 ] Fixed Phoenix 1.5 telemetry processing.
2020-10-22 13:54:15 +03: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
44e5a57d1a
admin api: added user filters by actor_types
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
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
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
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
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
Haelwenn
724e4b7f00
Apply 1 suggestion(s) to 1 file(s)
2020-10-15 21:03:48 +00: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
feld
77bca41595
Apply 3 suggestion(s) to 3 file(s)
2020-10-14 19:33:54 +00: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
c3112fd13a
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-10-13 19:20:00 -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
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
b081080dd9
fixes after rebase
2020-10-13 16:44:02 +03:00
Alexander Strizhakov
1d0e130cb3
fixes after rebase
2020-10-13 16:44:02 +03:00
Alexander Strizhakov
0f8ab46a0e
fix after rebase
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
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
970932689f
DigestPlug rename
2020-10-13 16:43:57 +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
abc3c7689b
HTTPSecurityPlug module name and filename
2020-10-13 16:43:55 +03:00
Alexander Strizhakov
5cd7030076
IdempotencyPlug module name
2020-10-13 16:43:55 +03:00
Alexander Strizhakov
8dfaa54ffc
InstanceStatic 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
d36c9e210a
StaticFEPlug module name
2020-10-13 16:42:52 +03:00
Alexander Strizhakov
a07688deb1
TrailingFormatPlug module name
2020-10-13 16:42:51 +03:00
Alexander Strizhakov
a5987155f7
UploadedMedia module name
2020-10-13 16:42:51 +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
2125286e90
fix for fallback controller
2020-10-13 16:42:50 +03:00
Alexander Strizhakov
e267991a44
renaming LimiterSupervisor
2020-10-13 16:42:48 +03:00
Alexander Strizhakov
6a87f94ee2
renaming ratelimiter supervisor
2020-10-13 16:38:48 +03:00
Alexander Strizhakov
2501793f81
moving plugs into web dir
2020-10-13 16:38:19 +03:00
Alexander Strizhakov
0374df1d12
other files consistency
2020-10-13 16:38:19 +03:00
Alexander Strizhakov
fc7151a9c4
more files renamings
2020-10-13 16:38:19 +03:00
Alexander Strizhakov
e8e4034c48
metadata providers consistency
2020-10-13 16:38:18 +03:00
Alexander Strizhakov
b5b4395e4a
oauth consistency
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
Alex Gleason
83ae45b000
Preload /api/pleroma/frontend_configurations, fixes #1932
2020-10-12 18:49:37 -05:00
Alex Gleason
6ebec50df6
Refactor User.confirm/1, add more tests
2020-10-12 16:32:34 -05:00
Mark Felder
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
Alex Gleason
bb8c0614ef
Move admin approval email logic into User.post_register_action/1
2020-10-11 21:46:10 -05:00
Alex Gleason
521e965884
Registration tests
2020-10-11 21:38:01 -05:00
Alex Gleason
b2fed59209
Handle User.post_register_action/1 in steps
2020-10-11 18:52:35 -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
Ivan Tashkinov
e1eb54d389
[ #3053 ] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
2020-10-11 13:37:19 +03: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
Mark Felder
ed6511a086
Lint
2020-10-07 15:28:29 -05:00
Mark Felder
8156940a49
Compatibility with phoenix_pubsub 2.0.0
2020-10-07 13:28:39 -05:00
Mark Felder
42e78a08b2
Fix rendering of reports
2020-10-07 12:30:55 -05:00
feld
6d1666a080
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 16:44:52 +00:00
Mark Felder
218a3e61e1
Fix incompatible types warning (Elixir 1.11)
2020-10-07 10:04:25 -05:00
Mark Felder
d3106c69c8
Fix incompatible type (Elixir 1.11)
2020-10-07 10:02:20 -05:00
Mark Felder
636c00037d
Fix duplicate @doc entries
2020-10-07 09:58:45 -05:00
Egor Kislitsyn
bc3db72403
Use ModerationLog instead of Logger
2020-10-07 18:35:29 +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
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
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
Haelwenn (lanodan) Monnier
f497eb034d
activity_pub_controller.ex: Remove unused @doc block
...
[ci skip]
2020-10-05 21:11:00 +02:00
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
rinpatch
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
2020-10-03 12:35:49 +00: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
Ivan Tashkinov
0d575735bf
No auth check in UserController.feed_redirect/2, even on non-federating instances.
2020-10-01 21:41:22 +03:00
Ivan Tashkinov
7efadc3cbd
No auth check in OStatusController, even on non-federating instances.
2020-10-01 21:34:45 +03:00
Alexander Strizhakov
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
rinpatch
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
2020-09-29 21:52:16 +03: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
Maksim Pechnikov
de993b856b
added force option to the unfollow operation
2020-09-28 09:16:42 +03: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
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
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
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
lain
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
2020-09-22 17:13:46 +02:00
lain
ee3052a2d8
ActivityPub: Return Announces when filtering by following.
2020-09-22 14:20:19 +02:00
feld
a5c34e3123
Merge branch 'fix/fedsocket-useragent' into 'develop'
...
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
2020-09-21 21:06:32 +00:00
Alex Gleason
23d5d7cf59
Fix #2172 HTTP error on password reset
2020-09-21 14:09:26 -05:00
lain
59680f27ff
Merge branch 'bugfix/federator-actor-error' into 'develop'
...
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
2020-09-21 17:24:14 +00: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
Mark Felder
8afdbcdb1c
Force HTTP for fedsockets
2020-09-21 10:13:41 -05: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
rinpatch
4b12e071ac
OpenAPI: make it possible to generate a spec without starting the app
...
Needed for api docs generation on pleroma.social that will come later
2020-09-19 16:26:15 +03:00
rinpatch
51116b5392
OpenAPI: fix various errors pointed out by editor.swagger.io
2020-09-19 16:26:15 +03:00
Mark Felder
26859c549c
Add user agent to fedsocket requests
2020-09-19 07:26:46 -05:00
Maksim Pechnikov
ed3bc53fa1
Merge branch 'develop' into issue/2099
2020-09-18 22:13:05 +03:00
feld
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
rinpatch
26c571df33
FedSockets: fix log spam on cached rejects
2020-09-18 16:09:37 +03: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
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 (lanodan) Monnier
3a0f99ed35
KeywordPolicy: Still match when fields are absent
2020-09-17 22:07:54 +03:00
feld
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
6bbd65fb09
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
...
[#2130 ] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
2020-09-17 19:51:54 +03: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
rinpatch
eff7f9892d
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
...
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
2020-09-17 19:06:10 +03: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
lain
2a7c9ac147
Merge branch 'nondiscoverable-user-metadata' into 'develop'
...
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
2020-09-17 14:20:03 +00: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
rinpatch
db80b9d630
RichMedia: Fix log spam on failures and resetting TTL on cached errors
2020-09-17 16:56:39 +03:00
eugenijm
c711a2b157
Return the file content for GET /api/pleroma/admin/instance_document/:document_name
2020-09-17 16:55:53 +03:00
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
Roman Chvanikov
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
2020-09-17 14:54:00 +03:00
