Commits · 6556be344de981272b9c14faf5fb9837c1ea0da6 · Pleroma / pleroma

05 Jan, 2019 3 commits
- Resolve some test failures. · 6556be34
  scarlett authored Jan 05, 2019
  
  6556be34
- add some brakets to the emoji list. · 3c86d907
  scarlett authored Jan 05, 2019
  
  3c86d907
- Strip HTML in and allow emoji in summaries. · 0787f0df
  scarlett authored Jan 05, 2019
  
  0787f0df
03 Jan, 2019 3 commits
- Merge branch 'fix/follow-requests-deleted-accounts' into 'develop' · eaaf7013
  kaniini authored Jan 03, 2019
```
user: check that the follow request actually has an active account associated with it

See merge request !623
```
  eaaf7013
- Merge branch 'captcha' into 'develop' · b73a1a33
  rinpatch authored Jan 03, 2019
```
Make captcha (kocaptcha) stateless

See merge request !585
```
  b73a1a33
- Merge branch 'fix-chat' into 'develop' · 9ef664ff
  rinpatch authored Jan 03, 2019
```
Add handler for Phoenix-style socket.

See merge request !619
```
  9ef664ff
02 Jan, 2019 4 commits
- user: check that the follow request actually has an active account associated with it · eb1a18d2
  kaniini authored Jan 02, 2019
```
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
```
  eb1a18d2
- Merge branch 'fix/reserve-media-username' into 'develop' · d1983ed0
  rinpatch authored Jan 02, 2019
```
Reserve /media

See merge request !620
```
  d1983ed0
- reserve /media · 5142b50f
  Rin Toshaka authored Jan 02, 2019
  
  5142b50f
- Add handler for Phoenix-style socket. · 8910e103
  lain authored Jan 02, 2019
  
  8910e103
01 Jan, 2019 10 commits
- Merge branch 'pool-usage' into 'develop' · 32bed664
  kaniini authored Jan 01, 2019
```
Update of hackney and tesla, removal of superflous default options.

See merge request !614
```
  32bed664
- Merge branch 'configurable-federator' into 'develop' · 34fa7090
  rinpatch authored Jan 01, 2019
```
Make Federator options configurable.

See merge request !615
```
  34fa7090
- Merge branch '2019-1-1-update-frontend' into 'develop' · b9ac7067
  lain authored Jan 01, 2019
```
update frontend

See merge request !616
```
  b9ac7067
- update frontend · 1dd0e0ed
  lain authored Jan 01, 2019
  
  1dd0e0ed
- Add documentation. · 1a0391c8
  lain authored Jan 01, 2019
  
  1a0391c8
- Merge branch 'cleanup/admin-api-useless-if' into 'develop' · 32541172
  lain authored Jan 01, 2019
```
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete

See merge request !612
```
  32541172
- Make Federator options configurable. · 400337b0
  lain authored Jan 01, 2019
  
  400337b0
- Merge remote-tracking branch 'origin/develop' into pool-usage · 096a9278
  lain authored Jan 01, 2019
  
  096a9278
- Update Tesla and Hackney. · 91afbbe4
  lain authored Jan 01, 2019
  
  91afbbe4
- Remove default pool, it's used automatically anyway. · d4799e0d
  lain authored Jan 01, 2019
  
  d4799e0d
31 Dec, 2018 10 commits
- Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete · 1e6c102b
  Haelwenn authored Dec 31, 2018
  
  1e6c102b
- Merge branch 'features/admin-api-user-views' into 'develop' · 90e157ef
  kaniini authored Dec 31, 2018
```
User/Account views: Add rights.admin

Closes #472

See merge request !589
```
  90e157ef
- Merge branch 'docs/admin-api' into 'develop' · 1b1e9286
  kaniini authored Dec 31, 2018
```
Add docs/Admin-API.md

See merge request !611
```
  1b1e9286
- Merge branch 'maintenance/copyright-2019' into 'develop' · ede3fd74
  kaniini authored Dec 31, 2018
```
update copyright years to 2019

See merge request pleroma/pleroma!613
```
  ede3fd74
- update copyright years to 2019 · 980b5288
  kaniini authored Dec 31, 2018
  
  980b5288
- Add docs/Admin-API.md · 286632df
  Haelwenn authored Dec 31, 2018
```
[ci skip]
```
  286632df
- Merge branch 'fix/scrubber-cache' into 'develop' · 33e3a7ba
  lain authored Dec 31, 2018
```
[#481] Store scrubbed posts in Cachex

Closes #481

See merge request !610
```
  33e3a7ba
- Fix a typo in user_test.ex · 9f5881cb
  Rin Toshaka authored Dec 31, 2018
  
  9f5881cb
- 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 10 commits
- Merge branch 'mr/retry-queue' into 'develop' · 8e7da98b
  kaniini authored Dec 30, 2018
```
Improves RetryQueue behavior

See merge request !609
```
  8e7da98b
- 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