Commits · 5e86a2809e37100b54e0fc88db79245e13f684aa · Pleroma / pleroma

23 Sep, 2020 1 commit
- transmogrifier: Drop incoming create early if it already exists · 5e86a280
  Haelwenn authored Sep 23, 2020
  
  5e86a280
22 Sep, 2020 2 commits
- Merge branch 'chore/missing-link' into 'develop' · 02f12ec6
  feld authored Sep 22, 2020
```
Add FreeBSD and alpha sort

See merge request !3023
```
  02f12ec6
- Add FreeBSD and alpha sort · 3174804f
  feld authored Sep 22, 2020
  
  3174804f
21 Sep, 2020 14 commits
- Merge branch 'docs/nginx-config-fedsockets' into 'develop' · d65e6e15
  feld authored Sep 21, 2020
```
Docs/nginx config fedsockets

See merge request !3020
```
  d65e6e15
- Use an upstream for reverse proxy so future modifications are simplified · 8906f30b
  feld authored Sep 21, 2020
  
  8906f30b
- Merge branch 'chore/autolinker-rename' into 'develop' · 637ce939
  feld authored Sep 21, 2020
```
Chase the Autolinker rename from !2677

Closes #2155

See merge request !3019
```
  637ce939
- Most proxy settings can be global · ade7fede
  feld authored Sep 21, 2020
  
  ade7fede
- Remove duplicate setting · 2b553b8f
  feld authored Sep 21, 2020
  
  2b553b8f
- Add FedSockets config · 75f6e5e8
  feld authored Sep 21, 2020
  
  75f6e5e8
- Merge branch 'fix/fedsocket-useragent' into 'develop' · a5c34e31
  feld authored Sep 21, 2020
```
Minor Fedsocket improvements

See merge request !3012
```
  a5c34e31
- Chase the Autolinker rename from !2677 · 7b2bf381
  feld authored Sep 21, 2020
  
  7b2bf381
- Merge branch 'bugfix/federator-actor-error' into 'develop' · 59680f27
  lain authored Sep 21, 2020
```
federator: normalize only actor, catch actor error

See merge request !2986
```
  59680f27
- Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop' · 9108e27c
  lain authored Sep 21, 2020
```
[#2074] OAuth scope checking in Streaming API

Closes #2074

See merge request !3013
```
  9108e27c
- Merge branch 'issue/2099' into 'develop' · b36b6259
  lain authored Sep 21, 2020
```
[#2099] Import/export mutes [BE]

See merge request !2965
```
  b36b6259
- Merge branch '2161-block-changes' into 'develop' · 994ce250
  Haelwenn authored Sep 21, 2020
```
ActivityPub: Don't block-filter your own posts

Closes #2161

See merge request !3017
```
  994ce250
- Force HTTP for fedsockets · 8afdbcdb
  feld authored Sep 21, 2020
  
  8afdbcdb
- ActivityPub: Don't block-filter your own posts · f2f0a026
  lain authored Sep 21, 2020
```
We are filtering out replies to people you block, but that should
not include your own posts.
```
  f2f0a026
20 Sep, 2020 4 commits
- Merge branch 'weblate-pleroma-pleroma' into 'develop' · 882c1fc6
  lain authored Sep 20, 2020
```
Translations update from Weblate

See merge request !3014
```
  882c1fc6
- Translated using Weblate (Chinese (Simplified)) · f3c62b24
  Kana Kana authored Sep 20, 2020
```
Currently translated at 24.5% (26 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
```
  f3c62b24
- Added translation using Weblate (Chinese (Simplified)) · d72970a1
  Kana Kana authored Sep 20, 2020
  
  d72970a1
- Merge branch 'fix/openapi-errors' into 'develop' · 402acce5
  rinpatch authored Sep 20, 2020
```
OpenAPI: fix various errors pointed out by editor.swagger.io

See merge request !3011
```
  402acce5
19 Sep, 2020 4 commits
- [#2074 ] OAuth scope checking in Streaming API. · 60b025b7
  Ivan Tashkinov authored Sep 19, 2020
  
  60b025b7
- OpenAPI: make it possible to generate a spec without starting the app · 4b12e071
  rinpatch authored Sep 19, 2020
```
Needed for api docs generation on pleroma.social that will come later
```
  4b12e071
- OpenAPI: fix various errors pointed out by editor.swagger.io · 51116b53
  rinpatch authored Sep 19, 2020
  
  51116b53
- Add user agent to fedsocket requests · 26859c54
  feld authored Sep 18, 2020
  
  26859c54
18 Sep, 2020 9 commits
- Merge branch 'develop' into issue/2099 · ed3bc53f
  Maksim authored Sep 18, 2020
  
  ed3bc53f
- Merge branch 'media-preview-proxy-nostream' into 'develop' · 6c052bd5
  feld authored Sep 18, 2020
```
Media preview proxy

See merge request pleroma/pleroma!3001
```
  6c052bd5
- Merge branch 'fix/fedsocket-log-spam' into 'develop' · 91ddd47e
  lain authored Sep 18, 2020
```
FedSockets: fix log spam on cached rejects

See merge request !3009
```
  91ddd47e
- FedSockets: fix log spam on cached rejects · 26c571df
  rinpatch authored Sep 18, 2020
  
  26c571df
- Merge branch 'feature/2118-web-push-encryption-http' into 'develop' · 7e02f4ed
  lain authored Sep 18, 2020
```
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter

Closes #2118

See merge request !3008
```
  7e02f4ed
- Merge branch 'websocket-data-fed' into 'develop' · 875b6654
  lain authored Sep 18, 2020
```
Federate data through persistent websocket connections

See merge request !2408
```
  875b6654
- Federate data through persistent websocket connections · f2ef9735
  Steven Fuchs authored Sep 18, 2020 and lain committed Sep 18, 2020
  
  f2ef9735
- update changelog · 2159daa9
  Maksim authored Sep 18, 2020
  
  2159daa9
- Merge branch 'develop' into issue/2099 · 2ec0dcf0
  Maksim authored Sep 18, 2020
  
  2ec0dcf0
17 Sep, 2020 6 commits
- Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter · 226fa3e4
  Sergey Suprunenko authored Sep 17, 2020
  
  226fa3e4
- Merge branch 'stable-sync/2.1.2' into 'develop' · 49584a99
  rinpatch authored Sep 17, 2020
```
Sync develop with 2.1.2

Closes #2133, #2131, and #2130

See merge request !3007
```
  49584a99
- Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream · a4288004
  Ivan Tashkinov authored Sep 17, 2020
```
# Conflicts:
#	CHANGELOG.md
```
  a4288004
- Merge branch 'stable' into stable-sync/2.1.2 · 065a4ddd
  rinpatch authored Sep 17, 2020
  
  065a4ddd
- Merge branch 'release/2.1.2' into 'stable' · a0f5e8b2
  rinpatch authored Sep 17, 2020
```
Release/2.1.2

See merge request pleroma/secteam/pleroma!17
```
  a0f5e8b2
- Fix MRF reject for ChatMessage · 7bf269fe
  Haelwenn authored Sep 14, 2020
  
  7bf269fe