Commits · 8bcfac93a8586c12661427187ba8147dacc28c5b · Pleroma / pleroma

09 Feb, 2019 1 commit
- Make credo happy · 8bcfac93
  Haelwenn authored Feb 03, 2019
  
  8bcfac93
08 Feb, 2019 3 commits
- Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop' · c5f8df08
  lain authored Feb 08, 2019
```
Split hide_network only for local users

See merge request !781
```
  c5f8df08
- Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop' · ba7d7ffd
  lain authored Feb 08, 2019
```
Mark streaming feature for iOS apps in readme

See merge request pleroma/pleroma!790
```
  ba7d7ffd
- Merge branch 'oauth2_strengthening' into 'develop' · b4271de7
  lain authored Feb 08, 2019
```
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix

See merge request !793
```
  b4271de7
07 Feb, 2019 6 commits
- OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix. · 2c68cf7e
  Ivan Tashkinov authored Feb 07, 2019
```
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
```
  2c68cf7e
- mark streaming feature for ios apps in readme · c2090b86
  hakabahitoyo authored Feb 07, 2019
  
  c2090b86
- Merge branch 'remove-pawoo-apps-from-readme' into 'develop' · d84392c9
  kaniini authored Feb 07, 2019
```
Remove Pawoo apps from README.md

See merge request !788
```
  d84392c9
- Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop' · 24dd0fc5
  kaniini authored Feb 07, 2019
```
Mark streaming feature for Apps in README.md

See merge request pleroma/pleroma!789
```
  24dd0fc5
- Mark streaming feature for Apps in README.md · 902c72bb
  hakabahitoyo authored Feb 07, 2019
  
  902c72bb
- Update README.md · 06373905
  Hakaba Hitoyo authored Feb 07, 2019
  
  06373905
06 Feb, 2019 16 commits
- Merge branch 'rename-followings' into 'develop' · 430f2332
  kaniini authored Feb 06, 2019
```
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE

See merge request !787
```
  430f2332
- hide_followings was renamed to hide_followers in the FE, but never synced up in the BE · 74518d0b
  feld authored Feb 06, 2019
```
This was a dirty regex replace which worked on my server
```
  74518d0b
- Merge branch 'bugfix/rich-media-card' into 'develop' · 1220a171
  Haelwenn authored Feb 06, 2019
```
rich media cards: bugfixes and regression tests

See merge request !785
```
  1220a171
- tests: add a rich media card that contains all relevant fields · 26670b09
  kaniini authored Feb 06, 2019
  
  26670b09
- Merge branch 'add-admin-and-moderator-fields' into 'develop' · 18e783bc
  kaniini authored Feb 06, 2019
```
Add admin and moderator badges to user view and make their visibility configurable

See merge request !767
```
  18e783bc
- test: add some regression tests for the rich media card rendering · 6eb8c1eb
  kaniini authored Feb 06, 2019
  
  6eb8c1eb
- mastodon api: rich media: don't clobber %URI struct with a string · 65a4b9fb
  kaniini authored Feb 06, 2019
  
  65a4b9fb
- Merge branch 'mr/exsyslogger-doc-and-format' into 'develop' · 09b71a90
  Haelwenn authored Feb 06, 2019
```
Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format.

See merge request !784
```
  09b71a90
- adds a couple of explicit examples for ExSyslogger · ab80c8eb
  Michael Loftis authored Feb 06, 2019
  
  ab80c8eb
- Merge branch 'fix/activitypub-user-view-badmap' into 'develop' · f7aedbcc
  rinpatch authored Feb 06, 2019
```
Fix if clause in activity_pub user_view

See merge request !783
```
  f7aedbcc
- Fix if clause in activity_pub user_view · f753043c
  href authored Feb 06, 2019
  
  f753043c
- rids the duplicate timestamp from default ExSyslogger config · 43b3f9e9
  Michael Loftis authored Feb 06, 2019
  
  43b3f9e9
- 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
- Allow to configure visibility for admin and moderator badges · 035eaeb9
  Eugenij authored Feb 04, 2019
  
  035eaeb9
05 Feb, 2019 14 commits
- Add is_admin and is_moderator boolean fields to the user view · 398c81f9
  Eugenij authored Feb 04, 2019
  
  398c81f9
- 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 !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 !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 !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