Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		2018-11-27 13:23:02 +01:00
..
actions	Fix loading indicator inconsistency (#9252)	2018-11-10 15:04:13 +01:00
components	Only consider mouse move in scrolling on item insertion (#9262)	2018-11-11 23:20:20 +01:00
containers	Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893)	2018-10-05 18:44:44 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
middleware
reducers	Fix race condition causing shallow status with only a "favourited" attribute (#9272)	2018-11-13 14:58:14 +01:00
selectors	Don't filter own toots (fixes #8289) (#8298)	2018-08-19 18:44:18 +02:00
service_worker	Fix a problem about generating an url of notifications (#8758)	2018-09-24 05:45:58 +02:00
storage	Cache media only when storage can be freed (#7547)	2018-05-19 19:22:11 +02:00
store
utils	Resize images by area instead of fixed dimensions (#8083)	2018-07-28 03:33:00 +02:00
api.js
base_polyfills.js	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
common.js	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
compare_id.js	Fix comparing id (#7180)	2018-04-18 16:50:19 +02:00
extra_polyfills.js
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
is_mobile.js
link_header.js
load_polyfills.js	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	2018-05-18 02:32:35 +02:00
test_setup.js
uuid.js