summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-25Only check for expiring activities on local accountsfix/2189-remote-user-deletionMark Felder
2020-09-23Merge branch 'issue/2115' into 'develop'lain
[#2115] added paginate links to headers for /chats/:id/messages See merge request pleroma/pleroma!2981
2020-09-23Merge branch 'user-query/filter-out-internal' into 'develop'lain
Filter out internal users by default Closes #2147 See merge request pleroma/pleroma!3024
2020-09-23Merge branch 'develop' into 'issue/2115'lain
# Conflicts: # CHANGELOG.md
2020-09-23Merge branch 'issue/1975' into 'develop'lain
[#1975] import emoji from a zip archive Closes admin-fe#130 See merge request pleroma/pleroma!2911
2020-09-23Merge branch 'develop' into 'issue/1975'lain
# Conflicts: # CHANGELOG.md
2020-09-23Merge branch 'email-fix-develop' into 'develop'lain
Allow emails to be sent again (develop) Closes #2172 See merge request pleroma/pleroma!3025
2020-09-23Changelog: Add info about emoji zip import featurelain
2020-09-23Changelog: Info about email fix.lain
2020-09-22finland-emojis.zip -> emojis.zipMaksim Pechnikov
2020-09-22Merge branch 'develop' into issue/1975Maksim Pechnikov
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-22Changelog: Add info about chat pagination fix.lain
2020-09-22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115lain
2020-09-22Filter out internal users by defaultEgor Kislitsyn
2020-09-22Merge branch 'chore/missing-link' into 'develop'feld
Add FreeBSD and alpha sort See merge request pleroma/pleroma!3023
2020-09-22Add FreeBSD and alpha sortMark Felder
2020-09-21Merge branch 'docs/nginx-config-fedsockets' into 'develop'feld
Docs/nginx config fedsockets See merge request pleroma/pleroma!3020
2020-09-21Use an upstream for reverse proxy so future modifications are simplifiedMark Felder
2020-09-21Merge branch 'chore/autolinker-rename' into 'develop'feld
Chase the Autolinker rename from !2677 Closes #2155 See merge request pleroma/pleroma!3019
2020-09-21Most proxy settings can be globalMark Felder
2020-09-21Remove duplicate settingMark Felder
2020-09-21Add FedSockets configMark Felder
2020-09-21Merge branch 'fix/fedsocket-useragent' into 'develop'feld
Minor Fedsocket improvements See merge request pleroma/pleroma!3012
2020-09-21Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> ↵Alex Gleason
empty_json_response()
2020-09-21Chase the Autolinker rename from !2677Mark Felder
2020-09-21Pass hackney tls config into email tests, #2101Alex Gleason
2020-09-21Fix #2172 HTTP error on password resetAlex Gleason
2020-09-21Allow emails to be sent again, #2101 #2172Alex Gleason
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
2020-09-21Merge branch 'bugfix/federator-actor-error' into 'develop'lain
federator: normalize only actor, catch actor error See merge request pleroma/pleroma!2986
2020-09-21Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'lain
[#2074] OAuth scope checking in Streaming API Closes #2074 See merge request pleroma/pleroma!3013
2020-09-21Merge branch 'issue/2099' into 'develop'lain
[#2099] Import/export mutes [BE] See merge request pleroma/pleroma!2965
2020-09-21Merge branch '2161-block-changes' into 'develop'Haelwenn
ActivityPub: Don't block-filter your own posts Closes #2161 See merge request pleroma/pleroma!3017
2020-09-21Force HTTP for fedsocketsMark Felder
2020-09-21ActivityPub: Don't block-filter your own postslain
We are filtering out replies to people you block, but that should not include your own posts.
2020-09-20Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
Translations update from Weblate See merge request pleroma/pleroma!3014
2020-09-20Translated using Weblate (Chinese (Simplified))Kana
Currently translated at 24.5% (26 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
2020-09-20Added translation using Weblate (Chinese (Simplified))Kana
2020-09-20Merge branch 'fix/openapi-errors' into 'develop'rinpatch
OpenAPI: fix various errors pointed out by editor.swagger.io See merge request pleroma/pleroma!3011
2020-09-19[#2074] OAuth scope checking in Streaming API.Ivan Tashkinov
2020-09-19OpenAPI: make it possible to generate a spec without starting the apprinpatch
Needed for api docs generation on pleroma.social that will come later
2020-09-19OpenAPI: fix various errors pointed out by editor.swagger.iorinpatch
2020-09-19Add user agent to fedsocket requestsMark Felder
2020-09-18Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-18Merge branch 'media-preview-proxy-nostream' into 'develop'feld
Media preview proxy See merge request pleroma/pleroma!3001
2020-09-18Merge branch 'fix/fedsocket-log-spam' into 'develop'lain
FedSockets: fix log spam on cached rejects See merge request pleroma/pleroma!3009
2020-09-18FedSockets: fix log spam on cached rejectsrinpatch
2020-09-18Merge branch 'feature/2118-web-push-encryption-http' into 'develop'lain
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Closes #2118 See merge request pleroma/pleroma!3008
2020-09-18Merge branch 'websocket-data-fed' into 'develop'lain
Federate data through persistent websocket connections See merge request pleroma/pleroma!2408
2020-09-18Federate data through persistent websocket connectionsSteven Fuchs
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-06 08:45:14 +0000