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	2019-08-19 21:49:35 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
middleware
reducers	Change title bar to only show unread notifications (#11572)	2019-08-15 20:28:44 +02:00
selectors	Optimize makeGetStatus (#11211)	2019-06-30 00:12:38 +02:00
service_worker	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
storage
store
utils	Remove WebP support (#11589)	2019-08-17 22:04:15 +02:00
api.js	Do not set CSRF Token when no csrf header (#10383)	2019-03-26 11:13:20 +01:00
base_polyfills.js
common.js
compare_id.js	Add option to disable real-time updates in web UI (#9984)	2019-07-16 16:11:50 +02:00
extra_polyfills.js
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
is_mobile.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	2019-06-29 18:32:06 +02:00
settings.js
stream.js	Improve streaming server security (#10818)	2019-05-24 15:21:42 +02:00
test_setup.js
uuid.js