Commit Graph

3479 Commits (f67c967c4a614262a6409f94ad74754b09dc0e64)

Author SHA1 Message Date
Ivan Tashkinov 95529ab709 [#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
feld 14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop'
4 years ago
Haelwenn f99b8a25eb Merge branch 'reject' into 'develop'
4 years ago
lain 5be25b3e38 Merge branch '1152-deletion' into 'develop'
4 years ago
Maksim Pechnikov 56470647de Merge branch 'develop' into issue/1936
4 years ago
feld dfc56de167 Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
4 years ago
lain 05ff666f99 AdminApiControllerTest: Add test that `deleted` users get deactivated.
4 years ago
lain 7224bf309e Transmogrifier: Move Rejects to the Pipeline
4 years ago
lain 62f7cca9a1 Transmogrifier Tests: Extract rejections.
4 years ago
lain bb92ad44a6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
4 years ago
lain 0589e9156a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain f988d82e46 Transmogrifier: Handle accepts with the pipeline
4 years ago
lain 9dda13bfa1 Transmogrifier Test: Remove mastodon hack test.
4 years ago
lain 3f6d50111e Linter fixes.
4 years ago
lain da3f9b9988 Transmogrifier: Remove handling of orphaned accepts
4 years ago
lain 8b1e8bec2f AcceptValidation: Codify accept rules.
4 years ago
lain f1a0c10b17 AcceptValidator: Add basic validator with tests.
4 years ago
Ivan Tashkinov 2def3cbf41 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain 8f9fbc86c0 Transmogrifier: Small readability changes.
4 years ago
lain 54a6855ddf Transmogrifier Tests: Extract Accept handling
4 years ago
lain 686002164a Merge branch '204-fix' into 'develop'
4 years ago
lain 677abbf0ee Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain 7e4932362b SideEffects: Handle strange deletion case.
4 years ago
Maksim Pechnikov 345ac512e4 added paginate+search for admin/MediaProxy URLs
4 years ago
Egor Kislitsyn 249f21dcbb Admin API: Filter out unapproved users when the `active` filter is on
4 years ago
lain 66122a11b5 AccountController: Build the correct update activity.
4 years ago
lain d0fc48ea67 Merge branch 'develop' into 'feat/floki-fast-html-2'
4 years ago
Mark Felder 54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
Alex Gleason 673e8e3ac1
Force 204 responses to be empty, fixes #2029
4 years ago
rinpatch 7e23a48d38 rel me test: fix HTML so broken browsers (and therefore
4 years ago
rinpatch 325c7c924b Make Floki use fast_html
4 years ago
lain 34cbe9f44a Merge branch 'features/poll-validation' into 'develop'
4 years ago
Maksim Pechnikov 8e90cc58e7 Merge branch 'develop' into feature/update-welcome-setting-in-description
4 years ago
Maksim Pechnikov 6e6276b4f8 added test
4 years ago
Ivan Tashkinov 56ddf20208 Removed unused alias.
4 years ago
Ivan Tashkinov 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain 10b0e55acf Merge branch 'whole-word-filter-hotfix' into 'develop'
4 years ago
Mary Kate f785dba09b changelog for filter whole_word fix
4 years ago
Mary Kate d6ab9f2132 update test for whole_word in filter
4 years ago
lain 9c96fc052a CommonValidations: Extract modification right checker
4 years ago
Mark Felder 0f9aecbca4 Remove fallback to local database when LDAP is unavailable.
4 years ago
Mark Felder f7146583e5 Remove LDAP mail attribute as a requirement for registering an account
4 years ago
lain 19c108170e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain 474aba984f Merge branch 'unique-app-id' into 'develop'
4 years ago
rinpatch b1b6a7dfa8 Merge branch 'deactivated-user-posts' into 'develop'
4 years ago
Alex Gleason 184742af5e
Unique apps.client_id for new installations, fixes #2022
4 years ago
Egor Kislitsyn 91fbb5b21f
Fix ActivityExpirationPolicy
4 years ago
lain 878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain 36aa34a1a8 MastodonAPITest: Do the needful
4 years ago
Haelwenn (lanodan) Monnier 0f088d8ce3
question_validator: Allow content to be an empty-string (blank)
4 years ago
lain 1a00713744 CommonValidations: Treat deactivated users as not present.
4 years ago
lain 0cfadcf2ca TransmogrifierTest: Add test for deactivated users
4 years ago
lain e92c040ad3 CommonAPITest: Add test that deactivated users can't post.
4 years ago
lain 28584bb224 Merge branch 'email-blacklist' into 'develop'
4 years ago
Alex Gleason 4f57e85ab9
Email blacklist: Update phrasing again
4 years ago
Alex Gleason 058daf498f
Email blacklist: Update response phrasing
4 years ago
lain 56b5b9aa27 Merge branch 'follower-mrf-again' into 'develop'
4 years ago
lain de3bdc63ad AccountControllerTest: Add test for message returned.
4 years ago
lain 5876d5123c Merge branch 'object-age-fix' into 'develop'
4 years ago
lain 10c792110e MRF Object Age Policy: Don't break on messages without cc/to
4 years ago
lain 4b18a07392 Revert "Merge branch 'revert-1ac0969c' into 'develop'"
4 years ago
lain 010d77ec85 Revert "Merge branch 'mrf-silence-2' into 'develop'"
4 years ago
lain 1ac0969c72 Merge branch 'mrf-silence-2' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
4 years ago
Ivan Tashkinov 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed.
4 years ago
lain 1dd162a5f7 SimplePolicy: Fix problem with DM leaks.
4 years ago
Haelwenn d1cf1108ac Merge branch 'render-preview-cards-in-chats' into 'develop'
4 years ago
Haelwenn 87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop'
4 years ago
lain 781b270863 ChatMessageReferenceView: Display preview cards.
4 years ago
lain 873ff5ce14 Merge branch 'hide-reactions' into 'develop'
4 years ago
lain e2e66e50d3 SimplePolicyTest: Add test for leaking DMs.
4 years ago
Maksim Pechnikov cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency
4 years ago
Alex Gleason 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
Alex Gleason 00d090004e
:show_reactions, refactor the other test
4 years ago
Alex Gleason 026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
4 years ago
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
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'
4 years ago
lain de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop'
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'
4 years ago
lain c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed.
4 years ago
lain edf8b6abfe EnsureRePrepended: Don't break on chat messages.
4 years ago
Maksim Pechnikov 15b8446cdb updated dev & test packages
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
Alex Gleason f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
Alex Gleason f43518eb74
Lint, fix test
4 years ago
lain 9e6f4694dd Pipeline: Unify embedded_object / object_data, move to validator.
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Lain Soykaf 1dd6de03ee CommonAPI Tests: Check that undoing objects federates them as embeds.
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'
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'
4 years ago
lain 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
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'
4 years ago
lain 250e0369c7 Merge branch 'issue/1878' into 'develop'
4 years ago
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
4 years ago
Lain Soykaf 0cb9e1da74 StatusView: Handle badly formatted emoji reactions.
4 years ago
Mark Felder 109836306c Test that Emoji Packs can be listed when instance is not public
4 years ago
Ivan Tashkinov b8021016eb [#2497] Resolved merge conflicts.
4 years ago
Egor Kislitsyn bdb3375933
Allow unblocking a domain via query params
4 years ago
Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Alex Gleason 15f8921b11
Test that unapproved users can never log in regardless of admin settings
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'
4 years ago
Haelwenn (lanodan) Monnier d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
Maksim Pechnikov 3f8bff8d6b Merge branch 'develop' into issue/sign-authority
4 years ago
Haelwenn (lanodan) Monnier e4beff90f5
Create Question: Add context field to create
4 years ago
Haelwenn (lanodan) Monnier 922ca23298
Question: Add tests on HTML tags in options
4 years ago
Haelwenn (lanodan) Monnier c19bdc811e
Fix attachments in polls
4 years ago
lain 040524c09f Merge branch 'tests/apc2s-update_outbox' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 39870d99b8
transmogrifier tests: Move & enhance in specialised modules
4 years ago
Haelwenn (lanodan) Monnier 82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
4 years ago
Haelwenn (lanodan) Monnier 10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
4 years ago
Haelwenn (lanodan) Monnier 7bcd7a9595
QuestionValidator: Create
4 years ago
Haelwenn (lanodan) Monnier 6d8427cca2
AP C2S tests: Make sure you can't use another user's AP id
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'
4 years ago
feld 2909dc873b Merge branch '1940-admin-token-oauthless-auth' into 'develop'
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'
4 years ago
Haelwenn (lanodan) Monnier 858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
4 years ago
Ivan Tashkinov cf3f8cb72a [#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
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 8f9ee694ed Merge branch 'features/profile-fields-emojo' into 'develop'
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
Haelwenn f918b6f86d Merge branch '1937-renaming' into 'develop'
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
Alexander Strizhakov b376442325
MediaProxy whitelist setting now supports hosts with scheme
4 years ago
Maksim Pechnikov 62fc8eab0d fix reset confirmation email in admin section
4 years ago
Mark Felder 3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban
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'
4 years ago
Haelwenn (lanodan) Monnier cc7153cd82
user: Add support for custom emojis in profile fields
4 years ago
lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop'
4 years ago
lain f4469dc741 Merge branch 'features/favicons' into 'develop'
4 years ago
Haelwenn bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop'
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
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 6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
4 years ago
lain c0385cf47a AccountController: Fix muting / unmuting reblogs.
4 years ago
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
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'
4 years ago
lain 8939ff39e4 Merge branch 'remove-twitter-api' into 'develop'
4 years ago
Ivan Tashkinov 3e08e77151 [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
lain c8dd973af5 AccountController: Remove unused `update_?` routes.
4 years ago
lain 59cf78e412 AccountController: Allow removal / reset of user images.
4 years ago
lain 9ad305209a Merge branch 'bugfix/peertube-videos' into 'develop'
4 years ago
Haelwenn fa0fa4552f Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier fbb9743a70
Fix getting videos from peertube
4 years ago
Haelwenn d81acb5f62 Merge branch 'description-limits' into 'develop'
4 years ago
lain a6a12b241f FollowValidator: Add basic validation.
4 years ago
lain 4e3b3998ad BlockValidation test: Rename.
4 years ago
lain eb87430803 ObjectValidator tests: Extract block validation tests.
4 years ago
lain 410c1fab31 ObjectValidator tests: Extract update validation tests.
4 years ago
lain b2e1ea9226 ObjectValidation tests: Extract announce validation tests.
4 years ago
lain bbaf108aee ObjectValidator tests: Extract undo validation tests.
4 years ago
lain 168256dce9 ObjectValidation tests: Extract like validation tests.
4 years ago
lain e6a13d97d0 ObjectValidation tests: Extract delete validation tests.
4 years ago
lain 60d4c6c91d ObjectValidator tests: Extract emoji react testing
4 years ago
lain e0baaa967c ObjectValidator tests: Extract chat tests
4 years ago
lain 0aa4c20d78 ObjectValidator Test: Extract attachments.
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 ed4f9f6a29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
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 818f3c2393
test fixes
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
lain cf56655614 Streamer: Don't filter out announce notifications.
4 years ago
Mark Felder 4695bdd81b Merge branch 'develop' into issue/1790-updated-oban
4 years ago
lain c2a052a346 Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
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