Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.

2020-01-04 23:04:42 +01:00

..

admin

Add ability to filter reports by target account domain (#12154)

2019-11-30 19:53:58 +01:00

settings

Set up /settings/keyword_mutes. #164.

2017-10-21 14:54:36 -05:00

accounts_helper.rb

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

2020-01-04 23:04:42 +01:00

application_helper.rb

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

2019-09-13 18:13:43 +02:00

domain_control_helper.rb

Fix whitelist federation for subdomains (#12435)

2019-11-21 11:35:39 +01:00

flashes_helper.rb

…

home_helper.rb

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

instance_helper.rb

Change OpenGraph description on sign-up page to reflect invite (#11744)

2019-09-03 04:56:54 +02:00

jsonld_helper.rb

Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)

2019-07-28 13:48:43 +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 kn, mr, ur to available locales (#12379)

2019-11-13 23:36:41 +01:00

statuses_helper.rb

Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper (#12545)

2019-12-05 00:50:40 +01:00