Mark Felder
|
e2dcf039d2
|
Fix gun_pool_options deprecation warning message
|
2020-09-22 11:15:40 -05:00 |
|
Mark Felder
|
2fc3b46ee7
|
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
|
2020-09-22 11:13:36 -05:00 |
|
lain
|
df1eb5cf7e
|
Changelog: Add info about chat pagination fix.
|
2020-09-22 17:17:19 +02:00 |
|
lain
|
c95859e45b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
|
2020-09-22 17:13:46 +02:00 |
|
Egor Kislitsyn
|
0e0ece251a
|
Filter out internal users by default
|
2020-09-22 16:56:11 +04:00 |
|
|
|
02f12ec625
|
Merge branch 'chore/missing-link' into 'develop'
Add FreeBSD and alpha sort
See merge request pleroma/pleroma!3023
|
2020-09-22 12:42:03 +00:00 |
|
Mark Felder
|
3174804f3c
|
Add FreeBSD and alpha sort
|
2020-09-22 07:26:31 -05:00 |
|
lain
|
ee3052a2d8
|
ActivityPub: Return Announces when filtering by following.
|
2020-09-22 14:20:19 +02:00 |
|
Mark Felder
|
e5927e92a6
|
Fix deprecation warning for welcome message
|
2020-09-21 17:08:49 -05:00 |
|
|
|
d65e6e152a
|
Merge branch 'docs/nginx-config-fedsockets' into 'develop'
Docs/nginx config fedsockets
See merge request pleroma/pleroma!3020
|
2020-09-21 21:52:34 +00:00 |
|
Mark Felder
|
8906f30ba1
|
Use an upstream for reverse proxy so future modifications are simplified
|
2020-09-21 16:19:08 -05:00 |
|
|
|
637ce939d9
|
Merge branch 'chore/autolinker-rename' into 'develop'
Chase the Autolinker rename from !2677
Closes #2155
See merge request pleroma/pleroma!3019
|
2020-09-21 21:19:02 +00:00 |
|
Mark Felder
|
ade7fede71
|
Most proxy settings can be global
|
2020-09-21 16:13:45 -05:00 |
|
Mark Felder
|
2b553b8f8e
|
Remove duplicate setting
|
2020-09-21 16:11:01 -05:00 |
|
Mark Felder
|
75f6e5e8b7
|
Add FedSockets config
|
2020-09-21 16:10:31 -05:00 |
|
|
|
a5c34e3123
|
Merge branch 'fix/fedsocket-useragent' into 'develop'
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
|
2020-09-21 21:06:32 +00:00 |
|
Alex Gleason
|
bf181ca968
|
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()
|
2020-09-21 16:03:22 -05:00 |
|
Mark Felder
|
7b2bf381e9
|
Chase the Autolinker rename from !2677
|
2020-09-21 16:02:57 -05:00 |
|
Alex Gleason
|
0b728ccc44
|
Pass hackney tls config into email tests, #2101
|
2020-09-21 15:26:10 -05:00 |
|
Alex Gleason
|
23d5d7cf59
|
Fix #2172 HTTP error on password reset
|
2020-09-21 14:09:26 -05:00 |
|
Alex Gleason
|
8b6ac45f3c
|
Allow emails to be sent again, #2101 #2172
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
|
2020-09-21 13:28:02 -05:00 |
|
lain
|
59680f27ff
|
Merge branch 'bugfix/federator-actor-error' into 'develop'
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
|
2020-09-21 17:24:14 +00:00 |
|
lain
|
9108e27c2f
|
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
[#2074] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
|
2020-09-21 17:15:54 +00:00 |
|
lain
|
b36b6259d8
|
Merge branch 'issue/2099' into 'develop'
[#2099] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
|
2020-09-21 16:25:17 +00:00 |
|
Haelwenn
|
994ce250c2
|
Merge branch '2161-block-changes' into 'develop'
ActivityPub: Don't block-filter your own posts
Closes #2161
See merge request pleroma/pleroma!3017
|
2020-09-21 15:29:55 +00:00 |
|
Mark Felder
|
8afdbcdb1c
|
Force HTTP for fedsockets
|
2020-09-21 10:13:41 -05:00 |
|
lain
|
f2f0a0260f
|
ActivityPub: Don't block-filter your own posts
We are filtering out replies to people you block, but that should
not include your own posts.
|
2020-09-21 16:08:38 +02:00 |
|
lain
|
882c1fc6bd
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3014
|
2020-09-20 15:23:15 +00:00 |
|
Kana
|
f3c62b246d
|
Translated using Weblate (Chinese (Simplified))
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-20 14:48:49 +00:00 |
|
Kana
|
d72970a1fc
|
Added translation using Weblate (Chinese (Simplified))
|
2020-09-20 13:18:27 +00:00 |
|
rinpatch
|
402acce525
|
Merge branch 'fix/openapi-errors' into 'develop'
OpenAPI: fix various errors pointed out by editor.swagger.io
See merge request pleroma/pleroma!3011
|
2020-09-20 11:15:20 +00:00 |
|
Ivan Tashkinov
|
60b025b782
|
[#2074] OAuth scope checking in Streaming API.
|
2020-09-19 19:16:55 +03:00 |
|
rinpatch
|
4b12e071ac
|
OpenAPI: make it possible to generate a spec without starting the app
Needed for api docs generation on pleroma.social that will come later
|
2020-09-19 16:26:15 +03:00 |
|
rinpatch
|
51116b5392
|
OpenAPI: fix various errors pointed out by editor.swagger.io
|
2020-09-19 16:26:15 +03:00 |
|
Mark Felder
|
26859c549c
|
Add user agent to fedsocket requests
|
2020-09-19 07:26:46 -05:00 |
|
Maksim Pechnikov
|
ed3bc53fa1
|
Merge branch 'develop' into issue/2099
|
2020-09-18 22:13:05 +03:00 |
|
|
|
6c052bd5b6
|
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
|
2020-09-18 18:38:20 +00:00 |
|
lain
|
91ddd47e51
|
Merge branch 'fix/fedsocket-log-spam' into 'develop'
FedSockets: fix log spam on cached rejects
See merge request pleroma/pleroma!3009
|
2020-09-18 13:30:41 +00:00 |
|
rinpatch
|
26c571df33
|
FedSockets: fix log spam on cached rejects
|
2020-09-18 16:09:37 +03:00 |
|
lain
|
7e02f4ed3b
|
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
|
2020-09-18 12:25:10 +00:00 |
|
lain
|
875b6654ec
|
Merge branch 'websocket-data-fed' into 'develop'
Federate data through persistent websocket connections
See merge request pleroma/pleroma!2408
|
2020-09-18 11:58:23 +00:00 |
|
Steven Fuchs
|
f2ef9735c5
|
Federate data through persistent websocket connections
|
2020-09-18 11:58:22 +00:00 |
|
Maksim Pechnikov
|
2159daa9af
|
update changelog
|
2020-09-18 07:09:53 +03:00 |
|
Maksim Pechnikov
|
2ec0dcf001
|
Merge branch 'develop' into issue/2099
|
2020-09-18 07:08:37 +03:00 |
|
Sergey Suprunenko
|
226fa3e486
|
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
|
2020-09-17 22:10:55 +02:00 |
|
rinpatch
|
49584a9928
|
Merge branch 'stable-sync/2.1.2' into 'develop'
Sync develop with 2.1.2
Closes #2133, #2131, and #2130
See merge request pleroma/pleroma!3007
|
2020-09-17 19:42:42 +00:00 |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
2020-09-17 22:22:59 +03:00 |
|
rinpatch
|
065a4dddfd
|
Merge branch 'stable' into stable-sync/2.1.2
|
2020-09-17 22:19:49 +03:00 |
|
rinpatch
|
a0f5e8b27e
|
Merge branch 'release/2.1.2' into 'stable'
Release/2.1.2
See merge request pleroma/secteam/pleroma!17
|
2020-09-17 19:09:10 +00:00 |
|
Haelwenn (lanodan) Monnier
|
7bf269fe83
|
Fix MRF reject for ChatMessage
|
2020-09-17 22:07:54 +03:00 |
|
