Commits · 36557155af3733d790496ad8fdeca99a133a804f · Pleroma / pleroma

08 Nov, 2017 4 commits
- Update frontend. · 36557155
  Roger Braun authored Nov 08, 2017
  
  36557155
- Merge branch 'blocks-in-user-view' into 'develop' · 8bbbfd72
  lain authored Nov 08, 2017
```
TwitterAPI user view: add blocks.

See merge request !10
```
  8bbbfd72
- TwitterAPI user view: add blocks. · 4656cb9b
  eal authored Nov 08, 2017
  
  4656cb9b
- Merge branch 'twitter-api-blocks' into 'develop' · 3bbefd0a
  lain authored Nov 08, 2017
```
TwitterAPI: Add blocks.

See merge request !9
```
  3bbefd0a
07 Nov, 2017 10 commits
- TwitterAPI: Add blocks. · 6c0758e0
  eal authored Nov 08, 2017
  
  6c0758e0
- Merge branch 'mastodon-emoji-endpoint' into 'develop' · be67db55
  lain authored Nov 07, 2017
```
Add mastodon API endpoint for custom emoji.

See merge request !8
```
  be67db55
- Add mastodon API endpoint for custom emoji. · c6210183
  eal authored Nov 07, 2017
  
  c6210183
- Merge branch 'authenticated-profile-fetching' into 'develop' · d761b154
  lain authored Nov 07, 2017
```
Allow profile fetching for authenticated users only.

Closes #54

See merge request !7
```
  d761b154
- Update frontend. · f801b695
  Roger Braun authored Nov 07, 2017
  
  f801b695
- Update fronted. · abfcf93d
  Roger Braun authored Nov 07, 2017
  
  abfcf93d
- Allow self-rt. · 722c4614
  Roger Braun authored Nov 07, 2017
  
  722c4614
- Linkify fixes. · 7da978f3
  Roger Braun authored Nov 07, 2017
  
  7da978f3
- Revert "Longer timeouts for user fetching." · 6dfa6280
  lain authored Nov 07, 2017
```
Breaks too many tests.

This reverts commit 7de3a652.
```
  6dfa6280
- Longer timeouts for user fetching. · 7de3a652
  lain authored Nov 07, 2017
  
  7de3a652
06 Nov, 2017 4 commits
- Allow profile fetching for authenticated users only. · f8556632
  eal authored Nov 07, 2017
  
  f8556632
- Merge branch 'fix-tootdon-oauth' into 'develop' · ed1eb5de
  lain authored Nov 06, 2017
```
Fix tootdon logins.

See merge request !6
```
  ed1eb5de
- Update README. · d1c126ac
  eal authored Nov 06, 2017
  
  d1c126ac
- Fix tootdon logins. · b0e27b21
  eal authored Nov 06, 2017
  
  b0e27b21
05 Nov, 2017 2 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 7252f6b0
  lain authored Nov 05, 2017
  
  7252f6b0
- Fix bug when no posts are in the db. · 046bee34
  lain authored Nov 05, 2017
  
  046bee34
03 Nov, 2017 5 commits
- Merge branch 'feature/blocks' into 'develop' · fa1f11e8
  lain authored Nov 03, 2017
```
Feature/blocks

See merge request !5
```
  fa1f11e8
- MastoAPI: Add list of blocked users. · c6b9b777
  lain authored Nov 03, 2017
  
  c6b9b777
- MastoAPI: Add blocking. · 5bf92e50
  lain authored Nov 03, 2017
  
  5bf92e50
- MastoAPI: Add blocking to AccountView. · 33beb51d
  lain authored Nov 03, 2017
  
  33beb51d
- MastoAPI: Fix mentions always being for an anonymous user. · 8a1a7191
  lain authored Nov 03, 2017
  
  8a1a7191
02 Nov, 2017 14 commits
- MastoApi: Add blocking to fetches. · 9b63647a
  lain authored Nov 02, 2017
  
  9b63647a
- TwitterAPI: Add blocking to fetches. · d89a7a0b
  lain authored Nov 02, 2017
  
  d89a7a0b
- Handle nil cases. · 867ac1e4
  lain authored Nov 02, 2017
  
  867ac1e4
- Don't return blocked users' activities in contexts. · 8ef58a26
  lain authored Nov 02, 2017
  
  8ef58a26
- Don't return activities from blocked users. · a47727ad
  lain authored Nov 02, 2017
  
  a47727ad
- Don't create notifications if the user is blocked. · 632da6c9
  lain authored Nov 02, 2017
  
  632da6c9
- Add blocks to User. · 6a5f0871
  lain authored Nov 02, 2017
  
  6a5f0871
- Clean up user_test.exs. · 345ad870
  lain authored Nov 02, 2017
  
  345ad870
- update gitlab ci · 9554436d
  Roger Braun authored Nov 02, 2017
  
  9554436d
- Read variable for testing db. · 57945580
  Roger Braun authored Nov 02, 2017
  
  57945580
- Update .gitlab-ci.yml · 32e1e52b
  lain authored Nov 02, 2017
  
  32e1e52b
- Update .gitlab-ci.yml · 520cc0c8
  lain authored Nov 02, 2017
  
  520cc0c8
- Update .gitlab-ci.yml · 41425fd6
  lain authored Nov 02, 2017
  
  41425fd6
- Add gitlab-ci.yml · 201fbd97
  lain authored Nov 02, 2017
  
  201fbd97
01 Nov, 2017 1 commit
- Handle empty terms / tags. · 9be286a9
  lain authored Nov 01, 2017
  
  9be286a9