Mastodon

History

Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json

2019-08-19 21:49:35 +02:00

actions

Add indicator of unread content to window title when web UI is out of focus (#11560 )

2019-08-13 12:22:16 +02:00

components

Fix hidden statuses losing focus (#11208 )

2019-08-19 19:00:33 +02:00

containers

Add trends to public pages sidebar (#11594 )

2019-08-18 14:55:32 +02:00

features

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