Commit Graph

287 Commits (cf0eb0c1c5c945c660295f51c99fe157b2b8229c)

Author SHA1 Message Date
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
feld 3cd7ea693f Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
4 years ago
Alexander Strizhakov 8d218ebaf5
Moving some background jobs into simple tasks
4 years ago
Alexander Strizhakov f97f24b067
making credo happy and test fix
4 years ago
Alexander Strizhakov 485697d96c
config descriptions for custom MRF policies
4 years ago
lain 88f6b61a5e Merge branch '2260-wrong-report-link' into 'develop'
4 years ago
Alexander Strizhakov 0c68b9ac13
escaping summary and other fields in xml templates
4 years ago
Haelwenn (lanodan) Monnier e010bb292b
NoteHandlingTest: Poison → Jason
4 years ago
Haelwenn (lanodan) Monnier fa1f5d4442
Move TransmogrifierTest for Note to NoteHandlingTest
4 years ago
lain 6d850c46dc AdminEmail: Use AP id as user url.
4 years ago
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain 4800ee656b Merge branch 'features/federation-status' into 'develop'
4 years ago
lain 5db4c823b2 Merge branch 'restrict-domain' into 'develop'
4 years ago
Ivan Tashkinov 73e66fd31f Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago