aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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
2020-11-17Gitlab CI: Specify image architecture for arm64 imageslain
2020-11-17Added translation using Weblate (Hebrew)Guy Sheffer
2020-11-17Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'lain
Fix S3 uploads with Elixir 1.11 See merge request pleroma/pleroma!3148
2020-11-17Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'lain
Use absolute URLs to thumbnail and background in /api/v1/instance See merge request pleroma/pleroma!3149
2020-11-16Use absolute URLs to thumbnail and background in /api/v1/instanceMark Felder
2020-11-16Document S3 and Elixir 1.11 compat fixMark Felder
2020-11-16Fix S3 uploads with Elixir 1.11Mark Felder
2020-11-14Merge branch 'bugfix/instance-gen_exiftool' into 'develop'Haelwenn
pleroma.instance: Fix Exiftool module name See merge request pleroma/pleroma!3143
2020-11-14pleroma.instance: Fix Exiftool module nameHaelwenn (lanodan) Monnier
2020-11-13Gitlab CI: Change tags bag to arm32lain
2020-11-13Gitlab CI: Alpine is alpinelain
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-13Merge branch 'docs/otp-tuning' into 'develop'lain
First draft of tips for optimizing BEAM See merge request pleroma/pleroma!3123
2020-11-13Gitlab CI: Specify arm32v7 image for arm32 buildslain
2020-11-13Merge branch 'fix/oban-in-database-config' into 'develop'rinpatch
remove PurgeExpiredActivity from Oban db config See merge request pleroma/pleroma!3137
2020-11-13remove PurgeExpiredActivity from Oban db configAlexander Strizhakov
2020-11-12Merge branch 'majic-dep' into 'develop'feld
Install file-dev in Dockerfile build stage See merge request pleroma/pleroma!3135
2020-11-12Install file-dev in Dockerfile build stageMichael Walker
This is required by the majic, added in #2534.
2020-11-12Merge branch 'release/2.2.0' into 'stable'v2.2.0rinpatch
Release/2.2.0 See merge request pleroma/secteam/pleroma!19
2020-11-12Fix object spoofing vulnerability in attachmentsrinpatch
Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948
2020-11-12Merge branch 'title-injection-change' into 'develop'Haelwenn
Title injection change See merge request pleroma/pleroma!3132
2020-11-11Merge branch 'feature/ingest-blurhash' into 'develop'feld
Ingest blurhash for attachments if they were federated Closes #2294 See merge request pleroma/pleroma!3133
2020-11-11Fix tests for other attachment typesMark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:44:58 +0000