mastodon/app/javascript/mastodon
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
actions Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
components Fix composer not getting focus after reply confirmation dialog (#9602) 2018-12-21 18:52:41 +01:00
containers Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
middleware
reducers Split out is_changing_upload from is_submitting (#9536) 2018-12-16 21:17:56 +01:00
selectors Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
service_worker Fix a problem about generating an url of notifications (#8758) 2018-09-24 05:45:58 +02:00
storage Cache media only when storage can be freed (#7547) 2018-05-19 19:22:11 +02:00
store
utils Resize images by area instead of fixed dimensions (#8083) 2018-07-28 03:33:00 +02:00
api.js
base_polyfills.js
common.js Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
is_mobile.js
link_header.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Use randomized setTimeout when fallback-polling and re-add since_id (#7522) 2018-05-18 02:32:35 +02:00
test_setup.js
uuid.js