Commits · ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e · Pleroma / pleroma

20 Nov, 2020 3 commits
- Merge branch 'fix/2302-report-duplicates' into 'develop' · ecd1ef8c
  feld authored Nov 20, 2020
```
Fix for forwarded reports

Closes #2303 and #2302

See merge request !3146
```
  ecd1ef8c
- Merge branch 'fix/mix-tasks' into 'develop' · d8924e1a
  lain authored Nov 20, 2020
```
Start limiters in mix tasks

Closes #2320

See merge request !3165
```
  d8924e1a
- start limiters in mix tasks · 0a5b22bc
  Alexander Strizhakov authored Nov 20, 2020
  
  0a5b22bc
19 Nov, 2020 22 commits
- Merge branch '2301-users-search-discoverability-fix' into 'develop' · 79a509ee
  feld authored Nov 19, 2020
```
[#2301] Proper handling of User.is_discoverable

Closes #2301

See merge request !3162
```
  79a509ee
- Merge branch 'oban-jobs-to-simple-tasks' into 'develop' · cd1b4155
  feld authored Nov 19, 2020
```
Moving some background jobs into simple tasks

Closes #1790

See merge request !3129
```
  cd1b4155
- Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix · b27d8f74
  Ivan Tashkinov authored Nov 19, 2020
```
# Conflicts:
#	CHANGELOG.md
```
  b27d8f74
- [#2301] Proper handling of `User.is_discoverable`: users appear in in-service... · e164c371
  Ivan Tashkinov authored Nov 19, 2020
```
[#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
```
  e164c371
- Merge branch '2317-old-reset-tokens' into 'develop' · c8d11c30
  Haelwenn authored Nov 19, 2020
```
Resolve "Don't allow old password reset tokens"

Closes #2317

See merge request !3160
```
  c8d11c30
- Merge branch 'fix-rum-search' into 'develop' · 6fc38aac
  rinpatch authored Nov 19, 2020
```
Fix rum search speed

See merge request !3161
```
  6fc38aac
- CHANGELOG.md: Move rum fix entry to patch section · 1eda5ab2
  rinpatch authored Nov 19, 2020
```
Also includes minor cosmetical fixes.
```
  1eda5ab2
- Search: Only skip ordering the rum index. · 8b90d625
  lain authored Nov 19, 2020
  
  8b90d625
- [#2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results. · fcad3e71
  Ivan Tashkinov authored Nov 19, 2020
  
  fcad3e71
- little fix · 46dab373
  Alexander Strizhakov authored Nov 19, 2020
  
  46dab373
- Changelog: Add info about search fixes. · 2ee0fc19
  lain authored Nov 19, 2020
  
  2ee0fc19
- Activity search: Fix order of results · 5e2ba573
  lain authored Nov 19, 2020
```
Greatly speeds up the search for RUM.
```
  5e2ba573
- Changelog: Add info about reset tokens · 21eaaf49
  lain authored Nov 19, 2020
  
  21eaaf49
- Cheatsheet: Add docs about reset token expiration · f6c22f4d
  lain authored Nov 19, 2020
  
  f6c22f4d
- Password Resets: Don't accept tokens above a certain age. · 11e0d5f9
  lain authored Nov 19, 2020
```
By default, one day
```
  11e0d5f9
- Merge branch 'hide-muted-reactions' into 'develop' · 6f9b0338
  lain authored Nov 19, 2020
```
Hide reactions from muted and blocked users

Closes #1875

See merge request !3147
```
  6f9b0338
- log capture · 4aaffe3a
  Alexander Strizhakov authored Nov 18, 2020
  
  4aaffe3a
- test fixes · 8a8c154b
  Alexander Strizhakov authored Nov 18, 2020
  
  8a8c154b
- changelog entries for fixes · 44f3795b
  Alexander Strizhakov authored Nov 17, 2020
  
  44f3795b
- fix for mastodon forwarded reports · be0b874e
  Alexander Strizhakov authored Nov 17, 2020
  
  be0b874e
- formatting · a840aefd
  Alexander Strizhakov authored Nov 16, 2020
  
  a840aefd
- fix for forwarded reports · e2bf6b1f
  Alexander Strizhakov authored Nov 16, 2020
  
  e2bf6b1f
18 Nov, 2020 9 commits
- Merge branch 'revert-da4660d2' into 'develop' · 8a7ee9fe
  feld authored Nov 18, 2020
```
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

See merge request !3158
```
  8a7ee9fe
- Revert "Merge branch 'use-https-in-dockerfile' into 'develop'" · 42ff5ea9
  feld authored Nov 18, 2020
```
This reverts merge request !2955
```
  42ff5ea9
- Merge branch 'develop' into 'hide-muted-reactions' · 6669ac5b
  minibikini authored Nov 18, 2020
```
# Conflicts:
#   CHANGELOG.md
```
  6669ac5b
- Fixed emoji reactions not being filtered from blocked and muted accounts · 1d03ba4f
  feld authored Nov 18, 2020
  
  1d03ba4f
- Merge branch 'fix/mix-task-user-delete_activities' into 'develop' · a1056aac
  feld authored Nov 18, 2020
```
Fix mix pleroma.user delete_activities task

See merge request !3156
```
  a1056aac
- Merge branch 'fix/webpush-and-emojireact' into 'develop' · aae669d0
  lain authored Nov 18, 2020
```
Push notifications: add pleroma:emoji_reaction, improve tests

Closes #2185

See merge request !3141
```
  aae669d0
- Apply 1 suggestion(s) to 1 file(s) · 1b63aa0b
  lain authored Nov 18, 2020
  
  1b63aa0b
- Merge branch 'frontend-admin-api' into 'develop' · 6b32e1de
  lain authored Nov 18, 2020
```
Add an API to manage frontends

Closes #2238

See merge request !3108
```
  6b32e1de
- Changelog: Move api info to api heading. · d7b63272
  lain authored Nov 18, 2020
  
  d7b63272
17 Nov, 2020 6 commits
- Merge branch 'update/admin-fe-20201117' into 'develop' · fe7008ee
  feld authored Nov 17, 2020
```
Update AdminFE

See merge request !3157
```
  fe7008ee
- Update AdminFE build to admin-fe@5b38aea2 · ad7fc352
  feld authored Nov 17, 2020
  
  ad7fc352
- Add test for POST when push is disabled · 415481a4
  feld authored Nov 17, 2020
```
Also group together the tests verifiying failure when disabled
```
  415481a4
- Revert adding extra alert types here · 3eaa5335
  feld authored Nov 17, 2020
  
  3eaa5335
- Fix incorrect test description · d9732fb7
  feld authored Nov 17, 2020
  
  d9732fb7
- Credo · ccddedb5
  feld authored Nov 17, 2020
  
  ccddedb5