Commit Graph

703 Commits (b5b98f9e10ebe9742aa5b00b93b6491dc1dddee3)

Author SHA1 Message Date
Alex Gleason 7ebbe11e75 user_agent_mock --> request_mock
4 years ago
Alex Gleason 1dc5794e29 Never forward the client's user-agent through the media proxy
4 years ago
Mark Felder b1e1db82bc Store application details in the object under the generator key, not application key
4 years ago
lain e8d88a72cf Merge branch 'fix/warning-in-test' into 'develop'
4 years ago
lain 4a9d3a1f28 Merge branch 'features/reports-enhancements' into 'develop'
4 years ago
Alexander Strizhakov f85ed1c521
warning fix
4 years ago
lain 050c4b1f14 Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
4 years ago
lain e6a14e1cd1 Merge branch 'feat/client_app_details' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
4 years ago
lain d0823d7f1e Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
4 years ago
Mark Felder d35b6254b4 Store the client application data in ActivityStreams format
4 years ago
Mark Felder 902d4e4a4a Leave a note for future explorers
4 years ago
Mark Felder 2da71a526f No need to filter out Mix.env() from the API routes.
4 years ago
Mark Felder 6b87dfad5d Filter out MIX_ENV from route list and add a test
4 years ago
Ivan Tashkinov 8f88a90ca3 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov 77f3da0358 [#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
4 years ago
Haelwenn (lanodan) Monnier 7fc9cd0974
Video: Handle peertube videos only stashing attachments in x-mpegURL
4 years ago
Mark Felder 63739c5a58 Tests to validate client disclosure obeys user setting
4 years ago
Mark Felder d5ef02c7a7 Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
4 years ago
Alexander Strizhakov 1e6c27181e
expires_in in scheduled status params
4 years ago
rinpatch 6d66fadea7 Remove `:auth, :enforce_oauth_admin_scope_usage`
4 years ago
Haelwenn (lanodan) Monnier ff72ce31ca
Enhance reports in Pleroma API: index, show
4 years ago
Haelwenn e7b1f0f5f4 Merge branch 'feat/chat-list-pagination' into 'develop'
4 years ago
rinpatch 158f9f18ee Merge branch 'remove-conversation-api' into 'develop'
4 years ago
rinpatch 264cb2c77f Merge branch '2510-oauth-app-tokens-further-support' into 'develop'
4 years ago
rinpatch d7ad288c84 Chats: Introduce /api/v2/pleroma/chats which implements pagination
4 years ago
Ivan Tashkinov 111bfdd3a0 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov 1dac7d1462 [#3213] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
4 years ago
Egor Kislitsyn cf6d3db58f
Add API endpoint to remove a conversation
4 years ago
Mark Felder fb2a8e7ccd Additional validation so we don't get caught off guard with a nil response
4 years ago
Mark Felder 3554a65f45 Inject fake application metadata and validate it is stripped by transmogrifier
4 years ago
rinpatch db716f860a Merge branch 'not-used-mock' into 'develop'
4 years ago
rinpatch 76414ad277 Merge branch 'bugfix/answer-outbox' into 'develop'
4 years ago
Mark Felder bd3d0e8b57 Use a custom oauth token so we can predict and validate the client_name and website
4 years ago
Mark Felder 333ff527fd Validate client application metadata is retained in the object
4 years ago
Ivan Tashkinov 5992382cf8 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov df89b5019b [#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
4 years ago
Alexander Strizhakov b5d001fc8c
not used mock
4 years ago
rinpatch a853218701 Merge branch 'features/ap_id-c2s-authentication' into 'develop'
4 years ago
feld 593c0851d9 Merge branch 'develop' into 'new-user-emails'
4 years ago
Haelwenn a5bee1bf35 Merge branch 'feat/mrf-noemptypolicy' into 'develop'
4 years ago
Mark Felder 55a13fc360 MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
4 years ago
Haelwenn (lanodan) Monnier 8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints
4 years ago
Ivan Tashkinov d1c6dd97aa [#3213] Partially addressed code review points.
4 years ago
Mark Felder 6a3e75c8e6 Lint
4 years ago
Mark Felder c361440396 Add basic test to validate the registration email is dispatched when the others are disabled
4 years ago
Mark Felder d047372291 Merge branch 'develop' into fix/reports-from-admins
4 years ago
feld 7b67bf4e97 Merge branch 'fix/configdb-error' into 'develop'
4 years ago
Haelwenn ea5469961a Merge branch 'bugfix/notice-external-redirect' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier ecff027418
Redirect non-local activities when /notice/:id is used
4 years ago
Mark Felder 5bb5949048 Validate admin making report doesn't get their own report notification, but other admins do
4 years ago
feld 008499f65a Merge branch 'develop' into 'fix/2412-filters'
4 years ago
feld c3dd860a02 Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
4 years ago
feld 8d2ea95402 Merge branch 'feature/2438-users-posts-total-count' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier fb25231fbe
Add test for Answer presence into an authenticated /outbox
4 years ago
Ivan Tashkinov 4e14945670 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
feld f1f773f2c7 Merge branch 'email-stub-in-verify-credentials' into 'develop'
4 years ago
feld d37d4106c6 Merge branch 'fix/majic-nits' into 'develop'
4 years ago
Mark Felder 28d2917c3a Merge branch 'develop' into fix/majic-nits
4 years ago
feld d289ad8579 Merge branch 'develop' into 'fix/2411-mutes-api'
4 years ago
feld cd5ff7a943 Merge branch 'develop' into 'feature/2164-unify-api-arguments'
4 years ago
Alexander Strizhakov aacd1c90b7
fix for test warnings
4 years ago
Alexander Strizhakov 0dc68c157f
fix for scheduled post with poll
4 years ago
Alexander Strizhakov fdf1dfed56
only_remote -> remote renaming
4 years ago
Alexander Strizhakov 77f0a0af7d
more tests and update for docs and changelog
4 years ago
Alexander Strizhakov 2cb6dc5a3a
list timeline filtration by params
4 years ago
Alexander Strizhakov b6a72680e2
added only_media flag to home timeline
4 years ago
Alexander Strizhakov c3110c46f3
expanding filtration for home timeline
4 years ago
Ivan Tashkinov cf4765af40 [#3213] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
4 years ago
Ivan Tashkinov 1b49b8efe5 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov 6fd4163ab6 [#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
4 years ago
Alexander Strizhakov c369d2b930
support for with_relationships parameter
4 years ago
Ivan Tashkinov 380d0cce6b [#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
4 years ago
Mark Felder 5fcab23aa3 Improve error message for ConfigDB
4 years ago
Mark Felder 9272cef500 Switch to a build of Majic that does not try to fix extensions by default
4 years ago
Egor Kislitsyn a51d903e0c
Make sure active_user_count/1 counts only local users
4 years ago
Ivan Tashkinov 60b4654038 Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
4 years ago
Egor Kislitsyn bddb01bded
Add tests
4 years ago
Egor Kislitsyn 793fc77b16
Add active user count
4 years ago
lain 7f07871639 Merge branch 'chore/tests-use-clear_config' into 'develop'
4 years ago
Alexander Strizhakov d4158e8bf0
added total
4 years ago
Alexander Strizhakov 6806c03e85
added total
4 years ago
feld d7af0294e6 Merge branch 'service-worker-allowed-header' into 'develop'
4 years ago
Mark Felder e854c35e65 Convert tests to all use clear_config instead of Pleroma.Config.put
4 years ago
lain 229acae6c3 Merge branch 'develop' into '2435-list-multiple-users'
4 years ago
Alexander Strizhakov 875fbaae35
support for expires_in/expires_at in filters
4 years ago
Haelwenn 250e202098 Merge branch 'fix/missing-own_votes' into 'develop'
4 years ago
Mark Felder 0b19534475 Merge branch 'develop' into docs/apache-config
4 years ago
Ivan Tashkinov 694d98be55 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Alexander Strizhakov 3f3d64acbf
little refactor and tests
4 years ago
Mark Felder 537ba1c5e0 Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder 6bfd497f4a Include own_votes in the poll data
4 years ago
Ivan Tashkinov 218c519606 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Mark Felder 80ccdb56f6 Make tag urls absolute
4 years ago
Mark Felder 42e49529c2 Test URL formatting
4 years ago
Mark Felder 0c485d5555 Improve description
4 years ago
eugenijm 7fcaa188a0 Allow to define custom HTTP headers per each frontend
4 years ago
eugenijm 133644dfa2 Ability to set the Service-Worker-Allowed header
4 years ago
Ivan Tashkinov ca7f240643 [#3213] Ignoring of blank elements from objects.data->tag.
4 years ago
Ivan Tashkinov c041e9c630 [#3213] HashtagsTableMigrator: failures handling fix, retry function.
4 years ago
Ivan Tashkinov 2634a16b4c Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
lain ba40af054c Merge branch 'test-cases-mox-setup' into 'develop'
4 years ago
feld 2926713fe5 Merge branch 'deprecate-public_endpoint' into 'develop'
4 years ago
Mark Felder 9988d9261c Add bucket_namespace to be extra certain truncated_namespace works
4 years ago
Mark Felder dfc4cb6ebd Special handling for unconfirmed users based on instance config no longer needed.
4 years ago
Mark Felder 5d344e5c79 Only need to test if unconfirmed users are successfully deleted
4 years ago
Mark Felder 3cb4d40ebf This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
4 years ago
Ivan Tashkinov 318d6dde1c Mox mode setup tweak; refactoring.
4 years ago
feld 958a7f6ed0 Merge branch 'fix/reblog-api' into 'develop'
4 years ago
Mark Felder 28581e03ad Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder 44a86951a3 Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
Egor Kislitsyn 51d5951c02
Test that only author can reblog a private status
4 years ago
Egor Kislitsyn 1b79dce7bc
Fix Reblog API
4 years ago
Lain Soykaf bdfd72630f ListController: Fix being unable to add / remove users.
4 years ago
Ivan Tashkinov 3f88e33a71 [#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to `clear_config/_` to minimize such issues in future.
4 years ago
Ivan Tashkinov 48b399cedb [#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
4 years ago
Mark Felder 2c0fe2ea9e Remove toggle_confirmation; require explicit state change
4 years ago
Mark Felder d36182c088 Change user.confirmation_pending field to user.is_confirmed
4 years ago
Mark Felder ebd7d1365b Make setting user activation status explicit
4 years ago
Mark Felder 860b5c7804 Change user.deactivated field to user.is_active
4 years ago
Mark Felder f7e59c28ed Change user.approval_pending field to user.is_approved
4 years ago
Mark Felder 0b725f5d21 Lint
4 years ago
Mark Felder 12c8ce481c Bump Copyright year
4 years ago
Mark Felder fb47e83adc Add ConfigDB migration
4 years ago
Lain Soykaf fd9a0ac329 BackupTest: Fix s3 test.
4 years ago
Lain Soykaf c4b74c9c3f Linting.
4 years ago
Lain Soykaf 39f3683a06 Pbkdf2: Use it everywhere.
4 years ago
Lain Soykaf 87a31c5c9b Password -> Password.Pbkdf2
4 years ago
Ivan Tashkinov e350898828 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Mark Felder ba234d3c73 Unnecessary duplication here
4 years ago
Mark Felder 94e5180846 Consistent style
4 years ago
Lain Soykaf aff83eb7c1 Linting
4 years ago
lain 9106048c61 Password: Replace Pbkdf2 with Password.
4 years ago
lain c7cd9bd591 Password: Add password module
4 years ago
Haelwenn (lanodan) Monnier c4439c630f
Bump Copyright to 2021
4 years ago
Mark Felder 67e888498c Switch another test to Upload.base_url/0
4 years ago
Mark Felder e87cca97e6 Fix tests relying on old behavior. Use the Upload.base_url, Luke.
4 years ago
Mark Felder 8b28dce82a Deprecate Pleroma.Uploaders.S3, :public_endpoint
4 years ago
feld 5453038ce9 Merge branch 'fix/backup-url-on-s3' into 'develop'
4 years ago
lain e1a547d7d3 ChatMessages: Fix pagination headers.
4 years ago
Mark Felder 3c936061d5 Apply Upload.base_url for S3
4 years ago
lain 5822338f3a Merge branch 'guppe-example' into 'develop'
4 years ago
Alex Gleason e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users
4 years ago
Alex Gleason 1b98cd8610
Remove ConfirmUserPlug
4 years ago
lain 80167e62dd Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
4 years ago
Alex Gleason 3342f6a7ef
Backups: render ID in API
4 years ago
lain bd788c0939 ActivtityPub Test: Add example for guppe actor
4 years ago
lain cf0eb0c1c5 Merge branch 'object-normalize-refactor' into 'develop'
4 years ago
lain 4d56aca904 Merge branch 'adminapi-user-email' into 'develop'
4 years ago
Alex Gleason cc09079aea
Exclude blockers from notifications when `blockers_visible: false`
4 years ago
Alex Gleason 1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior
4 years ago
Alex Gleason 9f6fa5877f
Add AdminAPI.AccountViewTest
4 years ago
Alex Gleason 20af025c65
AdminAPI: return user email
4 years ago
Roger Braun 48cd336a72 allow external emoji
4 years ago
Mark Felder f9090e00e6 Add test to validate URLs to custom emojis are properly encoded
4 years ago
lain 20a269ed69 Merge branch 'fix/pagination-regression' into 'develop'
4 years ago
lain fee0c6a2cb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
4 years ago
lain e802b48d55 User: Use ObjectID type to validate also-known-as field
4 years ago
lain f0e6cff583 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
4 years ago
lain bea69853a2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
4 years ago
lain 95a0ae8a35 AccountControllerTest: Fix test logic
4 years ago
lain d44850d7a5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
4 years ago
lain 8e5904daa5 SideEffects.DeleteTest: asyncify.
4 years ago
Mark Felder 0e93775ed0 Add test to validate profile pagination works with keyset
4 years ago
lain e1e7e4d379 Object: Rework how Object.normalize works
4 years ago
Alex Gleason 0ec7e9b8e9
AdminAPI: return id for moderation log entries
4 years ago
Alex Gleason 7b44605cb8
Migration to confirm previously-logged-in users
4 years ago
feld afe9c152ab Merge branch 'fix/reports-ordering' into 'develop'
4 years ago
Mark Felder e4791258d4 Ensure newest report is returned first in the list
4 years ago
Alex Gleason 64f0e96ff6
Automatically confirm logged-in users
4 years ago
Alex Gleason 11d40e92b7
Render AKAs in Actor endpoints
4 years ago
Alex Gleason cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder 4c5f75f4e9 Support pagination in AdminAPI for user statuses
4 years ago
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'"
4 years ago
Haelwenn b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop'
4 years ago
Ivan Tashkinov 14fae94c0e [#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.
4 years ago
Alexander Strizhakov 7bfb041658
insreasing test coverage for StealEmojiPolicy
4 years ago
Ivan Tashkinov 4134abef63 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov cbb19d0e18 [#3213] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to `hashtags` table.
4 years ago
lain e4f1d8f48c Merge branch 'cachex-test' into 'develop'
4 years ago
Ivan Tashkinov e369b1306b Added Hashtag entity and objects-hashtags association with auto-sync with `data.tag` on Object update.
4 years ago
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"]
4 years ago
Ivan Tashkinov ee221277b0 Encapsulation of tags / hashtags fetching from objects.
4 years ago
lain ab633e51ab Linting
4 years ago
lain 5db1e6c8d3 Pipeline test: Switch from Mock to Mox.
4 years ago
lain 0ef0aed205 Tests: Add a helper method to reduce sleeping times in test.
4 years ago
lain ba19975838 Linting
4 years ago
lain 9d5ce82221 Test: More async/sync tweaks.
4 years ago
lain b17c36c45a Tests: More test fixes.
4 years ago
lain 2f8ec8a9cc XMLBuidlder test: Make async.
4 years ago
lain 9ba60f70d2 Tests: Make as many tests as possible async.
4 years ago
Kaizhe Huang 509f82e4d6 Add test for subscribe_address in JSON WebFinger response
4 years ago
lain 95a9bdfc37 Tests: Use NullCache for async tests.
4 years ago
lain b4b68b71fc Tests: Remove unneeded explicit cachex use.
4 years ago
Alex Gleason 80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
lain 8b8c317c0f Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
4 years ago
lain 6bb4f4e172 Merge branch 'support/2255_posix_errors' into 'develop'
4 years ago
Alexander Strizhakov cebe3c7def Fix for dropping posts/notifs in WS when mix task is executed
4 years ago
Mark Felder f318d8e56d Use Pleroma.Formatter.markdown_to_html/1 in the tests
4 years ago
Alex Gleason f1c67115d8 Upgrade linkify, test URL issues, fixes #2026 #1942
4 years ago
Alex Gleason f8c93246d6 Refactor Earmark code, fix tests
4 years ago
Alex Gleason c4f4e48e57 Remove some N/A tests
4 years ago
Alex Gleason e9e17e5df3 Upgrade Earmark to v1.4.10
4 years ago
Ivan Tashkinov 7fff9c1bee Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
4 years ago
lain 477c6c8e55 Merge branch 'auth-improvements' into 'develop'
4 years ago
lain 1436a2fa2d Merge branch 'stream-follow-updates' into 'develop'
4 years ago
lain e73d878b38 Merge branch 'feat/warn-large-pool-size' into 'develop'
4 years ago
lain 50d16a9e27 ApplicationRequirements: Add test, more text for pool size.
4 years ago
Haelwenn (lanodan) Monnier 1403798820
instance.reachable?: Limit to binary input
4 years ago
Haelwenn (lanodan) Monnier e1a2e8b17c
instance: Do not fetch unreachable instances
4 years ago
Ivan Tashkinov c8e7ace812 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
lain ed76323776 Merge branch 'feature/configdb-mix-tasks' into 'develop'
4 years ago
Ivan Tashkinov e00c667145 [#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests.
4 years ago
Ivan Tashkinov a010c5b16a Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov e9859b68fc [#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
4 years ago
feld 6adad96c79 Merge branch 'issue/2256' into 'develop'
4 years ago
rinpatch 1d04bd0894 Merge branch 'supported-emojos' into 'develop'
4 years ago
lain fa0d0b602f Emoji: Also accept regional indicators
4 years ago
Haelwenn 05879a3b3e Merge branch '2339-local-remote-mixup' into 'develop'
4 years ago
Mark Felder 126d236455 We no longer expect mentions to link if they are prefixed with too many @'s
4 years ago
lain 8fb259e739 Emoji: Only accept RGI emoji.
4 years ago
lain 3b3cf63118 Emoji: Add test for ZWJ sequence emoji
4 years ago
Egor Kislitsyn c9afb350e7
Document follow relationship updates and cleanup
4 years ago
lain 1adee08321 Emoji: Update to Unicode 13.1, switch base file, allow multichar.
4 years ago
lain 5d15486098 SideEffects: fix test
4 years ago
lain 222312900e User: Don't allow local users in remote changesets
4 years ago
Egor Kislitsyn 35ba48494f
Stream follow updates
4 years ago
rinpatch fc9ebe5073 Search tests: Use on_exit for restoring `persistent_term` state
4 years ago
Ivan Tashkinov d50a3345ae [#3112] Allowed revoking same-user token from any apps. Added tests.
4 years ago
Ivan Tashkinov 50e47a215f Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov f1b07a2b2b OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
Alexander Strizhakov 6aadb1cb40
digest algorithm is taken from header
4 years ago
Maksim Pechnikov fb72f2034a fix spec
4 years ago
Ivan Tashkinov 62993db499 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov 12a5981cc3 Session token setting on token exchange. Auth-related refactoring.
4 years ago
Mark Felder 3283d0805f Use Jason instead of Poison in tests
4 years ago
lain 67b15cc033 Search: Save detected pg version in a persistent term.
4 years ago
lain f9a4cf2097 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Ivan Tashkinov 489b12cde4 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov ccc2cf0e87 Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
4 years ago
Alex Gleason 30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
feld ecd1ef8cb5 Merge branch 'fix/2302-report-duplicates' into 'develop'
4 years ago
lain 8532325d65 SearchController Test: Fix test.
4 years ago
lain 9a1e5f5d48 Search: Change search method based on detected pg version
4 years ago
feld 79a509ee61 Merge branch '2301-users-search-discoverability-fix' into 'develop'
4 years ago
feld cd1b4155d5 Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
4 years ago
Maksim Pechnikov 66f411fba0 added subject actor to moderation log
4 years ago
Ivan Tashkinov b27d8f7437 Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
4 years ago
lain 5e04f4156c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Ivan Tashkinov e164c37139 [#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
4 years ago
Haelwenn c8d11c3064 Merge branch '2317-old-reset-tokens' into 'develop'
4 years ago
lain 783fa797bb SearchController Test: Fix test
4 years ago
lain 81b6f02a5e Search Test: linting
4 years ago
lain a60242464e Search: Add option to search with the websearch function
4 years ago
Ivan Tashkinov fcad3e716a [#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.
4 years ago
Alexander Strizhakov 46dab37351
little fix
4 years ago
lain 11e0d5f9ac Password Resets: Don't accept tokens above a certain age.
4 years ago
Alexander Strizhakov 4aaffe3a10
log capture
4 years ago
Alexander Strizhakov be0b874e1d
fix for mastodon forwarded reports
4 years ago
Alexander Strizhakov a840aefda8
formatting
4 years ago
Alexander Strizhakov e2bf6b1f7e
fix for forwarded reports
4 years ago
minibikini 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions'
4 years ago
lain aae669d05e Merge branch 'fix/webpush-and-emojireact' into 'develop'
4 years ago
lain 6b32e1de23 Merge branch 'frontend-admin-api' into 'develop'
4 years ago
Maksim Pechnikov 9c5d1cb9ed fix tests
4 years ago
Mark Felder 415481a4d9 Add test for POST when push is disabled
4 years ago
Mark Felder 3eaa5335c9 Revert adding extra alert types here
4 years ago
Mark Felder d9732fb7d3 Fix incorrect test description
4 years ago
Mark Felder ff7a4b6aa2 Test that we ignore invalid subscription alert types separately.
4 years ago
Mark Felder 30f140e570 Ensure all supported push notification subscription alert types are tested
4 years ago
Mark Felder 499faa82f6 Synchronize reaction notification text with PleromaFE's style
4 years ago
Mark Felder 67a6abd071 Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
Mark Felder 3ce11b830e Add capability for emoji reaction push notifications
4 years ago
lain bb9650f3c2 FrontendController: Return error on installation error.
4 years ago
feld d33b9e7b33 Merge branch 'remove/fedsockets' into 'develop'
4 years ago
Egor Kislitsyn f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
4 years ago
Egor Kislitsyn 79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
4 years ago
lain 61f86774d1 Merge branch 'chores/note-handling-move' into 'develop'
4 years ago
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain 81293e5aad ActivityPubController: Don't return local only objects
4 years ago
Mark Felder b1466661eb Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago
Maksim Pechnikov e4b202d905 added test
4 years ago
Egor Kislitsyn fb41bd1a85 Hide reactions from muted and blocked users
4 years ago
Maksim Pechnikov e1d25bad0c fix tests
4 years ago
Alex Gleason 9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
Maksim Pechnikov 36ec604521 added test
4 years ago
lain 0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
4 years ago
Ilja 70e4b86250 Make notifs view work for reports
4 years ago
rinpatch 6ca709816f Fix object spoofing vulnerability in attachments
4 years ago
Haelwenn 99bc175f02 Merge branch 'title-injection-change' into 'develop'
4 years ago
Mark Felder 966663c3f8 Fix tests for other attachment types
4 years ago
Mark Felder 2254e5e595 Render blurhashes in Mastodon API
4 years ago
Mark Felder 6fd72e9e85 Ingest blurhash for attachments if they were federated
4 years ago
Egor Kislitsyn d26a449396
Change endpoint path
4 years ago
Egor Kislitsyn 435bf1f945
Remove FrontendInstallerWorker
4 years ago
lain 631def2df2 RedirectController: Don't replace title, but inject into the meta
4 years ago
Egor Kislitsyn 08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn 0118ccb53c
Add `local` visibility
4 years ago