mastodon/app/javascript/mastodon
Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-07 12:28:59 +01:00
..
actions Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
components Fix media open hotkey (#12546) 2019-12-05 00:50:51 +01:00
containers Fix account dropdown not opening due to regression from #12377 (#12430) 2019-11-20 00:56:22 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
middleware
reducers Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
selectors Add special alert for throttled requests (#11677) 2019-08-27 16:50:39 +02:00
service_worker Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
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-10-27 12:14:01 +01:00
is_mobile.js
load_keyboard_extensions.js fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
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 upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543) 2019-12-04 20:45:49 +09:00
test_setup.js
uuid.js