* origin/develop: (53 commits)
tests: add legal boilerplate
mix tasks: add legal boilerplate
add license boilerplate to pleroma core
tests: twitter api: add test proving that peertube videos are correctly handled
twitter api: add "Video" to supported activity types list
tests: twitter api: activity view test: enable tesla mock
twitter api: activity representer: remove peertube hack
tests: mastodon api: add test verifying that peertube videos are correctly rendered
mastodon api: status view: remove obsolete peertube hack
transmogrifier: significantly rework handling of peertube videos, add test
transmogrifier: When it’s a Video move "url" to "attachment"
Implement kaniini's tweaks
Renamed the things
Add documentation
Fix formatting
Implement large thread filter
[#114] Fixed test.
[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation. Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
[#114] Added :user_id component to email confirmation path to improve the security. Added tests for `confirm_email` action.
[#114] Removed flash messages rendering on redirects.
...
* 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
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
