Commits · 52ac7dce5c460d27d946d26070eb123e89af2914 · Pleroma / pleroma

17 Dec, 2018 13 commits
- Merge branch 'captcha' into 'develop' · 52ac7dce
  lain authored Dec 17, 2018
```
Captcha

See merge request !550
```
  52ac7dce
- Merge branch 'fix-tags' into 'develop' · c6d5f189
  lain authored Dec 17, 2018
```
Fix tagging problems for existing instances.

See merge request !562
```
  c6d5f189
- Merge branch 'test-mix-tasks' into 'develop' · 98c31dea
  lain authored Dec 17, 2018
```
Add tests for Mix tasks

See merge request !555
```
  98c31dea
- Merge branch 'phoenix14' into 'develop' · 078b8b6d
  lain authored Dec 17, 2018
```
Upgrade to Phoenix 1.4

Closes #451

See merge request !560
```
  078b8b6d
- don't re-use build · 0f67c1d4
  lain authored Dec 17, 2018
  
  0f67c1d4
- Fix tagging problems for existing instances. · e4763cd4
  lain authored Dec 17, 2018
  
  e4763cd4
- Alias Kocaptcha in the test · de981ac5
  vaartis authored Dec 17, 2018
  
  de981ac5
- Use :ets.match_delete to delete old captchas · 35522fef
  vaartis authored Dec 17, 2018 and vaartis committed Dec 17, 2018
  
  35522fef
- Switch to phoenixframework/phoenix as the needed change is merged. · ba9ef77b
  href authored Dec 17, 2018
  
  ba9ef77b
- Integration tests for mastodon websocket · b12a9049
  href authored Dec 17, 2018
  
  b12a9049
- Cowboy handler for Mastodon WebSocket · 77b5154c
  href authored Dec 17, 2018
  
  77b5154c
- Merge branch 'testfix/webfinger-jrd' into 'develop' · 56735979
  lain authored Dec 17, 2018
```
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test

See merge request !554
```
  56735979
- minutes->seconds_retained in config.md · 6e2f64a0
  vaartis authored Dec 17, 2018
  
  6e2f64a0
16 Dec, 2018 19 commits
- Clean captchas up periodically, not schedule it after theyre created · ef682938
  vaartis authored Dec 16, 2018
  
  ef682938
- Fix captcha tests · 73576ab6
  vaartis authored Dec 16, 2018
  
  73576ab6
- Change minutes_retained config to seconds_retained · 3a31fdaf
  vaartis authored Dec 16, 2018
  
  3a31fdaf
- Make the hosted kocaptcha the default value · 1d31fd07
  vaartis authored Dec 16, 2018
  
  1d31fd07
- Add a configurable auto-cleanup for captchas · 6062885d
  vaartis authored Dec 16, 2018
  
  6062885d
- More put_view. · 5dcb7aec
  href authored Dec 16, 2018
  
  5dcb7aec
- Use bindings dbuser and dbname in sample_psql.eex · 22d483d4
  link0ff authored Dec 16, 2018
  
  22d483d4
- Upgrade to Phoenix 1.4 · f672555a
  href authored Dec 16, 2018
  
  f672555a
- Add more Mix task tests in relay_test.exs and uploads_test.exs. · 7c235b88
  link0ff authored Dec 16, 2018
```
Rename test/tasks/user.exs to test/tasks/user_test.exs.
```
  7c235b88
- Merge branch 'netbsd-script' into 'develop' · 8fadc1b6
  scarlett authored Dec 16, 2018
```
Add an rc.d script for NetBSD.

See merge request pleroma/pleroma!558
```
  8fadc1b6
- Simplify the NetBSD rc script. · 4b40e418
  scarlett authored Dec 16, 2018
  
  4b40e418
- Add an rc.d script for NetBSD. · 9d3eda19
  scarlett authored Dec 16, 2018
  
  9d3eda19
- Merge branch 'develop' into 'develop' · 41e3401c
  Haelwenn authored Dec 16, 2018
```
Added init file for OpenBSD

See merge request pleroma/pleroma!549
```
  41e3401c
- Merge branch 'fix/masto-put-settings' into 'develop' · 28478a9c
  eal authored Dec 16, 2018
```
Mastodon API: Fix PUT /api/web/settings

See merge request pleroma/pleroma!557
```
  28478a9c
- Mastodon API: Fix PUT /api/web/settings · 4c783e35
  eal authored Dec 16, 2018
  
  4c783e35
- Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop' · 8b279aca
  eal authored Dec 16, 2018
```
Enable unsecure cookies by default in dev.exs

See merge request pleroma/pleroma!556
```
  8b279aca
- Enable unsecure cookies by default in dev.exs · 7c522f38
  Rin Toshaka authored Dec 16, 2018
  
  7c522f38
- Rename captcha_test.ex to exs · 2e72d49e
  vaartis authored Dec 16, 2018
  
  2e72d49e
- Add tests for Mix tasks · 36f1af23
  link0ff authored Dec 16, 2018
  
  36f1af23
15 Dec, 2018 8 commits
- Update/add OpenBSD config files · 75f2177d
  nonlinear authored Dec 15, 2018
  
  75f2177d
- Fix style · c859cd1d
  vaartis authored Dec 15, 2018
  
  c859cd1d
- Add a test for kocaptcha · 5f96c2d2
  vaartis authored Dec 15, 2018
  
  5f96c2d2
- Replace HTTPoison with Tesla for kocaptha · 8d55a549
  vaartis authored Dec 15, 2018
  
  8d55a549
- Add a captcha mock for tests · e8537208
  vaartis authored Dec 15, 2018
  
  e8537208
- Add captcha documentation to config.md · 98e10c0d
  vaartis authored Dec 15, 2018
  
  98e10c0d
- Formatting fixes · 23549d39
  vaartis authored Dec 15, 2018
  
  23549d39
- Separate captcha implementation into a behaviour and use it · b5518da9
  vaartis authored Dec 15, 2018
  
  b5518da9