David Yip 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.		2018-04-08 19:05:02 -05:00
..
actions	Free stroage if it is exceeding disk quota (#7061)	2018-04-08 13:32:39 +02:00
components	Ignore AbortError when cancelled sharing (#6978)	2018-03-31 13:16:38 +02:00
containers	retrieve custom emoji list via API instead of before page load (#7047)	2018-04-04 22:25:34 +02:00
features	Hide search from Compose on mobile devices (#7077)	2018-04-08 18:25:08 +02:00
locales	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-08 19:05:02 -05:00
middleware	Add missing rejection handling for Promises (#7008)	2018-04-02 14:51:02 +02:00
reducers	retrieve custom emoji list via API instead of before page load (#7047)	2018-04-04 22:25:34 +02:00
selectors	Profile redirect notes (#5746)	2017-11-18 19:39:02 +01:00
service_worker	Free stroage if it is exceeding disk quota (#7061)	2018-04-08 13:32:39 +02:00
storage	Free stroage if it is exceeding disk quota (#7061)	2018-04-08 13:32:39 +02:00
store	Restore vanilla components	2017-11-17 19:29:16 -08:00
.gitkeep	Replace sprockets/browserify with Webpack (#2617)	2017-05-03 02:04:16 +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	Add polyfill for Object.values (#6697)	2018-03-08 13:07:25 +01:00
extra_polyfills.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
initial_state.js	When search enabled, display hint in search popout (#6593)	2018-03-02 06:02:42 +01:00
is_mobile.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
link_header.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
load_polyfills.js	Add polyfill for Object.values (#6697)	2018-03-08 13:07:25 +01:00
main.js	bug fix (WebPush does not work) (#6120)	2017-12-28 16:20:34 +01:00
performance.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
ready.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
rtl.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
scroll.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
settings.js	Implement tag auto-completion by history (#6621)	2018-03-04 20:27:25 +01:00
stream.js	Allow clients to fetch statuses made while they were offline (#6876)	2018-03-24 15:25:15 +01:00
test_setup.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
uuid.js	Restore vanilla components	2017-11-17 19:29:16 -08:00