pleroma/lib
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
..
mix/tasks/pleroma Use bindings dbuser and dbname in sample_psql.eex 2018-12-16 18:25:31 +02:00
pleroma Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-12-18 07:32:00 +03:00
jason_types.ex Format the code. 2018-03-30 15:01:53 +02:00
transports.ex Format the code. 2018-03-30 15:01:53 +02:00
xml_builder.ex Format the code. 2018-03-30 15:01:53 +02:00