Commits · f1b72bfb70b1358dbf4bf0c6be189fa59f5feab7 · Pleroma / pleroma

06 Feb, 2019 3 commits
- Split hide_networ only for local users · f1b72bfb
  Maxim Filippov authored Feb 06, 2019
  
  f1b72bfb
- Merge branch '2019-02-06-update-frontend' into 'develop' · 3c08e20d
  lain authored Feb 06, 2019
```
update frontend

See merge request !780
```
  3c08e20d
- update frontend · 78a51f4d
  lain authored Feb 06, 2019
  
  78a51f4d
05 Feb, 2019 17 commits
- Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop' · c46490b1
  rinpatch authored Feb 05, 2019
```
rich media: parser: reject any data which cannot be explicitly encoded into JSON

Closes #596

See merge request !779
```
  c46490b1
- rich media: parser: reject any data which cannot be explicitly encoded into JSON · d83dbd90
  kaniini authored Feb 05, 2019
  
  d83dbd90
- Merge branch 'fix-dm-index' into 'develop' · d120aa63
  kaniini authored Feb 05, 2019
```
Massage index until it actually does the stuff we want.

See merge request pleroma/pleroma!772
```
  d120aa63
- Merge branch 'feature/ap-c2s-whoami' into 'develop' · 681ba1e5
  kaniini authored Feb 05, 2019
```
activitypub: c2s: add /api/ap/whoami endpoint for andstatus

See merge request pleroma/pleroma!773
```
  681ba1e5
- Merge branch 'testfix/twitter-api' into 'develop' · 00d572fd
  kaniini authored Feb 05, 2019
```
test: twitterapi: fix another possible test failure case

See merge request !778
```
  00d572fd
- test: twitterapi: fix another possible test failure case · 73e6a1f1
  kaniini authored Feb 05, 2019
  
  73e6a1f1
- Merge branch 'feature/split-hide-network-v2' into 'develop' · eb2b1960
  kaniini authored Feb 05, 2019
```
Split hide_network into hide_followers & hide_followings (fixed)

See merge request !765
```
  eb2b1960
- Merge branch 'bugfix/rich-media-image-nil' into 'develop' · ecdb0b7f
  kaniini authored Feb 05, 2019
```
mastodon api: fix rendering of cards without image URLs (closes #597)

Closes #597

See merge request pleroma/pleroma!777
```
  ecdb0b7f
- test: twitterapi: fix the test breakage for real · c4d317cc
  kaniini authored Feb 05, 2019
  
  c4d317cc
- mastodon api: fix rendering of cards without image URLs (closes #597) · 1d94b67e
  kaniini authored Feb 05, 2019
  
  1d94b67e
- Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop' · f8b831ec
  lain authored Feb 05, 2019
```
activitypub: transmogrifier: fix bare tags

See merge request !774
```
  f8b831ec
- Merge branch 'patch-2' into 'develop' · 040ab352
  lain authored Feb 05, 2019
```
ARGLE GARBLE

See merge request !776
```
  040ab352
- Merge branch 'bugfix/rich-media-nil' into 'develop' · 8892f446
  lain authored Feb 05, 2019
```
html: don't attempt to parse nil content

See merge request !775
```
  8892f446
- Fix SQL · c48aba3c
  Maxim Filippov authored Feb 05, 2019
  
  c48aba3c
- ARGLE GARBLE · 47eb5576
  witches.live authored Feb 05, 2019
```
Update .gitignore
```
  47eb5576
- html: don't attempt to parse nil content · a2bb5d89
  kaniini authored Feb 05, 2019
  
  a2bb5d89
- activitypub: transmogrifier: fix bare tags · e71ab5a1
  kaniini authored Feb 05, 2019
  
  e71ab5a1
04 Feb, 2019 20 commits
- activitypub: c2s: add /api/ap/whoami endpoint for andstatus · db1165f7
  kaniini authored Feb 04, 2019
  
  db1165f7
- Massage index until it actually does the stuff we want. · f3c8b02d
  lain authored Feb 04, 2019
```
Also makes the index a lot smoler.
```
  f3c8b02d
- Initialize hide_network with false · cd6606b7
  Maxim Filippov authored Feb 04, 2019
  
  cd6606b7
- Merge branch 'feature/mrf-tag' into 'develop' · 03991e7b
  Haelwenn authored Feb 04, 2019
```
MRF TagPolicy engine

See merge request pleroma/pleroma!768
```
  03991e7b
- activitypub: mrf: tag policy: fix force-unlisted and sandbox actions · 7d110be1
  kaniini authored Feb 04, 2019
  
  7d110be1
- activitypub: mrf: tag policy: add support for subscription control · 64a39934
  kaniini authored Feb 04, 2019
  
  64a39934
- Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop' · 3ae11835
  rinpatch authored Feb 04, 2019
```
fix hellthread threshold deprecation warning

See merge request pleroma/pleroma!770
```
  3ae11835
- fix hellthread threshold deprecation warning · 4031c94a
  Karen Konou authored Feb 04, 2019
  
  4031c94a
- activitypub: mrf: tag policy: refactor the filtering hook a bit · ff2c28fd
  kaniini authored Feb 04, 2019
  
  ff2c28fd
- activitypub: mrf: tag policy: add support for processing follow requests · 9a69f08e
  kaniini authored Feb 04, 2019
  
  9a69f08e
- activitypub: mrf: tag policy: implement force-unlisted and sandbox · 084bb8cc
  kaniini authored Feb 04, 2019
  
  084bb8cc
- mrf: add initial MRF.TagPolicy engine · 88e32a32
  kaniini authored Feb 04, 2019
  
  88e32a32
- mix: add user tag/untag task · 93e136d7
  kaniini authored Feb 04, 2019
  
  93e136d7
- Merge branch 'mime-riff' into 'develop' · 25a659d2
  kaniini authored Feb 04, 2019
```
Mime: detect RIFF formats (wave, webp, avi)

See merge request pleroma/pleroma!769
```
  25a659d2
- Mime: detect RIFF formats (wave, webp, avi) · 127f99ae
  href authored Feb 04, 2019
  
  127f99ae
- Merge branch 'fix/rich-media-relative-path' into 'develop' · 00835bf6
  rinpatch authored Feb 04, 2019
```
Fix rich media relative path

Closes #588

See merge request pleroma/pleroma!759
```
  00835bf6
- Merge branch 'feature/hellthread-filter-improvements' into 'develop' · 89762ad2
  rinpatch authored Feb 04, 2019
```
Improve hellthread filter

Closes #584

See merge request pleroma/pleroma!766
```
  89762ad2
- removed a debug thingy · 58262a8b
  Karen Konou authored Feb 04, 2019
  
  58262a8b
- squished a bug · 44306413
  Karen Konou authored Feb 04, 2019
  
  44306413
- actually commited the changes · 3cf046ba
  Karen Konou authored Feb 04, 2019
  
  3cf046ba