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

Conflicts:
	config/locales/simple_form.ja.yml

2018-05-19 22:41:10 +02:00

..

admin

Improvements to toots display in admin view (#7452)

2018-05-12 17:44:15 +02:00

settings

Set up /settings/keyword_mutes. #164.

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

application_helper.rb

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

flashes_helper.rb

…

home_helper.rb

…

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

Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)

2018-05-12 16:48:32 +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 Slovene language (#7475)

2018-05-14 12:52:25 +02:00

stream_entries_helper.rb

Fix double-encoding of display name in title and e-mails (#7534)

2018-05-18 15:56:57 +02:00