Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain
d9bf2c58df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
Haelwenn
269b61a240
Merge branch '1996-dont-break-on-chatmessages' into 'develop'
...
EnsureRePrepended: Don't break on chat messages.
Closes #1996
See merge request pleroma/pleroma!2808
4 years ago
lain
de5c7e20a3
Merge branch 'bugfix/remote-user-atom' into 'develop'
...
feed/user_controller: Return 404 when the user is remote
Closes #1911
See merge request pleroma/pleroma!2811
4 years ago
Haelwenn (lanodan) Monnier
2e27847573
feed/user_controller: Return 404 when the user is remote
4 years ago
lain
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
4 years ago
lain
66974e17a0
Endpoint: Serve a dynamically configured admin interface
4 years ago
lain
c25c21dd22
AccountController: Don't explicitly ask to keep users unconfirmed.
...
Confirmation is set in User.register_changeset based on the config
settings.
4 years ago
lain
edf8b6abfe
EnsureRePrepended: Don't break on chat messages.
4 years ago
Alex Gleason
2a99e7df8e
SimpleMRF silence: optimize, work okay with nil values in addressing
4 years ago
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
4 years ago
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
lain
ad5c42628a
FrontendStatic: Add plug to serve frontends based on configuration.
4 years ago
lain
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
Alex Gleason
f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
lain
e1a1c8e7de
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
...
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
4 years ago
Haelwenn (lanodan) Monnier
4a6389316d
masto_fe_view: Remove @default_settings
4 years ago
lain
9e6f4694dd
Pipeline: Unify embedded_object / object_data, move to validator.
4 years ago
lain
762c9ea564
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
4 years ago
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alibek Omarov
6107440ea0
OpenAPI: remove accidentally pasted buffer data
4 years ago
Alibek Omarov
b31844d6e0
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
4 years ago
Lain Soykaf
3d13fb05f8
Side Effects: On undoing, put information about the undone object.
4 years ago
Lain Soykaf
91f3cf9bc6
Pipeline: Add embedded object federation.
4 years ago
feld
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
Mark Felder
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
Haelwenn
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
lain
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
Ivan Tashkinov
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
lain
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
lain
250e0369c7
Merge branch 'issue/1878' into 'develop'
...
[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
4 years ago
lain
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
4 years ago
Ivan Tashkinov
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
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
4 years ago
Lain Soykaf
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
4 years ago
Mark Felder
341a8f3500
Skip the correct plug
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
Mark Felder
97c60b6a43
Merge branch 'develop' into fix/pleroma-api-emoji-packs
4 years ago
lain
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
4 years ago
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
4 years ago
KokaKiwi
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
4 years ago
Haelwenn
10d46235cf
Merge branch 'fix-1958' into 'develop'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
4 years ago
Alex Gleason
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Mark Felder
20a496d2cb
Expose the post formats in /api/v1/instance
4 years ago
Mark Felder
62438530e2
TOTP length is configurable, so we can't hardcode this here.
4 years ago
Alex Gleason
5e74556703
Sanitize `reason` param in POST /api/v1/accounts
4 years ago
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder
3be64556db
Improve TOTP token and recovery input fields in OAuth login
4 years ago
Alex Gleason
9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
Mark Felder
9d30bacace
Merge branch 'develop' into refactor/notification_settings
4 years ago
rinpatch
0fe36b311c
Merge branch 'features/mrf-reasons' into 'develop'
...
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
4 years ago
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
Haelwenn (lanodan) Monnier
e4beff90f5
Create Question: Add context field to create
4 years ago
Haelwenn (lanodan) Monnier
bfe2dafd39
{Answer,Question}Validator: Keep both actor and attributedTo for now but sync them
4 years ago
Haelwenn (lanodan) Monnier
c19bdc811e
Fix attachments in polls
4 years ago
Haelwenn (lanodan) Monnier
d713930ea7
Fixup for EctoType module move
4 years ago
Haelwenn (lanodan) Monnier
435a65b976
QuestionValidator: Use AttachmentValidator
4 years ago
Haelwenn (lanodan) Monnier
fe6924d00d
CreateGenericValidator: add expires_at
4 years ago
Haelwenn (lanodan) Monnier
82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
4 years ago
Haelwenn (lanodan) Monnier
4f70fd4105
question_validator: remove conversation field
4 years ago
Haelwenn (lanodan) Monnier
173f69c854
question_validator: fix for mastodon poll expiration
...
Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380
which runs Mastodon 3.1.4 (SDF runs 3.1.2)
4 years ago
Haelwenn (lanodan) Monnier
47ba796f41
create_question_validator: remove validate_recipients_match
4 years ago
Haelwenn (lanodan) Monnier
4644a8bd10
Fix multiple-choice poll detection
4 years ago
Haelwenn (lanodan) Monnier
10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
4 years ago
Haelwenn (lanodan) Monnier
89a2433154
QuestionOptionsValidator: inline schema for replies
4 years ago
Haelwenn (lanodan) Monnier
c5efaf6b00
AnswerValidator: Create
4 years ago
Haelwenn (lanodan) Monnier
7bcd7a9595
QuestionValidator: Create
4 years ago
Alex Gleason
0d004a9d04
Email admins when a new unapproved account is up for review
4 years ago
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason
20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
4 years ago
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by `need_approval`
4 years ago
Alex Gleason
b750129da1
AdminAPI: Return `approval_pending` with users
4 years ago
Maksim Pechnikov
1dd767b8c7
Include port in host for signatures
4 years ago
Alex Gleason
a1570ba6ad
AdminAPI: Return `registration_reason` with users
4 years ago
feld
3f65f2ea79
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
...
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
4 years ago
feld
2909dc873b
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
...
[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
4 years ago
Ivan Tashkinov
124b4709dc
[ #1940 ] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.
4 years ago
feld
246f49d685
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
...
Transmogrifier: filtering weirdness in address fields
Closes #1916
See merge request pleroma/pleroma!2762
4 years ago
Haelwenn (lanodan) Monnier
858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
4 years ago
Alex Gleason
5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
4 years ago
=
b221b640a2
Transmogrifier: filtering weirdness in address fields
4 years ago
Mark Felder
80c21100db
Merge branch 'develop' into refactor/notification_settings
4 years ago
feld
5d215fd81f
Merge branch 'config-behaviours-runtime' into 'develop'
...
Config/Docs: Expand behaviour suggestions modules at runtime
Closes #1941
See merge request pleroma/pleroma!2755
4 years ago
Haelwenn (lanodan) Monnier
ce243b107f
Use Logger.info for {:reject, reason}
4 years ago
Haelwenn (lanodan) Monnier
2aac92e9e0
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
4 years ago
Alex Gleason
e4e5577818
Prevent unapproved users from logging in
4 years ago
Alex Gleason
51ab8d0128
Add `account_approval_required` instance setting
4 years ago
href
4347d2de5e
Config/Docs: Expand behaviour suggestions at runtime
4 years ago
Alexander Strizhakov
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
4 years ago
Maksim Pechnikov
62fc8eab0d
fix reset confirmation email in admin section
4 years ago
lain
93e494ec21
ActivityPub: Don't rename a clashing nickname with the same ap id.
4 years ago
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Haelwenn
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
d23804f191
Use the Pleroma.Config alias
4 years ago
lain
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
...
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
4 years ago
lain
f4469dc741
Merge branch 'features/favicons' into 'develop'
...
Add support for remote favicons
See merge request pleroma/pleroma!2261
4 years ago
Haelwenn
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
4 years ago
eugenijm
c2be0da79f
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
4 years ago
Haelwenn
68036f5a3b
Merge branch 'follow-pipeline' into 'develop'
...
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
4 years ago
lain
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
4 years ago
lain
00e54f8fe7
ActivityPub: Remove `follow` and fix issues.
4 years ago
lain
9dda8b5427
CommonAPI: Switch to pipeline for following.
4 years ago
lain
172f4aff8e
Transmogrifier: Move following to the pipeline.
4 years ago
lain
7d0e2b3fdd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
4 years ago
lain
cdc153db31
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
4 years ago
lain
6335b32aa8
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
...
[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
4 years ago
Ivan Tashkinov
a6495f4a68
[ #1895 ] credo fix.
4 years ago
lain
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
4 years ago
Ivan Tashkinov
3f8370a285
[ #1895 ] Applied code review suggestion.
4 years ago
Maksim Pechnikov
e341f81785
fixed delete `Like` activity in remove user
4 years ago
Haelwenn (lanodan) Monnier
31fef95e35
Add changelog and documentation
4 years ago
Haelwenn (lanodan) Monnier
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
Haelwenn (lanodan) Monnier
013e2c5057
Use instances table instead of Cachex
4 years ago
Haelwenn (lanodan) Monnier
6a679d80c9
Move get_favicon to Pleroma.Instances, use /
4 years ago
Haelwenn (lanodan) Monnier
f6d09fafee
Add support for remote favicons
4 years ago
Haelwenn
a8447c3803
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
...
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
4 years ago
Haelwenn
db13acf242
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
...
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
4 years ago
lain
8939ff39e4
Merge branch 'remove-twitter-api' into 'develop'
...
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
4 years ago
Ivan Tashkinov
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
Mark Felder
18438a9bf0
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
4 years ago
lain
c8dd973af5
AccountController: Remove unused `update_?` routes.
...
These were not documented and are also not used anymore.
4 years ago
lain
59cf78e412
AccountController: Allow removal / reset of user images.
4 years ago
lain
9ad305209a
Merge branch 'bugfix/peertube-videos' into 'develop'
...
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
4 years ago
Haelwenn
fa0fa4552f
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
...
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
4 years ago
Haelwenn (lanodan) Monnier
fbb9743a70
Fix getting videos from peertube
4 years ago
Haelwenn
d81acb5f62
Merge branch 'description-limits' into 'develop'
...
Add limits to image descriptions
See merge request pleroma/pleroma!2724
4 years ago
lain
a6a12b241f
FollowValidator: Add basic validation.
4 years ago
lain
28feba8af4
Preloaders: Remove status_net preloader
4 years ago
lain
1963e143c5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
4 years ago
lain
208baf157a
ActivityPub: Add new 'capabilities' to user.
4 years ago
lain
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain
cc8b4e48d9
InstanceView: Add chat limit, description limit
4 years ago
Alexander Strizhakov
20c27bef40
renaming back and reject nil on create
4 years ago
Sergey Suprunenko
8277b29790
Restrict thread statuses that contain user's irreversible filters
4 years ago
Sergey Suprunenko
4a8c26654e
Restrict statuses that contain user's irreversible filters
4 years ago
Roman Chvanikov
fc1f34b851
Delete activity before sending response to client
4 years ago
lain
cf56655614
Streamer: Don't filter out announce notifications.
4 years ago
lain
c2a052a346
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
...
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
4 years ago
lain
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
lain
945e75c8e8
SearchController: Trim query.
4 years ago
lain
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
4 years ago
lain
4a7b89e372
ChatMessageValidator: Additional validation.
4 years ago
lain
3ca9af1f9f
Account Schema: Add `accepts_chat_messages`
4 years ago
lain
5c0bf4c472
ActivityPub: Ingest information about chat acceptance.
4 years ago
lain
26a7cc3f00
UserView: Add acceptsChatMessages field
4 years ago
lain
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
4 years ago
Mark Felder
8121e46f25
Merge branch 'develop' into activation-meta
4 years ago
Mark Felder
d44ec2bf4c
Remove camelCase from the keys
4 years ago