Commits · 6ed9b31a5fea055aad7d390d50ead4cdfd6b7378 · Pleroma / pleroma

31 Dec, 2018 2 commits
- Eh? · 6ed9b31a
  Rin Toshaka authored Dec 31, 2018
  
  6ed9b31a
- Move scrubber cache-related functions to Pleroma.HTML · 7e09c2bd
  Rin Toshaka authored Dec 31, 2018
  
  7e09c2bd
30 Dec, 2018 18 commits
- Get default scrubbers from config instead of hardcoded · 05743e20
  rinpatch authored Dec 31, 2018
  
  05743e20
- Fix test failure · 91d5a7e8
  rinpatch authored Dec 31, 2018
  
  91d5a7e8
- Resolve merge conflict · dec23500
  Rin Toshaka authored Dec 30, 2018
  
  dec23500
- Fix comment in object.ex · ab3089d6
  Rin Toshaka authored Dec 30, 2018
  
  ab3089d6
- Merge branch 'activitypub-c2s' into 'develop' · dfde2622
  kaniini authored Dec 30, 2018
```
Activitypub c2s

See merge request pleroma/pleroma!608
```
  dfde2622
- shame on me for not testing after revert · c50353e6
  Rin Toshaka authored Dec 30, 2018
  
  c50353e6
- Fix formating. Aparently my pre-commit hook broke. · 3f9da55a
  Rin Toshaka authored Dec 30, 2018
  
  3f9da55a
- Revert some changes in html.ex · 62af23bd
  Rin Toshaka authored Dec 30, 2018
  
  62af23bd
- Friendship ended with Postgresql now Cachex is my best friend · c119ea3a
  Rin Toshaka authored Dec 30, 2018
  
  c119ea3a
- Friendship ended with Postgresql now Cachex is my best friend · 535fddd2
  Rin Toshaka authored Dec 30, 2018
  
  535fddd2
- Added get_stripped_html_for_object. Renamed a few things · d9f40b05
  Rin Toshaka authored Dec 30, 2018
  
  d9f40b05
- Tidy up the code. Rename key to signature · bce152ab
  Rin Toshaka authored Dec 30, 2018
  
  bce152ab
- Fix some stupid typos · 66d1c314
  Rin Toshaka authored Dec 30, 2018
  
  66d1c314
- Respond with full activity to outbox post · f40562b4
  sxsdv1 authored Dec 30, 2018
  
  f40562b4
- Limit activity types accepted to outbox to only 'Create' · 1e781715
  sxsdv1 authored Dec 29, 2018
  
  1e781715
- Create activity when client posts to outbox · 569bad82
  sxsdv1 authored Dec 29, 2018
  
  569bad82
- Implement ActivityPub inbox view · 26dc2ddd
  sxsdv1 authored Dec 29, 2018
```
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
```
  26dc2ddd
- Use Object.change instead of Ecto.Changeset.change · a32e2390
  Rin Toshaka authored Dec 30, 2018
  
  a32e2390
29 Dec, 2018 16 commits
- Wire up stub routes for client calls of activitypub inbox/outbox · aa082ca7
  sxsdv1 authored Dec 29, 2018
```
Code style: remove wrapping function of outbox
```
  aa082ca7
- use Kernel.put_in instead of Map.merge · 9a0163db
  Rin Toshaka authored Dec 29, 2018
  
  9a0163db
- Merge branch 'fix_485' into 'develop' · f5d7b000
  Haelwenn authored Dec 29, 2018
```
Change 'name' to 'instance_name' so option is used when running non-interactive

See merge request pleroma/pleroma!607
```
  f5d7b000
- I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD · 19f9889f
  Rin Toshaka authored Dec 29, 2018
  
  19f9889f
- Merge branch '2018-12-29-update-frontend' into 'develop' · e8ba390f
  lain authored Dec 29, 2018
```
update frontend

See merge request pleroma/pleroma!606
```
  e8ba390f
- update frontend · e1227d81
  lain authored Dec 29, 2018
  
  e1227d81
- Merge branch 'carrot-bullying' into 'develop' · 3dc5f049
  kaniini authored Dec 29, 2018
```
Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595
```
  3dc5f049
- Change 'name' to 'instance_name' so option is used when running non-interactive · ab9cda31
  spctrl authored Dec 29, 2018
  
  ab9cda31
- Merge branch '483_blocks_import_export' into 'develop' · dd8f2196
  kaniini authored Dec 29, 2018
```
[#483] Blocked users list import & export

Closes #483

See merge request pleroma/pleroma!603
```
  dd8f2196
- Merge branch 'support/issue_480' into 'develop' · 7117ab43
  kaniini authored Dec 29, 2018
```
[#480] Salmon# fixed publish an activity to remote accounts

See merge request pleroma/pleroma!605
```
  7117ab43
- Salmon# fixed publish an activity to remote accounts · 523848d1
  Maksim authored Dec 29, 2018
  
  523848d1
- [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. · 242cc9a6
  Ivan Tashkinov authored Dec 29, 2018
  
  242cc9a6
- [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. · 7bd49a32
  Ivan Tashkinov authored Dec 29, 2018
  
  7bd49a32
- [#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname · b3574dcc
  Ivan Tashkinov authored Dec 29, 2018
```
(<nick>@<our_instance_host>).
```
  b3574dcc
- [#483] Refactored blocks and follows import, added tests. · 67b4297f
  Ivan Tashkinov authored Dec 29, 2018
  
  67b4297f
- Merge branch '471_invalid_accounts_rendering' into 'develop' · 49cf5f9c
  kaniini authored Dec 29, 2018
```
[#471] Prevented rendering of inactive local accounts

Closes #471

See merge request pleroma/pleroma!599
```
  49cf5f9c
28 Dec, 2018 4 commits
- Merge branch 'systemd-drop-sysadmin-privilege' into 'develop' · 89fbed88
  kaniini authored Dec 28, 2018
```
Security/Drops the sysadmin privilege from the daemon

See merge request pleroma/pleroma!604
```
  89fbed88
- Security/Drops the sysadmin privilege from the daemon · 64035201
  shibayashi authored Dec 28, 2018
  
  64035201
- [#483] Blocked users list import (TwitterAPI). · 700661b7
  Ivan Tashkinov authored Dec 28, 2018
  
  700661b7
- [#467] Refactored valid / invalid user rendering. · 0a417866
  Ivan Tashkinov authored Dec 28, 2018
  
  0a417866