Commit Graph

4507 Commits (858dbe43607b31cba8c319755c92099cd2c9f5c1)

Author SHA1 Message Date
Ilja f671d7e68c Add welcome chatmessages
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
lain d39b72c8fa Merge branch 'feature/captcha-expose-timeout' into 'develop'
4 years ago
Maksim Pechnikov cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency
4 years ago
Mark Felder 33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint
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 dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain a6d3bb5f30 Merge branch 'issue/1023' into 'develop'
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 6a25f72a75 FrontendStatic: Work correctly for other frontend types.
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
lain ad5c42628a FrontendStatic: Add plug to serve frontends based on configuration.
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
Alex Gleason 6f44a0ee84
Add configurable registration_reason limit
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
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
lain 2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop'
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Maksim Pechnikov 643664d583 added migrate old settings to new
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
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
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
lain a81581472f Merge branch 'linkify' into 'develop'
4 years ago
Maksim Pechnikov 7991ddad58 added warning to use old keys
4 years ago
Alex Gleason b6488a4db4
Update linkify migration tests to use config from ConfigDB
4 years ago
Alex Gleason c7a0016f9f
Migration to fix malformed Pleroma.Formatter config
4 years ago
Alex Gleason b87a1f8eaf
Refactor require_migration/1 into a test helper function
4 years ago
Alex Gleason 67389b77af
Add AutolinkerToLinkify migration test
4 years ago
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
4 years ago
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
4 years ago
Lain Soykaf 0cb9e1da74 StatusView: Handle badly formatted emoji reactions.
4 years ago
Maksim Pechnikov 5879d36854 fix sender for welcome email
4 years ago
Maksim Pechnikov 8d6f7aec21 Merge branch 'develop' into issue/1023
4 years ago
Maksim Pechnikov 7cafb96c02 added tests
4 years ago
Mark Felder 109836306c Test that Emoji Packs can be listed when instance is not public
4 years ago
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
4 years ago
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
4 years ago
lain 2b5d9eb105 Merge branch 'linkify' into 'develop'
4 years ago
lain fa2421dd7e Merge branch 'gopher-fix' into 'develop'
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
Alexander Strizhakov 6afc6717d6
copy tmp file if test depends on it
4 years ago
Maksim Pechnikov 3edaecae96 added welcome email
4 years ago
Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
Alex Gleason ae74c52e22
Test angry face in formatter D:< #1968
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 5756843736
Fully delete users with status :approval_pending
4 years ago
Alex Gleason 880301985b
Formatter: Test link with local mention
4 years ago
Maksim Pechnikov 6c59fe259d Merge branch 'develop' into issue/1023
4 years ago
Alex Gleason 9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry
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
href e499275076 Don't test tls_options in adapter helper test.
4 years ago
rinpatch bf3492ceb3 Connection Pool: add tests
4 years ago
rinpatch 721e89e88b Remove tests for old pool
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 173f69c854
question_validator: fix for mastodon poll expiration
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 fab44f6970
Test User with confirmation_pending: true, approval_pending: true
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
Mark Felder 777a7edc6b Lint and fix test to match new log message
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 9b225db7d8 [#1940] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.
4 years ago
Ivan Tashkinov cf3f8cb72a [#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
4 years ago
Maksim Pechnikov 3062f86613 added generated `pleroma.env`
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'
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 bcfd38c8f3
Make a user unapproved when registering with `account_approval_required` on
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
Alex Gleason a62f17da17
Add `approval_pending` field to User
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
4 years ago
Roman Chvanikov aedbbec88a Add Pleroma.Utils.command_available?/1 and use where appropriate
4 years ago
Maksim Pechnikov 62fc8eab0d fix reset confirmation email in admin section
4 years ago
Mark Felder 6167593881 Support Exiftool for stripping EXIF data
4 years ago
Mark Felder 3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban
4 years ago
feld ce9514000d Merge branch 'proxy-range-and-chunk' into 'develop'
4 years ago
href a1dace088c ReverseProxy: Streaming and disable encoding if Range
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 31a0ed5d01 Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
4 years ago
lain 4d809144d8 Merge branch 'cluster-test-ci' into 'develop'
4 years ago
Haelwenn 4ac6e6283f Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
4 years ago
Haelwenn 5ea6387572 Merge branch 'user-search-nickname-rank-boost' into 'develop'
4 years ago
stwf 08211eff22 Re-enable the federated tests, increase timeout
4 years ago
Haelwenn (lanodan) Monnier cc7153cd82
user: Add support for custom emojis in profile fields
4 years ago
Mark Felder 2b979cc90c Add AdminFE reports URL to report emails
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
Haelwenn 68036f5a3b Merge branch 'follow-pipeline' into 'develop'
4 years ago
Maksim Pechnikov 31259cabcc fix test
4 years ago
Ivan Tashkinov 123352ffa1 Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
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'
4 years ago
Ivan Tashkinov 704a383055 Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
4 years ago
lain c0385cf47a AccountController: Fix muting / unmuting reblogs.
4 years ago
Maksim Pechnikov e341f81785 fixed delete `Like` activity in remove user
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
rinpatch 69f0b286f7 Merge branch '1915-dont-filter-announce-notifications' into 'develop'
4 years ago
lain cc8b4e48d9 InstanceView: Add chat limit, description limit
4 years ago
lain af7720237b Upload: Restrict description length
4 years ago
Alexander Strizhakov 818f3c2393
test fixes
4 years ago
Alexander Strizhakov 028a241b7d
tests fixes
4 years ago
Alexander Strizhakov 20c27bef40
renaming back and reject nil on create
4 years ago
Alexander Strizhakov 52ff75413a
Apply suggestion to test/notification_test.exs
4 years ago
Alexander Strizhakov 086a260c04
Apply suggestion to test/notification_test.exs
4 years ago
Sergey Suprunenko 8277b29790
Restrict thread statuses that contain user's irreversible filters
4 years ago
Sergey Suprunenko 5af1bf443d
Skip notifications for statuses that contain an irreversible filtered word
4 years ago
Sergey Suprunenko 4a8c26654e
Restrict statuses that contain user's irreversible filters
4 years ago
Alexander Strizhakov 480dfafa83
don't save tesla settings into db
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 9a27ef47f1 Merge branch '1912-leading-trailing-space-search' 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 19fbfbb767 Merge branch '1892-exclude-bots-from-search-results' into 'develop'
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 5c0bf4c472 ActivityPub: Ingest information about chat acceptance.
4 years ago
lain 26a7cc3f00 UserView: Add acceptsChatMessages field
4 years ago
lain db76c26469 AccountViewTest: Fix test.
4 years ago
lain 3250228be9 AccountView: Add 'accepts_chat_messages' to view.
4 years ago
lain 98bfdba108 User: On registration, set `accepts_chat_messages` to true.
4 years ago
Ivan Tashkinov 90764670dc [#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.
4 years ago
Mark Felder 8121e46f25 Merge branch 'develop' into activation-meta
4 years ago
Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
rinpatch 4c044f6225 Merge branch 'fetcher-fixes' into 'develop'
4 years ago
lain 311b7c19d0 Streamer: Align announce streaming with polling.
4 years ago
lain 61fe94d698 SideEffects: Refactor.
4 years ago
rinpatch fa7a0be225 Merge branch '1716-handle-nickname-clashes' into 'develop'
4 years ago
lain fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id
4 years ago
lain ce92e6e5ce Fetcher: Work when we can't get the OP.
4 years ago
lain 8ae572d5ae Fixtures: Pretty print.
4 years ago
lain 691742e62d Revert "Merge branch 'avatar-removing' into 'develop'"
4 years ago
Mark Felder 5a8e0208b1 Add fields limits to instance metadata, add tests
4 years ago
Ivan Tashkinov 3d2989278c [#1892] Excluded bot actors (applications, services) from search results.
4 years ago
Mark Felder d69af7f742 Rename user.settings column
4 years ago
lain 0176b7bca2 Merge branch 'preload-fixups-2' into preloadfixups
4 years ago
lain 2382a2a151 Preload: Load the correct instance panel
4 years ago
rinpatch 7bb3618939 Merge branch 'fix-notification-filtering' into 'develop'
4 years ago
lain c01f4ca07f Notification: Remove TODO.
4 years ago
lain 90083a754d Notifications: Never return `nil` in the notification list.
4 years ago
Egor Kislitsyn 3aa04b81c4
Test default "content-type" for CastAndValidate
4 years ago
lain 07ff2d62f4 Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
4 years ago
Alexander Strizhakov 6512ef6879
excluding attachment links from RichMedia
4 years ago
Egor Kislitsyn 4a306720e8
Merge branch 'develop' into remove-twitter-api
4 years ago
lain 651f269568 Merge branch 'avatar-removing' into 'develop'
4 years ago
lain e64d08439e UpdateCredentialsTest: Add test for removing profile images.
4 years ago
lain 8630a6c7f5 Preloaders: Use strings as keys.
4 years ago
lain a19f8778af User preloader: Put user info at correct key
4 years ago
lain 577da132da Merge branch '1031-parent-visible' into 'develop'
4 years ago
Mark Felder ce85db41a3 Lint
4 years ago
Haelwenn (lanodan) Monnier 244655e884
MastoAPI: Show source field when deleting
4 years ago
Mark Felder 69848d5c97 Rename notification "privacy_option" setting
4 years ago
Haelwenn bf1c5e255a Merge branch 'block-handling' into 'develop'
4 years ago
Haelwenn 09478c9cf7 Merge branch '1258-anti-link-spam-exemption' into 'develop'
4 years ago
Mark Felder fd5e797379 Simplify notification filtering settings further
4 years ago
Mark Felder b950fb01db Merge branch 'develop' into refactor/notification_settings
4 years ago
lain a5bbfa21a1 StaticFE: Prioritize json in requests.
4 years ago
lain f378e93bf4 AccountController: Return scope in proper format.
4 years ago
lain a2002ebb63 Preloading: Fix nodeinfo url.
4 years ago
lain 4a7a34ae8c Preloading: Return correct data for statusnet stuff.
4 years ago
lain 7ed2296416 Nodeinfo: Add chat information back in.
4 years ago
lain 15a8b70318 User: Don't unfollow on block when the relevant setting is set.
4 years ago
lain c3383d4fab BlockValidator: Restore old behavior for incoming blocks.
4 years ago
Haelwenn (lanodan) Monnier 27c33f216a
activity_draft: Add source field
4 years ago
feld 8288419686 Merge branch 'preload-data' into 'develop'
4 years ago
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings
4 years ago
lain 04abee782b AntiSpamLinkPolicy: Exempt local users.
4 years ago
lain 1cd1977c0f Merge branch 'issue/1872-ex_aws' into 'develop'
4 years ago
lain 84f9ca1956 Blocking: Don't federate if the options is set.
4 years ago
lain 44bb7cfccd ActivityPub: Remove `block`.
4 years ago
lain e38293c8f1 Transmogrifier: Switch to pipeline for Blocks.
4 years ago
lain 89e5b2046b ObjectValidator: Basic `Block` support.
4 years ago
lain d137f934df Transmogrifier Test: Extract block handling.
4 years ago
lain 0e26ef2ab9 Merge branch 'fix/following-request-from-deactivated' into 'develop'
4 years ago
Maksim Pechnikov 439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3
4 years ago
Mark Felder 67ab580553 Filter outstanding follower requests from deactivated accounts
4 years ago
lain 35f6770436 StatusView: Add pleroma.parent_visible
4 years ago
lain 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
4 years ago
lain 65f3eb333b Apply suggestion to test/http/tzdata_test.exs
4 years ago
Maksim Pechnikov 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient
4 years ago
lain 98af7b59e4 Merge branch 'update-validator' into 'develop'
4 years ago
Roman Chvanikov 1471b70ef1 Merge develop
4 years ago
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
4 years ago
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1
4 years ago
lain b7f297f0bd Merge branch 'issue/1798' into 'develop'
4 years ago
lain adc199c6a8 ActivityPubControllerTest: Capture error log
4 years ago
lain d93e01137b ActivityPubControllerTest: Testing changes.
4 years ago
lain 2737809bbf An act of desperation.
4 years ago
lain 2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Maksim Pechnikov 84aa9c78dd fix tests
4 years ago
Maksim Pechnikov 2715c40e1d added tests
4 years ago
lain 46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop'
4 years ago
Egor Kislitsyn 7e6f43c0d7
Add `is_muted` to notifications
4 years ago
Maksim Pechnikov b0a40fc2e4 added verify RUM settings before start app
4 years ago
lain 59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop'
4 years ago
lain 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
4 years ago
lain e785cd5cae ActivityPub: Remove `update` and switch to pipeline.
4 years ago
rinpatch c75ba63bef Merge branch '1865-media-only' into 'develop'
4 years ago
lain 1e7ca24430 Update Handling Test: Fix for re-used update ids.
4 years ago
lain 31a4d42ce0 SideEffects: Handle user updating.
4 years ago
rinpatch 282f492cd5 Merge branch '1883-mrf-chat' into 'develop'
4 years ago
lain 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop'
4 years ago
lain 35e9282ffd HellthreadPolicy: Restrict to Notes and Articles.
4 years ago
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE
4 years ago
lain 31761340fe Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
4 years ago
lain 7d542450b1 Merge branch 'develop' into '1865-media-only'
4 years ago
Alexander Strizhakov 1a704e1f1e
fix for packs pagination
4 years ago
Haelwenn (lanodan) Monnier 3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
4 years ago
feld f928267773 Merge branch 'issue/1855' into 'develop'
4 years ago
Sergey Suprunenko b63646169d
Add support for bot field in update_credentials
4 years ago
lain 75670a99e4 UpdateValidator: Only allow updates from the user themselves.
4 years ago
lain abdb540d45 ObjectValidators: Add basic UpdateValidator.
4 years ago
Ivan Tashkinov 5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
lain 7e488cd4a7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Alexander Strizhakov 3e3f9253e6
adding overall count for packs and files
4 years ago
Alexander Strizhakov 4975ed86bc
emoji pagination for pack show action
4 years ago
Alexander Strizhakov 3becdafd33
emoji packs pagination
4 years ago
Maksim Pechnikov e4c61f1741 added test
4 years ago
Maksim Pechnikov 4044f24e2e fix test
4 years ago
Mark Felder 2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
4 years ago
Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855
4 years ago
lain d772361e62 Merge branch 'fix/1787-mogrify-args' into 'develop'
4 years ago
Maksim 96493da7bd Apply suggestion to test/web/media_proxy/invalidation_test.exs
4 years ago
Maksim 078d687e6e Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
4 years ago
Maksim 2991aae4c4 Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
4 years ago
Maksim 11b22a4229 Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
4 years ago
Maksim 6d33a3a51b Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim 793a53f1ec Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim 1b45bc7b2a Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
rinpatch 4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop'
4 years ago
Haelwenn b536e57124 Merge branch '1866-last-status-stuff' into 'develop'
4 years ago
Alexander Strizhakov b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group
4 years ago
Alexander Strizhakov 3c2cee33ad
moving custom ecto types in context folders
4 years ago
Alexander Strizhakov e1603ac8fe
fix attemps to merge map
4 years ago
Alexander Strizhakov 23decaab81
fix for updated hackney
4 years ago
Alexander Strizhakov 9a4fde9766
Mogrify args as custom tuples
4 years ago
lain 015f9258a9 Transmogrifier: Extract user update handling tests.
4 years ago
lain 1eb6cedaad ActivityPub: When restricting to media posts, only show 'Creates'.
4 years ago
stwf faba1a6e33 fix tests
4 years ago
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855
4 years ago
Egor Kislitsyn bd63089a63
Fix tests
4 years ago
Egor Kislitsyn 58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Maksim Pechnikov 62b8c31b7a added tests
4 years ago
lain b7df7436c8 Conversations: Return last dm for conversation, not last message.
4 years ago
Maksim Pechnikov 2e8a236cef fix invalidates media url's
4 years ago
eugenijm b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch 271ea5068f Merge branch '1851-favorites-pagination' into 'develop'
4 years ago
href cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn 520367d6fd Fix atom leak in Rich Media Parser
4 years ago
Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data
4 years ago
Haelwenn 4115701f71 Merge branch 'recipients-experiments' into 'develop'
4 years ago
Egor Kislitsyn 697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain e557265a03 Merge branch 'global-status-expiration' into 'develop'
4 years ago
Mark Felder 34593d6aa5 Merge branch 'develop' into features/mix-task-reset-mfa
4 years ago