nyastodon/app/helpers
David Yip f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
2018-01-28 22:45:17 -06:00
..
admin Fix nil error in log_target_from_history helper (#6173) 2018-01-04 10:56:23 +09:00
settings Set up /settings/keyword_mutes. #164. 2017-10-21 14:54:36 -05:00
application_helper.rb Add direction tags to HTML e-mails for RTL languages (#6373) 2018-01-29 00:22:20 +01:00
flashes_helper.rb Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
home_helper.rb Improve initialState loading 2017-01-09 12:37:53 +01:00
instance_helper.rb Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305) 2018-01-20 03:49:06 +01:00
jsonld_helper.rb Fix bad URL schemes being accepted (#6219) 2018-01-08 05:00:23 +01: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 armenian translations initial commit (#6320) 2018-01-22 05:02:23 +09:00
stream_entries_helper.rb Update status embeds (#4742) 2017-08-30 10:23:43 +02:00