Commits · e1603ac8fee2a660c3dc510dee5967e0fd1bbd98 · Pleroma / pleroma

16 Jun, 2020 3 commits
- fix attemps to merge map · e1603ac8
  Alexander Strizhakov authored May 31, 2020
  
  e1603ac8
- fix for updated hackney · 23decaab
  Alexander Strizhakov authored May 31, 2020
```
warning: :hackney_connect.partial_chain/1 is undefined or private
```
  23decaab
- Mogrify args as custom tuples · 9a4fde97
  Alexander Strizhakov authored May 31, 2020
  
  9a4fde97
15 Jun, 2020 4 commits
- Merge branch 'merge-ogp-twitter-parsers' into 'develop' · 1e49bfa9
  lain authored Jun 15, 2020
```
Merge OGP parser with TwitterCard

Closes #1835

See merge request !2642
```
  1e49bfa9
- Fix tests · bd63089a
  minibikini authored Jun 15, 2020
  
  bd63089a
- Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers · 58e4e3db
  minibikini authored Jun 15, 2020
  
  58e4e3db
- Merge branch 'notifications-filtering' into 'develop' · 448e93ce
  lain authored Jun 15, 2020
```
Mastodon API return full result set in notifications

See merge request !2552
```
  448e93ce
14 Jun, 2020 1 commit

Mastodon API: ensure the notification endpoint doesn't return less than the... · b15cfc3d

Eugenij authored May 18, 2020

Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page

b15cfc3d

13 Jun, 2020 5 commits
- Merge branch '1851-favorites-pagination' into 'develop' · 271ea506
  rinpatch authored Jun 13, 2020
```
StatusController: Correctly paginate favorites.

Closes #1851

See merge request !2636
```
  271ea506
- ControllerHelper: Always return id field. · 1d625c29
  lain authored Jun 13, 2020
  
  1d625c29
- Apply suggestion to lib/pleroma/web/controller_helper.ex · 4b865bba
  lain authored Jun 13, 2020
  
  4b865bba
- Remove use of atoms in MRF.UserAllowListPolicy · cb7be6ee
  href authored Jun 10, 2020
  
  cb7be6ee
- Fix atom leak in Rich Media Parser · 520367d6
  minibikini authored Jun 09, 2020
  
  520367d6
12 Jun, 2020 15 commits
- Merge branch 'patch-1' into 'develop' · e2793744
  Haelwenn authored Jun 12, 2020
```
Update pleroma.nginx to support TLSv1.3

See merge request !2644
```
  e2793744
- Merge branch 'recipients-experiments' into 'develop' · 4115701f
  Haelwenn authored Jun 12, 2020
```
ActivityPub: Don't show announces of your own objects in timeline.

See merge request !2637
```
  4115701f
- Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2 · 09d31d24
  minibikini authored Jun 12, 2020
  
  09d31d24
- Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers · 697cf920
  minibikini authored Jun 12, 2020
  
  697cf920
- Merge branch 'global-status-expiration' into 'develop' · e557265a
  lain authored Jun 12, 2020
```
Global status expiration

See merge request !2208
```
  e557265a
- Apply suggestion to config/description.exs · 46554074
  lain authored Jun 12, 2020
  
  46554074
- Merge branch 'features/mix-task-reset-mfa' into 'develop' · 6d902916
  feld authored Jun 12, 2020
```
New mix task: pleroma.user reset_mfa <nickname>

See merge request !2643
```
  6d902916
- Merge branch 'chore/bump-changelog' into 'develop' · ebbf2189
  feld authored Jun 12, 2020
```
Add changelog entry for emoji pack reload command

See merge request !2646
```
  ebbf2189
- Document new mix task feature to reset mfa · e505e59d
  feld authored Jun 12, 2020
  
  e505e59d
- Merge branch 'develop' into features/mix-task-reset-mfa · 34593d6a
  feld authored Jun 12, 2020
  
  34593d6a
- Add changelog entry for emoji pack reload command · c2048f75
  feld authored Jun 12, 2020
  
  c2048f75
- Merge branch 'feature/cli-reload-emoji' into 'develop' · 1419c67f
  lain authored Jun 12, 2020
```
Add command to reload emoji packs from cli for OTP users

Closes #1814

See merge request !2639
```
  1419c67f
- Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop' · 11aa02bb
  feld authored Jun 12, 2020
```
[#1794] Fixes URI query handling for hashtags extraction in search

Closes #1794

See merge request !2645
```
  11aa02bb
- [#1794 ] Fixes URI query handling for hashtags extraction in search. · 21880970
  Ivan Tashkinov authored Jun 12, 2020
  
  21880970
- Update pleroma.nginx to support TLSv1.3 · 122328b9
  normandy authored Jun 12, 2020 and normandy committed Jun 12, 2020
```
Based on SSL config from https://ssl-config.mozilla.org/
```
  122328b9
11 Jun, 2020 8 commits
- New mix task: pleroma.user reset_mfa <nickname> · 40970f6b
  Haelwenn authored Jun 11, 2020
  
  40970f6b
- Deprecate Pleroma.Web.RichMedia.Parsers.OGP · 2419776e
  minibikini authored Jun 11, 2020
  
  2419776e
- Merge branch 'fix/csp-mediaproxy-base-url' into 'develop' · 5474b5c9
  feld authored Jun 11, 2020
```
HTTP security plug: add media proxy base url host to csp

See merge request !2638
```
  5474b5c9
- Check for media proxy base_url, not Upload base_url · 7f7a1a46
  feld authored Jun 11, 2020
  
  7f7a1a46
- Merge branch 'develop' into fix/csp-mediaproxy-base-url · 8a59fde0
  feld authored Jun 11, 2020
  
  8a59fde0
- Merge branch '1794-hashtags-construction-from-uri' into 'develop' · 5d6ec6e5
  feld authored Jun 11, 2020
```
[#1794] Hashtags search fix for URI as query string

Closes #1794

See merge request !2641
```
  5d6ec6e5
- Merge OGP parser with TwitterCard · 1f35acce
  minibikini authored Jun 11, 2020
  
  1f35acce
- [#1794 ] Fixes URI query handling for hashtags extraction in search. · b28cec42
  Ivan Tashkinov authored Jun 11, 2020
  
  b28cec42
10 Jun, 2020 4 commits
- Apply suggestion to lib/pleroma/web/controller_helper.ex · 5e44e9d6
  lain authored Jun 10, 2020
  
  5e44e9d6
- Add command to reload emoji packs from cli for OTP users · 7c47f791
  feld authored Jun 10, 2020
```
Not useful for source releases as we don't have a way to automate connecting to the running instance.
```
  7c47f791
- HTTP security plug: add media proxy base url host to csp · 99afc7f4
  rinpatch authored Jun 10, 2020
  
  99afc7f4
- ActivityPubTest: Update test for atomized parameters. · 5d87405b
  lain authored Jun 10, 2020
  
  5d87405b