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

Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.

2019-02-26 17:04:44 +01:00

..

admin

Add domain search/filter to the "Federation" (/admin/instances) page (#10071)

2019-02-18 14:59:19 +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

2019-01-13 14:41:06 +01: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

Avoid redundant HTTP request on some error cases (#10115)

2019-02-25 15:54:17 +01:00

routing_helper.rb

Fallback default thumbnail in instance status API (#6177)

2018-01-04 15:36:55 +01:00

settings_helper.rb

I18n: Add language options for Kazakh and Lithuanian (#10104)

2019-02-23 22:20:35 +01:00

stream_entries_helper.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-02-01 16:12:20 +01:00