David Yip c816701550 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml		2018-05-03 17:23:44 -05:00
..
actions	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
components	Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)	2018-05-03 12:09:11 +02:00
containers	Feature: Direct message from Statuses (#7089)	2018-04-09 17:09:11 +02:00
features	Place emoji picker top if it is closer to the bottom of the viewport (fixes #7277) (#7314)	2018-05-03 10:42:18 +02:00
locales	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
middleware	Add missing rejection handling for Promises (#7008)	2018-04-02 14:51:02 +02:00
reducers	Keep notification when muting_notifications is true (#7311)	2018-05-02 16:14:51 +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
utils	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02: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	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
compare_id.js	Fix comparing id (#7180)	2018-04-18 16:50:19 +02: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	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02: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