Commits · 7dd986a563545cb63e8404d9b107f1d29c499940 · Pleroma / pleroma

10 Sep, 2020 4 commits
- expire mfa tokens through Oban · 7dd986a5
  Alexander Strizhakov authored Sep 05, 2020
  
  7dd986a5
- schedule expired oauth tokens deletion with Oban · 3ce658b9
  Alexander Strizhakov authored Aug 25, 2020
  
  3ce658b9
- Merge branch 'fix/2132-emoji-packs' into 'develop' · c8c17d9c
  lain authored Sep 10, 2020
```
use Pleroma.HTTP in emoji packs tasks

Closes #2132

See merge request !2980
```
  c8c17d9c
- use Pleroma.HTTP in emoji packs tasks · ab56dd54
  Alexander Strizhakov authored Sep 10, 2020
  
  ab56dd54
09 Sep, 2020 5 commits
- Merge branch 'chore/concurrent_limiter_update' into 'develop' · 9d20d29a
  rinpatch authored Sep 09, 2020
```
bump concurrent_limiter

See merge request !2978
```
  9d20d29a
- bump concurrent_limiter · 0c1d2431
  rinpatch authored Sep 09, 2020
```
Should fix gun deadlocks
```
  0c1d2431
- Merge branch 'weblate-pleroma-pleroma' into 'develop' · b9f4bb73
  lain authored Sep 09, 2020
```
Translations update from Weblate

See merge request !2977
```
  b9f4bb73
- Translated using Weblate (Spanish) · 6ec1a9de
  tarteka authored Sep 09, 2020
```
Currently translated at 9.4% (10 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
```
  6ec1a9de
- Added translation using Weblate (Spanish) · ace94bfc
  tarteka authored Sep 09, 2020
  
  ace94bfc
08 Sep, 2020 31 commits
- Merge branch 'stable-sync/2.1.1' into 'develop' · 7c055af5
  rinpatch authored Sep 08, 2020
```
Sync stable with develop after 2.1.1

Closes #2, #2047, #2095, #2116, #1987, and #2080

See merge request !2974
```
  7c055af5
- Merge branch 'stable' into stable-sync/2.1.1 · 5ef840ed
  rinpatch authored Sep 08, 2020
  
  5ef840ed
- Metadata: Move restriction check from Feed provider to activated_providers · 0d2814ec
  rinpatch authored Sep 07, 2020
  
  0d2814ec
- Use :restrict_unauthenticated testing for more granular control · 2011142e
  feld authored Sep 01, 2020
  
  2011142e
- Document breaking change for metadata providers · 549c895d
  feld authored Aug 31, 2020
  
  549c895d
- RelMe and Feed no longer configurable · 96697db3
  feld authored Aug 31, 2020
  
  96697db3
- Do not serve RSS/Atom feeds when instance is private · a85ed6de
  feld authored Aug 31, 2020
  
  a85ed6de
- Fix test so setting doesn't leak · 44ced176
  feld authored Aug 31, 2020
  
  44ced176
- Feed provider only generates a redirect, so always activate it. · 14d07081
  feld authored Aug 31, 2020
```
Making this configurable is misleading.
```
  14d07081
- Disable providers of user and status metadata when instance is private · ff07014b
  feld authored Aug 31, 2020
  
  ff07014b
- Do not make RelMe metadata provider optional. · 630444ee
  feld authored Aug 31, 2020
```
There's really no sound reason to turn this off anyway.
```
  630444ee
- user: harden get_friends_query(), get_followers_query() and their wrappers · 947ee55a
  Haelwenn authored Sep 02, 2020
  
  947ee55a
- search: Apply following filter only when user is usable · 16c451f8
  Haelwenn authored Sep 02, 2020
  
  16c451f8
- AP C2S: Restrict character limit on Note · 10ef532c
  Haelwenn authored Jul 07, 2020
  
  10ef532c
- Fix atom leak in AdminAPIController · a781ac6c
  minibikini authored Jun 10, 2020
  
  a781ac6c
- Merge branch 'release/2.1.1' into 'stable' · 425324aa
  rinpatch authored Sep 08, 2020
```
2.1.1 release

See merge request pleroma/secteam/pleroma!13
```
  425324aa
- SECURITY.md: we don't support 2.0 anymore, bump to 2.1 · acf6393c
  rinpatch authored Sep 08, 2020
  
  acf6393c
- Merge branch 'bugfix/mock' into 'develop' · 073f5490
  Haelwenn authored Sep 08, 2020
```
mockfix but for non-secteam because gitlab

See merge request !2973
```
  073f5490
- pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679 · 7528a7e4
  rinpatch authored Sep 08, 2020
  
  7528a7e4
- Merge branch 'temp-hackney-fix' into 'develop' · 27c3973b
  rinpatch authored Sep 07, 2020
```
temp hackney fix

See merge request pleroma/pleroma!2951
```
  27c3973b
- Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' · 7490b76b
  rinpatch authored Sep 08, 2020
```
Skip processing webp image files because we can't strip EXIF

Closes #2080

See merge request !2924
```
  7490b76b
- CHANGELOG.md: Add 2.1.1 entry · e430e98e
  rinpatch authored Sep 08, 2020
  
  e430e98e
- Merge branch 'bugfix/mock' into 'develop' · 09416d8a
  Haelwenn authored Sep 08, 2020
```
mockfix but for non-secteam because gitlab

See merge request !2973
```
  09416d8a
- combo fixes · 87d28057
  Alexander Strizhakov authored Sep 08, 2020 and Haelwenn committed Sep 08, 2020
  
  87d28057
- don't run async tests, which use Mock · fd7e9bdd
  Alexander Strizhakov authored Sep 08, 2020 and Haelwenn committed Sep 08, 2020
  
  fd7e9bdd
- Merge branch 'develop' into 'develop' · bf048ab7
  feld authored Sep 08, 2020
```
ForceBotUnlistedPolicy

See merge request pleroma/pleroma!2967
```
  bf048ab7
- Merge branch 'bugfix/favicon-empty-test' into 'develop' · 9e49f462
  Haelwenn authored Sep 08, 2020
```
Bugfix/favicon empty test

See merge request !2972
```
  9e49f462
- account_view_test: Remove empty test · f6723dc9
  Haelwenn authored Sep 08, 2020
  
  f6723dc9
- test: remove extraneous :instances_favicons config bits · 788decec
  Haelwenn authored Sep 08, 2020
  
  788decec
- Revert "description.exs: add ForceBotUnlistedPolicy" · bb0d7b7a
  feld authored Sep 08, 2020
```
This reverts commit 72155636.
```
  bb0d7b7a
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted · 21efda2e
  feld authored Sep 08, 2020
  
  21efda2e