Commits · 54bae06b4fa960eadb9918414f50b9ececc1faa4 · Pleroma / pleroma

05 Jun, 2020 1 commit
- Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1}) · 54bae06b
  Haelwenn authored Jun 05, 2020
```
Unifies all the similar functions to one and simplify some blocks with it.
```
  54bae06b
04 Jun, 2020 3 commits
- Merge branch 'openapi/admin/config' into 'develop' · f5cb1f36
  lain authored Jun 04, 2020
```
Add OpenAPI spec to AdminAPI.ConfigController

See merge request !2606
```
  f5cb1f36
- Fix credo · a8132690
  minibikini authored Jun 04, 2020
  
  a8132690
- Merge branch 'develop' into openapi/admin/config · b4d5bdd6
  minibikini authored Jun 04, 2020
  
  b4d5bdd6
03 Jun, 2020 8 commits
- Merge branch 'openapi/admin/reports' into 'develop' · d6693a91
  lain authored Jun 03, 2020
```
Add OpenAPI spec for AdminAPI.ReportController

See merge request !2628
```
  d6693a91
- Add OpenAPI spec for AdminAPI.ReportController · c16315d0
  minibikini authored Jun 03, 2020
  
  c16315d0
- Move report actions to AdminAPI.ReportController · 9d572f2f
  minibikini authored May 21, 2020
  
  9d572f2f
- Merge branch 'openapi/update-admin-api/status' into 'develop' · 18b050df
  Haelwenn authored Jun 03, 2020
```
Update OpenAPI spec for AdminAPI.StatusController

See merge request !2624
```
  18b050df
- Merge branch 'admin-api/account-view' into 'develop' · d28d8876
  lain authored Jun 03, 2020
```
Use AdminAPI.StatusView in api/admin/users

Closes #1836

See merge request !2627
```
  d28d8876
- Use AdminAPI.StatusView in api/admin/users · 8a43611e
  minibikini authored Jun 03, 2020
  
  8a43611e
- Merge branch 'patch-3' into 'develop' · 12c2b3b8
  lain authored Jun 03, 2020
```
docs: clients.md: Add Husky

See merge request !2626
```
  12c2b3b8
- docs: clients.md: Add Husky · 030240ee
  a1batross authored Jun 03, 2020
  
  030240ee
02 Jun, 2020 13 commits
- Merge branch 'fix/1794-hashtag-search-results' into 'develop' · 6c1c2cdd
  feld authored Jun 02, 2020
```
[#1794] Improvements to hashtags extraction from search query

Closes #1794

See merge request !2611
```
  6c1c2cdd
- Update OpenAPI spec for AdminAPI.StatusController · 7922e638
  minibikini authored Jun 02, 2020
  
  7922e638
- Merge branch 'replies-domain-block' into 'develop' · 879304dc
  lain authored Jun 02, 2020
```
Replies domain block

Closes #1650

See merge request !2622
```
  879304dc
- Merge branch 'openapi/admin/oauth-apps' into 'develop' · 5da38c15
  lain authored Jun 02, 2020
```
Add OpenAPI spec for AdminAPI.OAuthAppContoller

See merge request !2582
```
  5da38c15
- Merge branch 'tagline' into 'develop' · 6977500e
  lain authored Jun 02, 2020
```
Update default instance description

See merge request !2600
```
  6977500e
- Merge branch 'openapi/admin/invites' into 'develop' · 022d975a
  lain authored Jun 02, 2020
```
Add OpenAPI spec for AdminAPI.InviteController

See merge request !2585
```
  022d975a
- Merge branch 'feature/embeddable-posts' into 'develop' · 2860c66e
  lain authored Jun 02, 2020
```
Add embeddable posts

Closes #1288

See merge request !2319
```
  2860c66e
- Merge branch 'fix/invisible-repeats' into 'develop' · cd2abcc0
  lain authored Jun 02, 2020
```
Do not include activities of invisible users unless explicitly requested

Closes #1833

See merge request !2620
```
  cd2abcc0
- Do not include activities of invisible users unless explicitly requested · 165a4b2a
  rinpatch authored Jun 01, 2020
```
Closes #1833
```
  165a4b2a
- Merge branch 'weblate-pleroma-pleroma' into 'develop' · 2db7a0d6
  lain authored Jun 02, 2020
```
Translations update from Weblate

See merge request !2623
```
  2db7a0d6
- Translated using Weblate (Dutch) · 81fb45a7
  Fristi authored Jun 01, 2020
```
Currently translated at 29.2% (31 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/
```
  81fb45a7
- Merge branch 'feature/status-by-id-account-view' into 'develop' · d111eae7
  lain authored Jun 02, 2020
```
another view for account in admin-fe status_show

Closes #1783

See merge request !2543
```
  d111eae7
- replies filtering for blocked domains · 19f468c5
  Alexander Strizhakov authored Jun 02, 2020
  
  19f468c5
01 Jun, 2020 8 commits
- Merge branch 'user-updates' into 'develop' · 6fb900a4
  rinpatch authored Jun 01, 2020
```
AccountController: Federate user account changes.

Closes pleroma-support#33 and #1801

See merge request !2617
```
  6fb900a4
- Merge branch 'only-creates-in-public-tl' into 'develop' · d67b8a96
  rinpatch authored Jun 01, 2020
```
TimelineController: Only return `Create` in public timelines.

Closes #1833 and #1821

See merge request !2618
```
  d67b8a96
- exclude replies on blocked domains · 7e6ec778
  Alexander Strizhakov authored May 20, 2020
  
  7e6ec778
- Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts · 6b84c62d
  minibikini authored Jun 01, 2020
  
  6b84c62d
- Merge branch 'default-to-hackney-again' into 'develop' · fa37bfff
  lain authored Jun 01, 2020
```
Config: Default to Hackney again

See merge request !2619
```
  fa37bfff
- Config: Default to Hackney again · ac31f687
  lain authored Jun 01, 2020
```
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
```
  ac31f687
- TimelineController: Only return `Create` in public timelines. · d4d4b92f
  lain authored Jun 01, 2020
  
  d4d4b92f
- AccountController: Federate user account changes. · 94609830
  lain authored Jun 01, 2020
```
Hotfixy commit, will be moved to the pipeline.
```
  94609830
30 May, 2020 7 commits
- Merge branch 'chore/bump-hackney' into 'develop' · e96765df
  Haelwenn authored May 30, 2020
```
mix.lock: update hackney to 1.16.0

Closes #1612

See merge request !2614
```
  e96765df
- Merge branch 'test/fix-config-setting-in-user-test' into 'develop' · beeeed5b
  lain authored May 30, 2020
```
Fix config setting to not affect other tests

See merge request !2615
```
  beeeed5b
- Fix config setting to not affect other tests · b973d0b2
  Roman Chvanikov authored May 30, 2020
  
  b973d0b2
- hackney adapter helper: support tlsv1.3 and remove custom opts · 0cb7b0ea
  rinpatch authored May 30, 2020
```
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
```
  0cb7b0ea
- Merge branch 'conversation-pagination' into 'develop' · b004c427
  lain authored May 30, 2020
```
Conversation pagination

See merge request !2601
```
  b004c427
- Conversation pagination · 6d4b8082
  Steven Fuchs authored May 30, 2020 and lain committed May 30, 2020
  
  6d4b8082
- [#1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test. · 24f40b8a
  Ivan Tashkinov authored May 30, 2020
  
  24f40b8a