mastodon/app/javascript/mastodon
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
..
actions Add special alert for throttled requests (#11677) 2019-08-27 16:50:39 +02:00
components Fix crash when switching back/from mobile layout (#11655) 2019-08-25 15:49:02 +02:00
containers Add audio player (#11644) 2019-08-23 22:38:02 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
middleware
reducers Add special alert for throttled requests (#11677) 2019-08-27 16:50:39 +02:00
selectors Add special alert for throttled requests (#11677) 2019-08-27 16:50:39 +02:00
service_worker
storage
store
utils Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +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
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