masto-fe-standalone/app/javascript/mastodon
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
..
actions Add explanation to mute dialog, refactor and clean up mute/block UI (#11992) 2019-09-29 21:46:05 +02:00
components Add error description and button to copy stack trace to web UI (#12033) 2019-10-01 20:48:49 +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-03 11:10:12 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
middleware
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
storage
store
utils Do not add margin light when opening modal on mobile (#11830) 2019-09-29 14:30:58 +02:00
api.js
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 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
stream.js
test_setup.js
uuid.js