Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.		2019-03-16 14:14:20 +01:00
..
actions	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
components	Show disappointed elephant if web UI crashes (#10275)	2019-03-15 05:35:45 +01:00
containers	Show disappointed elephant if web UI crashes (#10275)	2019-03-15 05:35:45 +01:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
middleware
reducers	Add UI for enabling/disabling poll notifications (#10255)	2019-03-13 19:29:54 +01:00
selectors
service_worker	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
storage
store
utils
api.js
base_polyfills.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js
is_mobile.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js	Fix public timelines being broken by new toots when they are not mounted (#10131)	2019-03-07 22:17:52 +01:00
test_setup.js
uuid.js