You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
actions	Add indicator of unread content to window title when web UI is out of focus (#11560)	5 years ago
components	Fix hidden statuses losing focus (#11208)	5 years ago
containers	Add trends to public pages sidebar (#11594)	5 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
middleware	…
reducers	Change title bar to only show unread notifications (#11572)	5 years ago
selectors	Optimize makeGetStatus (#11211)	5 years ago
service_worker	…
storage	…
store	…
utils	Remove WebP support (#11589)	5 years ago
api.js	…
base_polyfills.js	…
common.js	…
compare_id.js	Add option to disable real-time updates in web UI (#9984)	5 years ago
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
is_mobile.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	5 years ago
settings.js	…
stream.js	Improve streaming server security (#10818)	5 years ago
test_setup.js	…
uuid.js	…