Commits · cf0c861d0012f27ae555247834187d509d7a7114 · Pleroma / pleroma

30 Nov, 2019 4 commits
- Merge branch 'hide-relation-for-friendica' into 'develop' · cf0c861d
  rinpatch authored Nov 30, 2019
```
Hide relation for friendica users

See merge request !2026
```
  cf0c861d
- Merge branch 'benchmarks/favourites_timeline' into 'develop' · b21738d4
  rinpatch authored Nov 30, 2019
```
Benchmarks: favourites timeline

See merge request !2027
```
  b21738d4
- test missing first field · 1915b23e
  kPherox authored Nov 30, 2019
  
  1915b23e
- hide follower/following for friendica · 03266839
  kPherox authored Nov 30, 2019
  
  03266839
29 Nov, 2019 2 commits
- Merge branch 'fix/extract_first_external_url' into 'develop' · a990374e
  lain authored Nov 29, 2019
```
Fix Pleroma.HTML.extract_first_external_url/2

Closes #1451

See merge request !2024
```
  a990374e
- Fix Pleroma.HTML.extract_first_external_url/2 · a98cda77
  minibikini authored Nov 29, 2019
  
  a98cda77
28 Nov, 2019 9 commits
- Merge branch 'bugfix/1447-set-following' into 'develop' · d7b40dd4
  rinpatch authored Nov 28, 2019
```
Migrations: Set users.following_count to NOT NULL

Closes #1447

See merge request !2021
```
  d7b40dd4
- Merge branch 'chore/manual-benchmark' into 'develop' · ca1acfa3
  rinpatch authored Nov 28, 2019
```
CI: Make benchmarks manually triggered.

See merge request !2020
```
  ca1acfa3
- Merge branch 'use-pg12-in-ci' into 'develop' · 20564600
  lain authored Nov 28, 2019
```
Use PosgreSQL v12 in the federated tests

See merge request !2022
```
  20564600
- Use PosgreSQL v12 in the federated tests · 798aa0c3
  minibikini authored Nov 28, 2019
  
  798aa0c3
- Migrations: Set users.following_count to NOT NULL · f0bdbe3f
  lain authored Nov 28, 2019
```
Also set following_count for local users to the correct value and for remote
users to 0.
```
  f0bdbe3f
- Merge branch 'fed-testing-updates' into 'develop' · 98990d2d
  lain authored Nov 28, 2019
```
Add federated test infrastructure

See merge request !2014
```
  98990d2d
- CI: Make benchmarks manually triggered. · 9a2d3810
  lain authored Nov 28, 2019
  
  9a2d3810
- Merge branch 'cleanup-tests-output' into 'develop' · 8627fb0b
  lain authored Nov 28, 2019
```
Cleanup tests output

See merge request !2018
```
  8627fb0b
- Cleanup tests output · c4b468a9
  minibikini authored Nov 28, 2019
  
  c4b468a9
27 Nov, 2019 5 commits
- Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop' · cb656938
  kaniini authored Nov 27, 2019
```
User: Never return nil for user follower counts.

Closes #1442

See merge request !2017
```
  cb656938
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into... · 50b15276
  lain authored Nov 27, 2019
```
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
```
  50b15276
- Merge branch 'remove-user-info' into 'develop' · ef1718a0
  lain authored Nov 27, 2019
```
Remove User.user_info/2

See merge request !2016
```
  ef1718a0
- User: Never return nil for user follower counts. · f36724ef
  lain authored Nov 27, 2019
  
  f36724ef
- Remove User.user_info/2 · f595cfe6
  minibikini authored Nov 27, 2019
  
  f595cfe6
26 Nov, 2019 10 commits
- update tests and Oban · bd1984f0
  Steven Fuchs authored Nov 26, 2019
  
  bd1984f0
- Tests: Run the daemon · bbec9bb7
  lain authored Jul 22, 2019 and Steven Fuchs committed Nov 26, 2019
  
  bbec9bb7
- CI: Add testing stage for federated tests. · 74aa4299
  lain authored Jul 22, 2019 and Steven Fuchs committed Nov 26, 2019
  
  74aa4299
- Tests: Don't run federated tests by default · 717d2464
  lain authored Jul 22, 2019 and Steven Fuchs committed Nov 26, 2019
  
  717d2464
- Add federated test infrastructure · f01881e8
  Chris McCord authored Jul 11, 2019 and Steven Fuchs committed Nov 26, 2019
  
  f01881e8
- Merge branch 'feature/direct_conversation_id_web_push' into 'develop' · 139b1fed
  lain authored Nov 26, 2019
```
Add `direct_conversation_id` to web push payload

See merge request !2012
```
  139b1fed
- Remove `account` field from web push payload · 4af69f04
  minibikini authored Nov 27, 2019
  
  4af69f04
- Add `direct_conversation_id` to web push payload · 80ededc0
  minibikini authored Nov 26, 2019
  
  80ededc0
- Merge branch 'fix/prod-syslog-level' into 'develop' · eb3c47f1
  feld authored Nov 26, 2019
```
Default log level for syslog in prod should also be :warn

See merge request !2011
```
  eb3c47f1
- Default log level for syslog in prod should also be :warn · f673e3de
  feld authored Nov 26, 2019
  
  f673e3de
25 Nov, 2019 8 commits
- Merge branch 'fix/ap-disable-remote-render' into 'develop' · dc909081
  lain authored Nov 25, 2019
```
Disable rendering AP representation for remote users and objects

See merge request !2010
```
  dc909081
- OStatus controller: don't serve json at /notice/, redirect instead · 4b10804f
  rinpatch authored Nov 25, 2019
  
  4b10804f
- ActivityPub controller: do not render remote users · 02f73838
  rinpatch authored Nov 25, 2019
  
  02f73838
- Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' · 5f981178
  feld authored Nov 25, 2019
```
Admin API: list all statuses from a given instance

See merge request !1981
```
  5f981178
- Merge branch 'fix/update-reports-old-format' into 'develop' · 9374b527
  feld authored Nov 25, 2019
```
Admin API: Fix error when trying to update reports in the "old" format

See merge request !1986
```
  9374b527
- Merge branch 'feature/useragent-override' into 'develop' · 756bdef5
  rinpatch authored Nov 25, 2019
```
Add ability to set a custom user-agent string

See merge request !2009
```
  756bdef5
- move documentation section for http client · e2dc8906
  Sadposter authored Nov 25, 2019
  
  e2dc8906
- add ability to set a custom user-agent string · d3656c27
  Sadposter authored Nov 25, 2019
  
  d3656c27
24 Nov, 2019 2 commits
- Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance · 82f4e476
  Maxim Filippov authored Nov 25, 2019
  
  82f4e476
- Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance · fd24467b
  Maxim Filippov authored Nov 25, 2019
  
  fd24467b