catstodon/app/helpers
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
..
admin Redesign admin instances area (#9645) 2019-01-08 13:39:49 +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