You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/javascript/mastodon
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
8 years ago
..
actions Public profile endorsements (accounts picked by profile owner) (#8146) 8 years ago
components Display replies count in web UI (#8181) 8 years ago
containers Remove protocol handler registration (#8127) 8 years ago
features Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
locales Added endorse strings, fixed footer 'developers' string (#8183) 8 years ago
middleware Add missing rejection handling for Promises (#7008) 8 years ago
reducers Fix crash when clicking “Show more/less for all” when a toot is not visible (#8118) 8 years ago
selectors Make whole-word filter regex consistent between Ruby and JS (#7987) 8 years ago
service_worker Disable service worker media cache and IndexedDB storage (#7932) 8 years ago
storage Cache media only when storage can be freed (#7547) 8 years ago
store
utils Resize images by area instead of fixed dimensions (#8083) 8 years ago
.gitkeep
api.js
base_polyfills.js Refactor resizeImage method (#7236) 8 years ago
common.js Upgrade webpack to version v4.x (#6655) 8 years ago
compare_id.js Fix comparing id (#7180) 8 years ago
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
is_mobile.js
link_header.js
load_polyfills.js Refactor resizeImage method (#7236) 8 years ago
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js Implement tag auto-completion by history (#6621) 8 years ago
stream.js Use randomized setTimeout when fallback-polling and re-add since_id (#7522) 8 years ago
test_setup.js
uuid.js