Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		2019-10-10 17:26:08 +02:00
..
actions	Fix performance of home feed regeneration (#12084)	2019-10-06 22:11:17 +02:00
components	Fix media editing modal changing dimensions when image loads (#12131)	2019-10-10 05:21:38 +02:00
containers	Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)	2019-09-29 21:46:05 +02:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
locales	Merge tag 'v3.0.0' into glitch-soc/merge-upstream	2019-10-04 19:49:43 +02:00
middleware	Add missing rejection handling for Promises (#7008)	2018-04-02 14:51:02 +02:00
reducers	Fix delete conversation action not being reflected in web UI (#12030)	2019-10-01 04:54:17 +02:00
selectors	Add special alert for throttled requests (#11677)	2019-08-27 16:50:39 +02:00
service_worker	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
storage	Cache media only when storage can be freed (#7547)	2018-05-19 19:22:11 +02:00
store	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
utils	Do not add margin light when opening modal on mobile (#11830)	2019-09-29 14:30:58 +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	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
common.js	Improve the public hashtag page (#9831)	2019-01-17 14:06:08 +01:00
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	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
main.js
performance.js
ready.js
rtl.js	Exclude URLs from text analysis (#11759)	2019-09-04 22:30:49 +02:00
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	2019-06-29 18:32:06 +02:00
settings.js	Implement tag auto-completion by history (#6621)	2018-03-04 20:27:25 +01:00
stream.js	Improve streaming server security (#10818)	2019-05-24 15:21:42 +02:00
test_setup.js
uuid.js