You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 72c454e2b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.		7 years ago
..
actions	Add media timeline (#6631)	7 years ago
components	Use real container width in MediaGallery srcSet (#7571)	7 years ago
containers	Open video modal on public UI (#7469)	7 years ago
features	Add exact attribute to WrappedRoute for community timeline (#7572)	7 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
middleware	Add missing rejection handling for Promises (#7008)	7 years ago
reducers	Skip pagination logic for pinned account timelines in reducer (#7540)	7 years ago
selectors	Profile redirect notes (#5746)	7 years ago
service_worker	Unescape HTML entities in rich web push notifications in web UI (#7569)	7 years ago
storage	Cache media only when storage can be freed (#7547)	7 years ago
store	Restore vanilla components	7 years ago
utils	Fix images resized in browser getting cropped (#7514)	7 years ago
.gitkeep	Replace sprockets/browserify with Webpack (#2617)	8 years ago
api.js	Refactor /api/web APIs to use the centralized axios instance (#6223)	7 years ago
base_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
compare_id.js	Fix comparing id (#7180)	7 years ago
extra_polyfills.js	Restore vanilla components	7 years ago
initial_state.js	When search enabled, display hint in search popout (#6593)	7 years ago
is_mobile.js	Restore vanilla components	7 years ago
link_header.js	Restore vanilla components	7 years ago
load_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
main.js	bug fix (WebPush does not work) (#6120)	7 years ago
performance.js	Restore vanilla components	7 years ago
ready.js	Restore vanilla components	7 years ago
rtl.js	Restore vanilla components	7 years ago
scroll.js	Restore vanilla components	7 years ago
settings.js	Implement tag auto-completion by history (#6621)	7 years ago
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	7 years ago
test_setup.js	Restore vanilla components	7 years ago
uuid.js	Restore vanilla components	7 years ago