1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-02 08:48:39 +09:00
YuruToot/app/javascript/mastodon
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
..
actions Use plaintext value for field value tooltips in web UI (#7388) 2018-05-07 09:30:38 +02:00
components Open video modal on public UI (#7469) 2018-05-13 13:48:14 +02:00
containers Open video modal on public UI (#7469) 2018-05-13 13:48:14 +02:00
features Reword the direct message warning (#7420) 2018-05-16 14:47:11 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-05-16 21:52:38 +02:00
middleware Add missing rejection handling for Promises (#7008) 2018-04-02 14:51:02 +02:00
reducers Fix gap insertion for timeline disconnection (#7363) 2018-05-05 00:54:56 +02:00
selectors Profile redirect notes (#5746) 2017-11-18 19:39:02 +01:00
service_worker Let navigator follow redirect instead that handling redirect in fetch (#7500) 2018-05-16 04:59:44 +02:00
storage Test if navigator.storage.estimate exists before using it (#7504) 2018-05-15 20:15:08 +02:00
store Restore vanilla components 2017-11-17 19:29:16 -08:00
utils Fix images resized in browser getting cropped (#7514) 2018-05-16 16:24:16 +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