Commits · 90cf75f4a781f2eb7016a4a165a8617d4352451b · Pleroma / pleroma

19 Jun, 2018 9 commits
- Merge branch 'features/column_media_streaming' into 'develop' · 90cf75f4
  lain authored Jun 19, 2018
```
Add streaming to media tabs of federated and local TLs

See merge request !225
```
  90cf75f4
- Merge branch 'bugfix/block-follow-relationships' into 'develop' · be800d79
  lain authored Jun 19, 2018
```
fix follow relationship leaks when blocked

See merge request !230
```
  be800d79
- tests: fix a completely bogus mastodon api test · 590e8d55
  kaniini authored Jun 19, 2018
  
  590e8d55
- user: add helper function to fetch a user given only an ap_id (fix tests) · 056305df
  kaniini authored Jun 19, 2018
  
  056305df
- Merge branch 'feature/exclude-replies-filter' into 'develop' · db0731b6
  lain authored Jun 19, 2018
```
activitypub: support filtering activities by whether or not they are a reply (closes #109)

Closes #109

See merge request !226
```
  db0731b6
- Merge branch 'bugfix/as2-contentmap' into 'develop' · de803635
  lain authored Jun 19, 2018
```
handle ActivityStreams 2.0 contentMap

See merge request !229
```
  de803635
- tests: transmogrifier: ensure incoming blocks have the same effect as local blocks · 3707a7fa
  kaniini authored Jun 19, 2018
  
  3707a7fa
- tests: prove that the block code is properly destroying follow relationships · e9ed7eb9
  kaniini authored Jun 19, 2018
  
  e9ed7eb9
- user: when processing a block in User.block(), ensure all follow relationships are broken · 320ca7b1
  kaniini authored Jun 19, 2018
```
this is needed for activitypub conformance

ref #213
```
  320ca7b1
18 Jun, 2018 3 commits
- tests: add regression test for contentMap-only posts · a2c6778c
  kaniini authored Jun 18, 2018
  
  a2c6778c
- activitypub transmogrifier: fix handling of contentMap. · c95941e6
  kaniini authored Jun 18, 2018
  
  c95941e6
- activitypub: support filtering activities by whether or not they are a reply (closes #109 ) · 4f589998
  kaniini authored Jun 18, 2018
  
  4f589998
17 Jun, 2018 2 commits
- MastodonAPI: Add streaming to media tabs of federated and local TLs · b670d4d6
  Haelwenn authored Jun 17, 2018
  
  b670d4d6
- Merge branch 'patch-2' into 'develop' · 25946f77
  lain authored Jun 17, 2018
```
Comment for Old Servers

See merge request !224
```
  25946f77
16 Jun, 2018 2 commits
- Add comment about TLS curves for older servers. · 394d0c94
  ArtikBanana authored Jun 16, 2018
  
  394d0c94
- Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop' · 1ea4a18a
  lain authored Jun 16, 2018
```
Configs for mrf_rejectnonpublic

See merge request !205
```
  1ea4a18a
15 Jun, 2018 3 commits
- Merge branch 'bugfix/mastofe_thread_render' into 'develop' · a938d07d
  eal authored Jun 15, 2018
```
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads

See merge request !223
```
  a938d07d
- Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads · 72c2915e
  Haelwenn authored Jun 15, 2018
  
  72c2915e
- Fix typo · 00d7d109
  lain authored Jun 15, 2018
  
  00d7d109
14 Jun, 2018 14 commits
- Merge branch 'fix/missing-file-extension' into 'develop' · de20c8d6
  lain authored Jun 14, 2018
```
Add missing file extension if file does not have one

See merge request !222
```
  de20c8d6
- Add missing file extension if file does not have one · 0a95b559
  normandy authored Jun 14, 2018
  
  0a95b559
- Merge branch 'fix/mp3-recognition' into 'develop' · 1c676b75
  lain authored Jun 14, 2018
```
upload.ex: add MPEG Layer 3 file header.

See merge request !221
```
  1c676b75
- upload.ex: add MPEG Layer 3 file header. · 12c7a023
  eal authored Jun 14, 2018
  
  12c7a023
- Merge branch 'patch-2' into 'develop' · 678df59d
  lain authored Jun 14, 2018
```
* fix nginx 1.15 warning:

See merge request !213
```
  678df59d
- Merge branch 'bugfix/mrf-orphaning' into 'develop' · 2723fb51
  lain authored Jun 14, 2018
```
activitypub transmogrifier: handle activity lookup failure

Closes #156

See merge request !216
```
  2723fb51
- Merge branch 'feature/twitterapi-unrepeat' into 'develop' · 8c7fdcb3
  lain authored Jun 14, 2018
```
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce

See merge request !218
```
  8c7fdcb3
- Merge branch 'bugfix/oauth2-param-name' into 'develop' · 2c303b33
  lain authored Jun 14, 2018
```
oauth: support either name or username parameter with grant_type=password

Closes #180

See merge request !219
```
  2c303b33
- Merge branch 'bugfix/oauth-password-with-email' into 'develop' · 280ac243
  lain authored Jun 14, 2018
```
oauth: fix password-based login when username is email address

Closes #199

See merge request !220
```
  280ac243
- Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop' · 408152e2
  lain authored Jun 14, 2018
```
streamer: don't relay boosts of messages which would otherwise be blocked

Closes #204

See merge request !215
```
  408152e2
- oauth: fix password-based login when username is email address · 54424665
  kaniini authored Jun 14, 2018
```
closes #199
```
  54424665
- oauth: support either name or username parameter with grant_type=password · 4894b88b
  kaniini authored Jun 14, 2018
```
closes #180
```
  4894b88b
- fixup test · fc15f30a
  normandy authored Jun 13, 2018
  
  fc15f30a
- Add unretweet TwAPI endpoint and cleanup AP.unannounce · 1555c666
  normandy authored Jun 13, 2018
  
  1555c666
13 Jun, 2018 7 commits

activitypub transmogrifier: handle activity lookup failure · 401e8af9

kaniini authored Jun 13, 2018

with the introduction of MRF, it is possible that an activity may be orphaned from it's parent, if
an activity in the chain was rejected by the active MRF policies. accordingly, handle this in the
same way as any other orphaned activity.

closes #156

401e8af9

streamer: don't relay boosts of messages which would otherwise be blocked · b5bc08fa
kaniini authored Jun 13, 2018

b5bc08fa

* fix nginx 1.15 warning: · 750cfbf3

dex authored Jun 13, 2018

nginx: [warn] the "ssl" directive is deprecated, use the "listen ... ssl" directive instead

750cfbf3

Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop' · ea42ba60
lain authored Jun 13, 2018
```
webfinger: send JRD by default instead of XRD

See merge request !211
```
ea42ba60

webfinger: send JRD by default instead of XRD · 3d402a9e

kaniini authored Jun 13, 2018

JRD being the default representation for WebFinger responses was standardized 5 years ago in
RFC 7033.

3d402a9e

Merge branch 'bugfix/webfinger-refactoring' into 'develop' · c02d03a4
lain authored Jun 13, 2018
```
webfinger: refactor webfinger() functions

Closes #212

See merge request !210
```
c02d03a4

webfinger: refactor webfinger() functions · 59f95a70

kaniini authored Jun 13, 2018

- remove code duplication
- move user lookup to parent with statement
- tighten both user lookup by nickname and activitypub URI with a type constraint

59f95a70