vt-social/app/javascript/mastodon
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
actions Preserve hashtag casing in web UI hashtag history (#8394) 2018-08-23 21:21:15 +02:00
components Fix followers/follows layout issues from #8418 (#8505) 2018-08-29 01:19:58 +02:00
containers Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
middleware Add missing rejection handling for Promises (#7008) 2018-04-02 14:51:02 +02:00
reducers Add aria-label to notifications (#8460) 2018-08-26 17:53:26 +02:00
selectors Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
service_worker Only display web push notifications after API call (fixes #7902) (#8396) 2018-08-23 21:44:27 +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 Refactor /api/web APIs to use the centralized axios instance (#6223) 2018-01-08 20:01:33 +01:00
base_polyfills.js Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
common.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
compare_id.js Fix comparing id (#7180) 2018-04-18 16:50:19 +02:00
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
is_mobile.js
link_header.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 Implement tag auto-completion by history (#6621) 2018-03-04 20:27:25 +01:00
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