Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

2018-09-19 21:46:01 +02:00

..

admin

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

settings

Set up /settings/keyword_mutes. #164.

2017-10-21 14:54:36 -05:00

application_helper.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-26 14:39:16 +02:00

flashes_helper.rb

Clean up flash display in views (#2336)

2017-04-23 04:22:34 +02:00

home_helper.rb

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

instance_helper.rb

Do not default site_title with site_hostname in InstanceHelper (#6624)

2018-03-04 20:29:49 +01:00

jsonld_helper.rb

Improve federated ID validation (#8372)

2018-08-22 20:55:14 +02:00

mailer_helper.rb

HTML e-mails for UserMailer (#6256)

2018-01-16 03:29:11 +01:00

routing_helper.rb

Fallback default thumbnail in instance status API (#6177)

2018-01-04 15:36:55 +01:00

settings_helper.rb

Add Czech language option and locale data (#8594)

2018-09-05 08:50:06 +09:00

stream_entries_helper.rb

Do not show follow button on moved or memorial accounts (#8546)

2018-08-31 20:33:01 +02:00