summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-19Merge branch 'fix-rum-search' into 'develop'rinpatch
Fix rum search speed See merge request pleroma/pleroma!3161
2020-11-19CHANGELOG.md: Move rum fix entry to patch sectionrinpatch
Also includes minor cosmetical fixes.
2020-11-19Search: Only skip ordering the rum index.lain
2020-11-19[#2301] Quick fix: users with is_discoverable == false (default!) are ↵Ivan Tashkinov
included in search results.
2020-11-19Changelog: Add info about search fixes.lain
2020-11-19Activity search: Fix order of resultslain
Greatly speeds up the search for RUM.
2020-11-19Changelog: Add info about reset tokenslain
2020-11-19Cheatsheet: Add docs about reset token expirationlain
2020-11-19Password Resets: Don't accept tokens above a certain age.lain
By default, one day
2020-11-19Merge branch 'hide-muted-reactions' into 'develop'lain
Hide reactions from muted and blocked users Closes #1875 See merge request pleroma/pleroma!3147
2020-11-18Merge branch 'revert-da4660d2' into 'develop'feld
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'" See merge request pleroma/pleroma!3158
2020-11-18Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"feld
This reverts merge request !2955
2020-11-18Merge branch 'develop' into 'hide-muted-reactions'minibikini
# Conflicts: # CHANGELOG.md
2020-11-18Fixed emoji reactions not being filtered from blocked and muted accountsMark Felder
2020-11-18Merge branch 'fix/mix-task-user-delete_activities' into 'develop'feld
Fix mix pleroma.user delete_activities task See merge request pleroma/pleroma!3156
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-18Apply 1 suggestion(s) to 1 file(s)lain
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-18Changelog: Move api info to api heading.lain
2020-11-17Merge branch 'update/admin-fe-20201117' into 'develop'feld
Update AdminFE See merge request pleroma/pleroma!3157
2020-11-17Update AdminFE build to ↵Mark Felder
pleroma/admin-fe@5b38aea2790686647a39f505864331bb9838e20d
2020-11-17Add test for POST when push is disabledMark Felder
Also group together the tests verifiying failure when disabled
2020-11-17Revert adding extra alert types hereMark Felder
2020-11-17Fix incorrect test descriptionMark Felder
2020-11-17CredoMark Felder
2020-11-17Test that we ignore invalid subscription alert types separately.Mark Felder
2020-11-17Ensure all supported push notification subscription alert types are testedMark 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-17SpellingMark Felder
2020-11-17Document the API extensions for push subscriptionsMark Felder
2020-11-17Allow subscribing for pleroma:emoji_reaction push notificationsMark Felder
2020-11-17Add capability for emoji reaction push notificationsMark Felder
2020-11-17Docs: Add info about frontend install error responselain
2020-11-17FrontendController: Return error on installation error.lain
2020-11-17Document fixing the pleroma.user delete_activities mix taskMark Felder
2020-11-17Need to start web_resp cache or mix task failsMark Felder
2020-11-17Merge branch 'remove/fedsockets' into 'develop'feld
Remove FedSockets See merge request pleroma/pleroma!3155
2020-11-17Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'rinpatch
Specify the architecture for arm gitlab jobs See merge request pleroma/pleroma!3139
2020-11-17Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn
2020-11-17Merge remote-tracking branch 'origin/develop' into hide-muted-reactionsEgor 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 'chores/note-handling-move' into 'develop'lain
Chores/note handling move See merge request pleroma/pleroma!3122
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 17:16:34 +0000