Commits · 783fa797bbe356611aa5d61e22e62b2b4bd6dbe6 · Pleroma / pleroma

19 Nov, 2020 8 commits
- SearchController Test: Fix test · 783fa797
  lain authored Nov 19, 2020
  
  783fa797
- Search Test: linting · 81b6f02a
  lain authored Nov 19, 2020
  
  81b6f02a
- 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
- 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 23 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
- Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions · 67a6abd0
  feld authored Nov 17, 2020
  
  67a6abd0
- Spelling · 80e21903
  feld authored Nov 17, 2020
  
  80e21903
- Document the API extensions for push subscriptions · 1433d3c5
  feld authored Nov 17, 2020
  
  1433d3c5
- Allow subscribing for pleroma:emoji_reaction push notifications · 83ec2f13
  feld authored Nov 17, 2020
  
  83ec2f13
- Add capability for emoji reaction push notifications · 3ce11b83
  feld authored Nov 13, 2020
  
  3ce11b83
- Docs: Add info about frontend install error response · e6d4d62f
  lain authored Nov 17, 2020
  
  e6d4d62f
- FrontendController: Return error on installation error. · bb9650f3
  lain authored Nov 17, 2020
  
  bb9650f3
- Document fixing the pleroma.user delete_activities mix task · 56d95203
  feld authored Nov 17, 2020
  
  56d95203
- Need to start web_resp cache or mix task fails · 97201f7e
  feld authored Nov 17, 2020
  
  97201f7e
- Merge branch 'remove/fedsockets' into 'develop' · d33b9e7b
  feld authored Nov 17, 2020
```
Remove FedSockets

See merge request !3155
```
  d33b9e7b
- Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop' · cf99b1c1
  rinpatch authored Nov 17, 2020
```
Specify the architecture for arm gitlab jobs

See merge request !3139
```
  cf99b1c1
- Merge branch 'develop' into frontend-admin-api · f69fe36e
  minibikini authored Nov 17, 2020
  
  f69fe36e
- Merge remote-tracking branch 'origin/develop' into hide-muted-reactions · d48dbfab
  minibikini authored Nov 17, 2020
  
  d48dbfab