catstodon/app/helpers
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
..
admin Add moderation warnings (#9519) 2018-12-22 20:02:09 +01: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-10-22 17:51:38 +02:00
flashes_helper.rb Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
home_helper.rb Make avatar and headers respect auto_play_gif (#9515) 2018-12-14 20:34:18 +01: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
routing_helper.rb Fallback default thumbnail in instance status API (#6177) 2018-01-04 15:36:55 +01:00
settings_helper.rb Add support for Malayalam in language filter (#9624) 2018-12-25 18:29:30 +01:00
stream_entries_helper.rb Rename hide_followers_count helper to hide_followers_count? 2018-12-28 20:05:47 +01:00