Commit Graph

5824 Commits (10dfe814795f16d6c32f5b6a7421e3e7c597f1ad)

Author SHA1 Message Date
lain 9106048c61 Password: Replace Pbkdf2 with Password.
4 years ago
Haelwenn (lanodan) Monnier c4439c630f
Bump Copyright to 2021
4 years ago
feld 5453038ce9 Merge branch 'fix/backup-url-on-s3' into 'develop'
4 years ago
lain 7a1cb752dd Pagination: Don't be dos'd by random parameters.
4 years ago
Mark Felder ef59d99833 Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
4 years ago
Mark Felder 1040881047 Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
4 years ago
lain e1a547d7d3 ChatMessages: Fix pagination headers.
4 years ago
Mark Felder 9887cdf9be Formatting
4 years ago
feld fa63f1b55b Apply 4 suggestion(s) to 2 file(s)
4 years ago
Mark Felder 86dcfb4eb9 More places we should be using Upload.base_url
4 years ago
Mark Felder ad79983614 Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
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 ac1298fce8 Merge branch 'cleanup/unused-proxy-opts' into 'develop'
4 years ago
lain cf0eb0c1c5 Merge branch 'object-normalize-refactor' into 'develop'
4 years ago
Alex Gleason 20af025c65
AdminAPI: return user email
4 years ago
Mark Felder d69c78ceb9 Remove configurability of upload proxy opts, simplify
4 years ago
Mark Felder 64116f63d9 URI.encode custom emojis
4 years ago
lain 20a269ed69 Merge branch 'fix/pagination-regression' into 'develop'
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 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 83f27282ba Do not try to guess which pagination we need by the existence of an :offset param.
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
feld afe9c152ab Merge branch 'fix/reports-ordering' into 'develop'
4 years ago
Alex Gleason 0d6b9ce8ca Apply 2 suggestion(s) to 1 file(s)
4 years ago
feld 2aa60e7592 Apply 1 suggestion(s) to 1 file(s)
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 2597b028f7 Make pagination type conditional
4 years ago
Mark Felder 085d4e6cfc Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
4 years ago
Mark Felder 4c5f75f4e9 Support pagination in AdminAPI for user statuses
4 years ago
Mark Felder 744b34709d Do not reverse order of reports. We want newest ones sorted to the top.
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
Haelwenn (lanodan) Monnier 18b536c176
Pleroma.Object/1: take %Object{} as argument instead
4 years ago
Alexander Strizhakov 2e859794ee
non condition dir creation
4 years ago
Alexander Strizhakov 7bfb041658
insreasing test coverage for StealEmojiPolicy
4 years ago
Alexander Strizhakov aafd7b44ce
check dir existence in policy
4 years ago
lain e4f1d8f48c Merge branch 'cachex-test' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 87b13c5430
Create Object.hashtags/1 wrapper
4 years ago
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"]
4 years ago
lain ab633e51ab Linting
4 years ago
lain 5db1e6c8d3 Pipeline test: Switch from Mock to Mox.
4 years ago
lain c9d73af74d Cachex: Unify arity of callback function
4 years ago
Kaizhe Huang fb02241580 Fix trailing whitespaces in lib/pleroma/web/web_finger.ex
4 years ago
lain 95a9bdfc37 Tests: Use NullCache for async tests.
4 years ago
lain 713612c377 Cachex: Make caching provider switchable at runtime.
4 years ago
FiveYellowMice 83cd7f2b5f WebFinger: add subscribe_address in return data of JSON responses
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
Mark Felder 6dac2ac71a Minor refactoring of the logic for hiding followers/following counts.
4 years ago
Alexander Strizhakov cebe3c7def Fix for dropping posts/notifs in WS when mix task is executed
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
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
Egor Kislitsyn c9afb350e7
Document follow relationship updates and cleanup
4 years ago
Egor Kislitsyn 35ba48494f
Stream follow updates
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
Ivan Tashkinov 12a5981cc3 Session token setting on token exchange. Auth-related refactoring.
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
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
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 11e0d5f9ac Password Resets: Don't accept tokens above a certain age.
4 years ago
Alexander Strizhakov 8a8c154b4e
test fixes
4 years ago
Alexander Strizhakov be0b874e1d
fix for mastodon forwarded reports
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
Maksim 25eb222bed Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder ccddedb504 Credo
4 years ago
Mark Felder 499faa82f6 Synchronize reaction notification text with PleromaFE's style
4 years ago
Mark Felder 5d0bc5e028 Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
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 83ec2f1384 Allow subscribing for pleroma:emoji_reaction push notifications
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 79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
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
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
Maksim Pechnikov 1830b6aae5 added error messages for posix error code
4 years ago
Haelwenn 99bc175f02 Merge branch 'title-injection-change' into 'develop'
4 years ago
Mark Felder 2156de2fee Ingest blurhash field during transmogrification
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
Alexander Strizhakov 8da9f919f8
little changes for MRF config descriptions
4 years ago
Egor Kislitsyn af3f00292c
Fix formatting
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 efc27f6464
fix for adminFE
4 years ago
Alexander Strizhakov 485697d96c
config descriptions for custom MRF policies
4 years ago
lain d77fd6b3d0 Merge branch 'fix/html-title-load' into 'develop'
4 years ago
Alexander Strizhakov 0c68b9ac13
escaping summary and other fields in xml templates
4 years ago
Sean King e4a21084f0 Fix title on load of Pleroma HTML
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
Haelwenn 9c09ea01aa Merge branch '2284-voters-count' into 'develop'
4 years ago
lain 504a829edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
4 years ago
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
lain bc4d9c4ffc Merge branch 'hide-muted-chats' into 'develop'
4 years ago
Egor Kislitsyn ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
lain e46c95b826 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
4 years ago
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain 92d252f364 Poll Schema: Update and fix.
4 years ago
lain 1cfc3278c0 Poll View: Always return `voters_count`.
4 years ago
lain c37118e6f2 Conversations: A few refactors
4 years ago
lain 91f6c32430 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
4 years ago
Mark Felder 7efc074ead Permit fetching individual reports with notes preloaded
4 years ago
Egor Kislitsyn be52819a11
Hide chats from muted users
4 years ago
lain 24ce324973 Merge branch 'bugfix/poll_replies_count' into 'develop'
4 years ago
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api'
4 years ago
Haelwenn (lanodan) Monnier 4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
4 years ago
feld 38b481d112 Merge branch 'feature/account-export' into 'develop'
4 years ago
Ivan Tashkinov 04f6b48ac1 Auth subsystem refactoring and tweaks.
4 years ago