Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline

2019-10-10 17:26:08 +02:00

..

direct_controller.rb

Remove deprecated REST API GET /api/v1/timelines/direct (#11212)

2019-07-05 02:14:56 +02:00

home_controller.rb

Fix performance of home feed regeneration (#12084)

2019-10-06 22:11:17 +02:00

list_controller.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

public_controller.rb

Change /api/v1/timelines/public to require auth when public preview is off (#11802)

2019-09-13 16:03:46 +02:00

tag_controller.rb

Fix tagged param not being normalized before querying tags (#10249)

2019-03-13 13:02:13 +01:00