* 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
...
* origin/develop: (92 commits)
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
Web.Streamer: Get unauthenticated statuses representation
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
Improved version string
mediaproxy: fix empty url & add some tests
RetryQueue: tiny refractor, add tests
Various runtime configuration fixes
update pleroma frontend
Federator: add retry queue.
activitypub: object view: avoid leaking private details
ostatus controller: respond with AS2 objects instead of activities to notice URIs
tests: federator: fix formatting
activitypub: transmogrifier: make deletes secure
Web.AdminAPI.AdminAPIControllerTest: New Test
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
test/plugs/user_is_admin_plug_test: New test
lib/mix/tasks/relay*: Use a with block
Change Relay from `status` to `{status, message}`
Web.Router: Change right to permission group (except for function names)
...
