mastodon/app/javascript/mastodon
Thibaut Girka e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
2019-02-01 16:12:20 +01:00
..
actions Immediately go back in browser history upon successfully sending toot (#9663) 2018-12-30 18:58:25 +01:00
components Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
containers Upgrade ESLint to v5.x (#9694) 2019-01-02 07:28:53 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-02-01 16:12:20 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
middleware
reducers Fix crash when clearing uninitialized timeline (#9662) 2018-12-30 18:57:39 +01:00
selectors Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
service_worker Hide CWed content in notifications and fix sensitive images without CWs (#9778) 2019-01-11 07:29:17 +00:00
storage Cache media only when storage can be freed (#7547) 2018-05-19 19:22:11 +02:00
store Update dependencies for Node.js (2018-12-31) (#9669) 2018-12-31 18:11:48 +01:00
utils Resize images by area instead of fixed dimensions (#8083) 2018-07-28 03:33:00 +02:00
api.js Update dependencies for Node.js (2018-12-31) (#9669) 2018-12-31 18:11:48 +01:00
base_polyfills.js Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
common.js Improve the public hashtag page (#9831) 2019-01-17 14:06:08 +01:00
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
is_mobile.js
load_polyfills.js Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
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