masto-fe-standalone/app/javascript/mastodon
Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master
Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
2020-01-20 15:00:22 +01:00
..
actions Fix 12661 (#12744) 2020-01-02 22:46:42 +01:00
components Change reported media attachments to always be hidden in admin UI (#12879) 2020-01-18 19:50:43 +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-12 15:57:34 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-01-13 13:14:35 +01:00
middleware
reducers Fix 12661 (#12744) 2020-01-02 22:46:42 +01:00
selectors
service_worker Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
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 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
scroll.js
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