mastodon/app/helpers
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -05:00
..
admin Improve report layout (#7188) 2018-04-20 02:28:48 +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 Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +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 el and te (#7332) 2018-05-03 15:54:10 +02:00
stream_entries_helper.rb Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00