aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-12-04Merge branch 'issue/2256' into 'develop'feld
[#2256] added subject actor to moderation log See merge request pleroma/pleroma!3164
2020-11-27digest algorithm is taken from headerAlexander Strizhakov
2020-11-20Merge branch 'fix/2302-report-duplicates' into 'develop'feld
Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146
2020-11-19Merge branch '2301-users-search-discoverability-fix' into 'develop'feld
[#2301] Proper handling of User.is_discoverable Closes #2301 See merge request pleroma/pleroma!3162
2020-11-19Merge branch 'oban-jobs-to-simple-tasks' into 'develop'feld
Moving some background jobs into simple tasks Closes #1790 See merge request pleroma/pleroma!3129
2020-11-19added subject actor to moderation logMaksim Pechnikov
2020-11-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2301-users-search-discoverability-fix # Conflicts: # CHANGELOG.md
2020-11-19[#2301] Proper handling of `User.is_discoverable`: users appear in ↵Ivan Tashkinov
in-service search but are hidden from external services like search bots.
2020-11-19Merge branch '2317-old-reset-tokens' into 'develop'Haelwenn
Resolve "Don't allow old password reset tokens" Closes #2317 See merge request pleroma/pleroma!3160
2020-11-19Password Resets: Don't accept tokens above a certain age.lain
By default, one day
2020-11-19test fixesAlexander Strizhakov
2020-11-19fix for mastodon forwarded reportsAlexander Strizhakov
2020-11-19fix for forwarded reportsAlexander Strizhakov
2020-11-18Merge branch 'develop' into 'hide-muted-reactions'minibikini
# Conflicts: # CHANGELOG.md
2020-11-18Merge branch 'fix/webpush-and-emojireact' into 'develop'lain
Push notifications: add pleroma:emoji_reaction, improve tests Closes #2185 See merge request pleroma/pleroma!3141
2020-11-18Merge branch 'frontend-admin-api' into 'develop'lain
Add an API to manage frontends Closes #2238 See merge request pleroma/pleroma!3108
2020-11-17CredoMark Felder
2020-11-17Synchronize reaction notification text with PleromaFE's styleMark Felder
2020-11-17Support both pleroma:chat_mention and pleroma:emoji_reaction for ↵Mark Felder
/api/v1/push/subscription
2020-11-17Update OpenAPI spec/schema and test to verify support for ↵Mark Felder
pleroma:emoji_reaction subscriptions
2020-11-17Allow subscribing for pleroma:emoji_reaction push notificationsMark Felder
2020-11-17Add capability for emoji reaction push notificationsMark Felder
2020-11-17FrontendController: Return error on installation error.lain
2020-11-17Merge branch 'remove/fedsockets' into 'develop'feld
Remove FedSockets See merge request pleroma/pleroma!3155
2020-11-17Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn
2020-11-17Merge branch 'develop' into hide-muted-reactionsEgor Kislitsyn
2020-11-17Remove FedSocketsrinpatch
Current FedSocket implementation has a bunch of problems. It doesn't have proper error handling (in case of an error the server just doesn't respond until the connection is closed, while the client doesn't match any error messages and just assumes there has been an error after 15s) and the code is full of bad descisions (see: fetch registry which uses uuids for no reason and waits for a response by recursively querying a ets table until the value changes, or double JSON encoding). Sometime ago I almost completed rewriting fedsockets from scrach to adress these issues. However, while doing so, I realized that fedsockets are just too overkill for what they were trying to accomplish, which is reduce the overhead of federation by not signing every message. This could be done without reimplementing failure states and endpoint logic we already have with HTTP by, for example, using TLS cert auth, or switching to a more performant signature algorithm. I opened https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further discussion on alternatives to fedsockets. From discussions I had with other Pleroma developers it seems like they would approve the descision to remove them as well, therefore I am submitting this patch.
2020-11-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/local-only-scope
2020-11-17ActivityPubController: Don't return local only objectslain
2020-11-16Use absolute URLs to thumbnail and background in /api/v1/instanceMark Felder
2020-11-16Hide reactions from muted and blocked usersEgor Kislitsyn
2020-11-13Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into ↵lain
'develop' fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912
2020-11-13Make notifs view work for reportsIlja
* These are the first small steps for issue 2034 "Reports should send a notification to admins". * I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later) * I added the new type to the notification_controller * I made the view return the notification. It doesn't include the report itself (yet)
2020-11-12Merge branch 'title-injection-change' into 'develop'Haelwenn
Title injection change See merge request pleroma/pleroma!3132
2020-11-11Ingest blurhash field during transmogrificationMark Felder
2020-11-11Render blurhashes in Mastodon APIMark Felder
2020-11-11Ingest blurhash for attachments if they were federatedMark Felder
2020-11-11Change endpoint pathEgor Kislitsyn
2020-11-11Remove FrontendInstallerWorkerEgor Kislitsyn
2020-11-11RedirectController: Don't replace title, but inject into the metalain
2020-11-11Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn
2020-11-11little changes for MRF config descriptionsAlexander Strizhakov
- log level reduction, if policy doesn't implement config_description method - docs in dev.md
2020-11-11Fix formattingEgor Kislitsyn
2020-11-11Add `local` visibilityEgor Kislitsyn
2020-11-11Merge branch 'feature/2222-config-descriptions-for-custom-modules' into ↵feld
'develop' Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128
2020-11-11Moving some background jobs into simple tasksAlexander Strizhakov
- fetching activity data - attachment prefetching - using limiter to prevent overload
2020-11-11making credo happy and test fixAlexander Strizhakov
2020-11-11fix for adminFEAlexander Strizhakov
- revert UserAllowPolicy description - MRF descriptions order
2020-11-10config descriptions for custom MRF policiesAlexander Strizhakov
2020-11-10Merge branch 'fix/html-title-load' into 'develop'lain
Fix title on load of Pleroma HTML, fixes #2281 Closes #2281 See merge request pleroma/pleroma!3125
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 16:33:46 +0000