14c28dcbd1
InstanceStatic: Refactor.
4 years ago
68b3372345
Merge branch 'issue/1986-earmark' into 'develop'
...
[#1986 ] locked the earmark version
See merge request pleroma/pleroma!2800
4 years ago
e5ac9534aa
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
...
masto_fe_view: Remove @default_settings
See merge request pleroma/pleroma!2799
4 years ago
3e5fb90eaa
locked earmark version
4 years ago
f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
f43518eb74
Lint, fix test
4 years ago
057936bf0b
Merge branch 'embedded-object-federation' into 'develop'
...
Embedded object federation
Closes #1959
See merge request pleroma/pleroma!2794
4 years ago
520dce857e
Add :registration_reason_length to description.exs
4 years ago
6f44a0ee84
Add configurable registration_reason limit
4 years ago
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
e1a1c8e7de
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
...
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
4 years ago
4a6389316d
masto_fe_view: Remove @default_settings
4 years ago
9e6f4694dd
Pipeline: Unify embedded_object / object_data, move to validator.
4 years ago
762c9ea564
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
4 years ago
2a3abfd326
Merge branch 'issue/1934-welcome-email' into 'develop'
...
[#1934 ] welcome email
See merge request pleroma/pleroma!2786
4 years ago
0d5d1c62ef
Apply 1 suggestion(s) to 1 file(s)
4 years ago
64b21cee14
Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'
...
ReverseProxy: Fix a gun connection leak when there is an error with no body
See merge request pleroma/pleroma!2798
4 years ago
58c09a8258
Merge branch 'fix/update-types-in-link-formatter' into 'develop'
...
Update types in Pleroma.Formatter group in description.exs
See merge request pleroma/pleroma!2796
4 years ago
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
6bf8eee5f9
ReverseProxy tesla client: remove handling of old_conn
...
This is no longer relevant because we use a custom
FollowRedirects middleware now
4 years ago
a7616dec8c
Merge branch 'patch-3' into 'develop'
...
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
See merge request pleroma/pleroma!2797
4 years ago
d4fbec62a3
ReverseProxy: Fix a gun connection leak when there is an error with no
...
body
- Modify `close/1` function to do the same thing it does for hackney,
which is - close the client rather than the whole connection
- Release the connection when there is no body to chunk
4 years ago
6107440ea0
OpenAPI: remove accidentally pasted buffer data
4 years ago
b31844d6e0
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
4 years ago
ce9647aed7
Merge branch 'fix/mix-tasks' into 'develop'
...
Fix/mix tasks
Closes #1972 and #1970
See merge request pleroma/pleroma!2795
4 years ago
4d80cf5409
Update types in Pleroma.Formatter group
4 years ago
643664d583
added migrate old settings to new
4 years ago
65a1b048a8
Ensure Oban is available during mix tasks.
...
Fixes: mix pleroma.user rm username
4 years ago
9be6668236
Fix mix tasks that make HTTP calls by starting the Gun connection pool
4 years ago
1dd6de03ee
CommonAPI Tests: Check that undoing objects federates them as embeds.
4 years ago
3d13fb05f8
Side Effects: On undoing, put information about the undone object.
4 years ago
91f3cf9bc6
Pipeline: Add embedded object federation.
4 years ago
61ef1fca4b
remove duplicate module
4 years ago
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
4 years ago
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
a74951a3b0
Merge branch 'feature/add-mrf-related-policies' into 'develop'
...
Add MRF related policies field to description.exs
See merge request pleroma/pleroma!2790
4 years ago
6100b90209
Merge branch '1976-status-view-fixes' into 'develop'
...
StatusView: Handle badly formatted emoji reactions.
Closes #1976
See merge request pleroma/pleroma!2788
4 years ago
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
4 years ago
76aa49a0c5
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
...
[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
4 years ago
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
b2ba70eec4
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
...
Fix #783 : Make MRF reject log as info level instead of error
Closes #783
See merge request pleroma/pleroma!2758
4 years ago
250e0369c7
Merge branch 'issue/1878' into 'develop'
...
[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
4 years ago
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
4 years ago
7991ddad58
added warning to use old keys
4 years ago
b6488a4db4
Update linkify migration tests to use config from ConfigDB
4 years ago
c7a0016f9f
Migration to fix malformed Pleroma.Formatter config
4 years ago
b87a1f8eaf
Refactor require_migration/1 into a test helper function
4 years ago
67389b77af
Add AutolinkerToLinkify migration test
4 years ago
7045db5a50
Fix linkify ConfigDB migration
4 years ago
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
4 years ago
lain