Thibaut Girka 11cc2e099a Merge branch 'master' into glitch-soc/merge-master ... Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss		2018-05-25 18:59:02 +02:00
..
actions	Introduce flat layout to contexts reducer (#7150)	2018-05-25 18:46:28 +02:00
components	Use real container width in MediaGallery srcSet (#7571)	2018-05-21 16:04:01 +02:00
containers	Open video modal on public UI (#7469)	2018-05-13 13:48:14 +02:00
features	Introduce flat layout to contexts reducer (#7150)	2018-05-25 18:46:28 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-23 16:05:19 +02:00
middleware	…
reducers	Introduce flat layout to contexts reducer (#7150)	2018-05-25 18:46:28 +02:00
selectors	…
service_worker	Unescape HTML entities in rich web push notifications in web UI (#7569)	2018-05-21 16:00:56 +02:00
storage	Cache media only when storage can be freed (#7547)	2018-05-19 19:22:11 +02:00
store	…
utils	Fix images resized in browser getting cropped (#7514)	2018-05-16 16:24:16 +02:00
.gitkeep	…
api.js	…
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	…
initial_state.js	…
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	…
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	…