Commits · 9a1e5f5d48ef9f3b5a817c02dc8820aa99a6f693 · Pleroma / pleroma

20 Nov, 2020 2 commits
- Search: Change search method based on detected pg version · 9a1e5f5d
  lain authored Nov 20, 2020
  
  9a1e5f5d
- Application: Save postgres version in the environment · a407e33c
  lain authored Nov 20, 2020
  
  a407e33c
19 Nov, 2020 19 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch · 5e04f415
  lain authored Nov 19, 2020
  
  5e04f415
- 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
- Gitlab CI: Update postgres · b38c3de4
  lain authored Nov 19, 2020
  
  b38c3de4
- CHANGELOG.md: Move rum fix entry to patch section · 1eda5ab2
  rinpatch authored Nov 19, 2020
```
Also includes minor cosmetical fixes.
```
  1eda5ab2
- SearchController Test: Fix test · 783fa797
  lain authored Nov 19, 2020
  
  783fa797
- Search Test: linting · 81b6f02a
  lain authored Nov 19, 2020
  
  81b6f02a
- Search: Only skip ordering the rum index. · 8b90d625
  lain authored Nov 19, 2020
  
  8b90d625
- Changelog: Document breaking change. · 3b86ad07
  lain authored Nov 19, 2020
  
  3b86ad07
- Config: Set search_function to `websearch` by default · 4a5ab690
  lain authored Nov 19, 2020
  
  4a5ab690
- Cheatsheet: Add info about search_function · 1c16c67c
  lain authored Nov 19, 2020
  
  1c16c67c
- Changelog: Add info about the websearch option · 1bad91cb
  lain authored Nov 19, 2020
  
  1bad91cb
- Search: Add option to search with the websearch function · a6024246
  lain authored Nov 19, 2020
  
  a6024246
- 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
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 10 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
- Test that we ignore invalid subscription alert types separately. · ff7a4b6a
  feld authored Nov 17, 2020
  
  ff7a4b6a
- Ensure all supported push notification subscription alert types are tested · 30f140e5
  feld authored Nov 17, 2020
  
  30f140e5
- Synchronize reaction notification text with PleromaFE's style · 499faa82
  feld authored Nov 17, 2020
  
  499faa82
- Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription · 5d0bc5e0
  feld authored Nov 17, 2020
  
  5d0bc5e0