pleroma/config
Henry Jameson 4349a83b9d Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (295 commits)
  update frontend
  Fix uploads test.
  fix text field
  don't re-use build
  Fix tagging problems for existing instances.
  Alias Kocaptcha in the test
  Use :ets.match_delete to delete old captchas
  Switch to phoenixframework/phoenix as the needed change is merged.
  Integration tests for mastodon websocket
  Cowboy handler for Mastodon WebSocket
  Support both OAuth token record and token string in UserView
  minutes->seconds_retained in config.md
  Clean captchas up periodically, not schedule it after theyre created
  Fix captcha tests
  Change minutes_retained config to seconds_retained
  Make the hosted kocaptcha the default value
  Add a configurable auto-cleanup for captchas
  More put_view.
  Use bindings dbuser and dbname in sample_psql.eex
  Upgrade to Phoenix 1.4
  ...
2018-12-18 07:32:00 +03:00
..
config.exs Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-12-18 07:32:00 +03:00
config.md minutes->seconds_retained in config.md 2018-12-17 06:41:41 +00:00
custom_emoji.txt customs 2018-08-04 18:23:11 +02:00
dev.exs Enable unsecure cookies by default in dev.exs 2018-12-16 08:49:23 +01:00
emoji.txt customs 2018-08-04 18:23:11 +02:00
prod.exs [#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples. 2018-12-12 17:02:41 +03:00
test.exs Merge branch 'captcha' into 'develop' 2018-12-17 19:45:14 +00:00