Commits · d27056fbfe66843258567d07532ff6667e64a79b · Hakaba Hitoyo / pleroma

29 Nov, 2019 2 commits
- remove redundant fallback for actor_type · d27056fb
  Hakaba Hitoyo authored Nov 29, 2019
  
  d27056fb
- add NOT NULL to actor_type column · 4311e9ee
  Hakaba Hitoyo authored Nov 29, 2019
  
  4311e9ee
23 Nov, 2019 4 commits
- configurable activitypub actor · a9d1afca
  Hakaba Hitoyo authored Nov 23, 2019
  
  a9d1afca
- bugfix · 834ac581
  Hakaba Hitoyo authored Nov 23, 2019
  
  834ac581
- add actor_type into mastodon api · e50e38c5
  Hakaba Hitoyo authored Nov 23, 2019
  
  e50e38c5
- add actor_type into users table and model · f0ec158d
  Hakaba Hitoyo authored Nov 23, 2019
  
  f0ec158d
22 Nov, 2019 4 commits
- Merge branch 'fix/release-envvars' into 'develop' · 34cdbcbb
  rinpatch authored Nov 22, 2019
```
OTP releases: only set name and distribution type if not set already

See merge request pleroma/pleroma!2004
```
  34cdbcbb
- OTP releases: only set name and distribution type if not set already · 4a5bb7eb
  rinpatch authored Nov 22, 2019
```
Fixes not being able to run two OTP releases on one machine because of
the name conflict.
```
  4a5bb7eb
- Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' · bd629460
  lain authored Nov 22, 2019
```
AdminAPI: Confirm user account, resend confirmation email

See merge request pleroma/pleroma!1994
```
  bd629460
- Swap map with each · b64c7b35
  Maxim Filippov authored Nov 22, 2019
  
  b64c7b35
21 Nov, 2019 11 commits
- Merge branch 'list-users' into 'develop' · c2ad9fd5
  rinpatch authored Nov 21, 2019
```
Add CLI list users command

See merge request pleroma/pleroma!1990
```
  c2ad9fd5
- Add CLI list users command · fbc379d6
  Alex Schroeder authored Nov 17, 2019
  
  fbc379d6
- Merge branch 'revert-5c6c3026' into 'develop' · dedb1ad5
  rinpatch authored Nov 21, 2019
```
Revert "Merge branch 'patch-1' into 'develop'"

See merge request pleroma/pleroma!2002
```
  dedb1ad5
- Merge branch 'fix/mix-task-logging' into 'develop' · 19b727bf
  lain authored Nov 21, 2019
```
Allow mix tasks to always run with debug logging

See merge request pleroma/pleroma!1997
```
  19b727bf
- Revert "Merge branch 'patch-1' into 'develop'" · dc9303ea
  rinpatch authored Nov 21, 2019
```
This reverts merge request !1829
```
  dc9303ea
- Merge branch 'issue/1348' into 'develop' · 8feb5dcb
  lain authored Nov 21, 2019
```
[#1348] excluded invisible actors from gets  /api/v1/accounts/:id

See merge request pleroma/pleroma!1937
```
  8feb5dcb
- Object: Use inspect to log missing preload. · 320690f7
  lain authored Nov 21, 2019
  
  320690f7
- Merge branch 'fix/user-following-count' into 'develop' · 1680a347
  lain authored Nov 21, 2019
```
Fix user.following_count

See merge request pleroma/pleroma!2000
```
  1680a347
- Merge branch 'remove-useless-warning' into 'develop' · cd8da73b
  lain authored Nov 21, 2019
```
Remove version mismatch warning

See merge request pleroma/pleroma!2001
```
  cd8da73b
- Remove version mismatch warning · 8ffd1c79
  minibikini authored Nov 21, 2019
  
  8ffd1c79
- Fix user.following_count · d38ab4bb
  minibikini authored Nov 21, 2019
  
  d38ab4bb
20 Nov, 2019 7 commits
- Some tasks try to set log level in test environment, but we were stripping logs belog :warn. · edaae845
  feld authored Nov 20, 2019
```
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
```
  edaae845
- Console backend's log format should be prefixed and suffixed with newlines. · c65190c7
  feld authored Nov 20, 2019
```
This is how upstream does it by default.
```
  c65190c7
- Merge branch 'develop' into fix/mix-task-logging · 140a54fd
  feld authored Nov 20, 2019
  
  140a54fd
- Be specific about format for logs in test as we have tests that check it · 1c17f183
  feld authored Nov 20, 2019
  
  1c17f183
- Merge branch 'fix/sporadic-tests' into 'develop' · 937d6c6b
  lain authored Nov 20, 2019
```
Fix sporadically failing test

Closes #1432

See merge request pleroma/pleroma!1999
```
  937d6c6b
- Merge branch 'fix-docker-build' into 'develop' · 75efdb07
  lain authored Nov 20, 2019
```
Fix failing docker build

See merge request pleroma/pleroma!1998
```
  75efdb07
- Fix sporadically failing test · 63711258
  minibikini authored Nov 20, 2019
  
  63711258
19 Nov, 2019 10 commits
- Allow test builds to have info and debug logs stripped · cb513a59
  feld authored Nov 19, 2019
  
  cb513a59
- Allow mix tasks to always run with debug logging · ff9133b9
  feld authored Nov 19, 2019
  
  ff9133b9
- Merge branch 'chore/bump-fe' into 'develop' · 27f73d38
  rinpatch authored Nov 19, 2019
```
Bump fe and sync changelogs

See merge request pleroma/pleroma!1996
```
  27f73d38
- changelog: add 1.1.6 entries from stable · dc8830da
  rinpatch authored Nov 20, 2019
  
  dc8830da
- bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 · 0fe08346
  rinpatch authored Nov 19, 2019
  
  0fe08346
- remove docs/ from .dockerignore · b7bbb544
  kPherox authored Nov 19, 2019
  
  b7bbb544
- Fix tests · b88dbc17
  Maxim Filippov authored Nov 19, 2019
  
  b88dbc17
- Merge branch 'feature/admin-api/support-token-header' into 'develop' · bf89e0bf
  lain authored Nov 19, 2019
```
Admin API: Support authentication via `x-admin-token` HTTP header

Closes #1430

See merge request pleroma/pleroma!1993
```
  bf89e0bf
- AdminAPI: Confirm user account, resend confirmation email · 46eb1601
  Maxim Filippov authored Nov 19, 2019
  
  46eb1601
- Support authentication via `x-admin-token` HTTP header · 36686f52
  minibikini authored Nov 19, 2019
  
  36686f52
18 Nov, 2019 2 commits
- Merge branch 'docs/remove_activation_status_endpoint' into 'develop' · 06151776
  feld authored Nov 18, 2019
```
Remove deprecated endpoint from docs that is fully removed from backend now

See merge request pleroma/pleroma!1992
```
  06151776
- Remove deprecated endpoint from docs that is fully removed from backend now · adacf1b5
  feld authored Nov 18, 2019
  
  adacf1b5