Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		2019-06-26 23:19:22 +02:00
..
actions	Apply filters to poll options (#11174)	2019-06-25 14:45:14 +02:00
components	Add option to disable blurhash previews (#11188)	2019-06-26 19:33:04 +02:00
containers	Add confirm modal for unboosting toots (#10287)	2019-05-09 22:39:26 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
middleware
reducers	Fix “mark as sensitive” not being used in delete & redraft (#10980)	2019-06-06 13:04:34 +02:00
selectors	Completely hide toots matched by “irreversible” filters even if they got to the client (#11113)	2019-06-18 18:23:08 +02:00
service_worker	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
storage
store	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
utils	Add WebP support (#9879)	2019-02-02 12:25:04 +01: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	Improve the public hashtag page (#9831)	2019-01-17 14:06:08 +01:00
compare_id.js
extra_polyfills.js
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
is_mobile.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js	Improve streaming server security (#10818)	2019-05-24 15:21:42 +02:00
test_setup.js
uuid.js