Commits · 51111e286b316340b45b4e6a378646bed0cb0a6a · Pleroma / pleroma

29 Nov, 2019 1 commit
- [#1427] Initial support for OAuth admin scopes. · 51111e28
  Ivan Tashkinov authored Nov 29, 2019
  
  51111e28
20 Nov, 2019 1 commit
- Merge branch 'fix-docker-build' into 'develop' · 75efdb07
  lain authored Nov 20, 2019
```
Fix failing docker build

See merge request pleroma/pleroma!1998
```
  75efdb07
19 Nov, 2019 6 commits
- 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
- 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
- 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
16 Nov, 2019 2 commits
- Merge branch 'chore/bump-fast-sanitize' into 'develop' · 4df2d64b
  rinpatch authored Nov 16, 2019
```
Bump fast_sanitize

See merge request pleroma/pleroma!1988
```
  4df2d64b
- Bump fast_sanitize · fad296e4
  rinpatch authored Nov 16, 2019
  
  fad296e4
15 Nov, 2019 17 commits
- Merge branch 'chore/changelog-sync-' into 'develop' · a869c718
  rinpatch authored Nov 15, 2019
```
Sync the changelogs between develop and stable

See merge request pleroma/pleroma!1985
```
  a869c718
- Sync the changelogs between develop and stable · da28bf8f
  rinpatch authored Nov 16, 2019
  
  da28bf8f
- Merge branch 'nodeinfo-fields-limit' into 'develop' · 81cba405
  kaniini authored Nov 15, 2019
```
Add fieldsLimit to metadata of nodeinfo

See merge request pleroma/pleroma!1983
```
  81cba405
- Merge branch 'mix-task-warning' into 'develop' · 9e386842
  rinpatch authored Nov 15, 2019
```
Documentation: Add warning about database mix tasks.

See merge request pleroma/pleroma!1984
```
  9e386842
- Add test · c9a06b14
  kPherox authored Nov 15, 2019
  
  c9a06b14
- Merge branch 'bugfix/1395-email-activation' into 'develop' · 22554ac5
  rinpatch authored Nov 15, 2019
```
Bugfix/1395 email activation

Closes #1395

See merge request pleroma/pleroma!1965
```
  22554ac5
- Documentation: Add warning about database mix tasks. · 234c27cb
  lain authored Nov 15, 2019
  
  234c27cb
- OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug · f17e0f8e
  lain authored Nov 15, 2019
  
  f17e0f8e
- Merge branch 'feature/mrf-object-age-policy' into 'develop' · 13b6aefd
  lain authored Nov 15, 2019
```
MRF: add ObjectAgePolicy

See merge request pleroma/pleroma!1982
```
  13b6aefd
- Apply suggestion to CHANGELOG.md · 075789c4
  lain authored Nov 15, 2019
  
  075789c4
- Add fieldsLimit to metadata of nodeinfo · 72d2557e
  kPherox authored Nov 15, 2019
  
  72d2557e
- fix credo · 7c59bc9e
  kaniini authored Nov 14, 2019
  
  7c59bc9e
- object age policy: remove debug logging · eecd64cc
  kaniini authored Nov 14, 2019
  
  eecd64cc
- add changelog entry for MRF ObjectAgePolicy · 2469880a
  kaniini authored Nov 14, 2019
  
  2469880a
- MRF: add ObjectAgePolicy which deals with old posts being imported · 5705cf0e
  kaniini authored Nov 14, 2019
  
  5705cf0e
- docs: document MRF ObjectAgePolicy · 29f49bf5
  kaniini authored Nov 14, 2019
  
  29f49bf5
- config: add configuration for MRF ObjectAgePolicy · 1d33eeca
  kaniini authored Nov 14, 2019
  
  1d33eeca
14 Nov, 2019 7 commits
- Merge branch 'fix/conversations-rendering' into 'develop' · 09b4f726
  rinpatch authored Nov 14, 2019
```
Fix rendering conversations when there's a malformed status

Closes #1401

See merge request pleroma/pleroma!1973
```
  09b4f726
- format the code · 94f1cfce
  rinpatch authored Nov 14, 2019
  
  94f1cfce
- Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' · 1afeaf82
  feld authored Nov 14, 2019
```
Admin API: Grouped reports, update multiple reports in one query

Closes admin-fe#43

See merge request pleroma/pleroma!1815
```
  1afeaf82
- Merge branch 'ci/disable-trace' into 'develop' · 574369b4
  rinpatch authored Nov 14, 2019
```
ci: disable --trace for unit tests

See merge request pleroma/pleroma!1980
```
  574369b4
- ci: disable --trace for unit tests · 2861f97e
  rinpatch authored Nov 14, 2019
```
it is mostly useless, but makes failures harder to find
```
  2861f97e
- Merge branch 'reactions' into 'develop' · 6085c71b
  rinpatch authored Nov 14, 2019
```
Emoji Reactions

See merge request pleroma/pleroma!1662
```
  6085c71b
- Update CHANGELOG.md · 7a322713
  lain authored Nov 14, 2019
  
  7a322713
13 Nov, 2019 4 commits
- Merge branch 'static-fe-object-id' into 'develop' · f74bb1d0
  lain authored Nov 13, 2019
```
Redirect object/activity ID to notice in static-fe

Closes #1412

See merge request !1977
```
  f74bb1d0
- Support redirecting by activity UUID in static FE as well. · 3c60adbc
  Phil Hagelberg authored Nov 12, 2019
  
  3c60adbc
- Support redirecting by object ID in static FE. · 0867cb08
  Phil Hagelberg authored Nov 12, 2019
```
This matches the behavior of pleroma-fe better.

Fixes #1412.
```
  0867cb08
- Merge branch 'fix-rate-limiter-test' into 'develop' · 60cc5a77
  lain authored Nov 13, 2019
```
Fix random fails of the rate limiter tests (hopefully)

See merge request !1978
```
  60cc5a77