This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript/mastodon
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
..
actions Add announcements (#12662) 2020-01-23 22:00:13 +01:00
components Add announcements (#12662) 2020-01-23 22:00:13 +01:00
containers Summary: fix slowness due to layout thrashing when reloading a large … (#12661) 2019-12-29 05:39:48 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
middleware
reducers Add announcements (#12662) 2020-01-23 22:00:13 +01:00
selectors Add “account timeline” filter category (#12918) 2020-01-23 21:32:00 +01:00
service_worker
storage
store
utils Fix shortNumberFormat to within 3 chars without units (#12706) 2019-12-29 16:59:25 +01:00
api.js
base_polyfills.js
common.js
compare_id.js
extra_polyfills.js fix multiple space (#12655) 2019-12-19 07:39:08 +09:00
initial_state.js
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Add transparent support for EventSource streaming. (#12887) 2020-01-21 18:57:21 +01:00
test_setup.js
uuid.js