aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-18fix testsMaksim Pechnikov
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
2020-11-18Apply 1 suggestion(s) to 1 file(s)Maksim
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
2020-11-17Merge branch 'feature/local-only-scope' into 'develop'lain
Add local-only statuses Closes #75 and #1483 See merge request pleroma/pleroma!2289
2020-11-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/local-only-scope
2020-11-17Merge branch 'fix/debian-install-libmagic-typo' into 'develop'rinpatch
Debian installation guide: fix libmagic header package name See merge request pleroma/pleroma!3154
2020-11-17Debian installation guide: fix libmagic header package namerinpatch
It's libmagic-dev in both Ubuntu and Debian. Reported in private by NaiJi.
2020-11-17Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'rinpatch
.gitattributes: Treat js/css/source maps as binary files See merge request pleroma/pleroma!3153
2020-11-17Merge branch 'chores/tesla_1.4.0' into 'develop'rinpatch
mix.exs: Update tesla to 1.4.0 See merge request pleroma/pleroma!3152
2020-11-17Merge branch 'sync-stable/2.2.0' into 'develop'rinpatch
Import stable commits into develop after releasing 2.2.0 Closes #2275, #1516, #2257, #2242, #1668, and #2236 See merge request pleroma/pleroma!3151
2020-11-17.gitattributes: Treat js/css/source maps as binary filesrinpatch
This prevents `git grep` from showing the matching line and diffs from being shown by default.
2020-11-17CHANGELOG.md: Use a period after every bullet point for unreleased sectionsrinpatch
It has been the de-facto style for a while now, however it is not enforced, so there were some entries that didn't use it.
2020-11-17CHANGELOG.md: Add back an entry for S3 fixrinpatch
2020-11-17Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!3127
2020-11-17mix.exs: bump development version to 2.2.50 after 2.2.0 releaserinpatch
2020-11-17Import stable commits into develop after releasing 2.2.0rinpatch
Updates the frontend bundle and syncs the changelog.
2020-11-17ActivityPubController: Don't return local only objectslain
2020-11-17mix.exs: Update tesla to 1.4.0Haelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:13:03 +0000