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 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		6 years ago
..
actions	When posting in mobile mode, go back to previous history location (#9502)	6 years ago
components	Various fixes to scrollable lists and media gallery (#9501)	6 years ago
containers	Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893)	6 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
middleware	Add missing rejection handling for Promises (#7008)	7 years ago
reducers	Fix timeline pagination in the WebUI (#9516)	6 years ago
selectors	Don't filter own toots (fixes #8289) (#8298)	6 years ago
service_worker	Fix a problem about generating an url of notifications (#8758)	6 years ago
storage	Cache media only when storage can be freed (#7547)	7 years ago
store	Restore vanilla components	7 years ago
utils	Resize images by area instead of fixed dimensions (#8083)	6 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
common.js	Revert Font Awesome 5 upgrade (#8810)	6 years ago
compare_id.js	Fix comparing id (#7180)	7 years ago
extra_polyfills.js	Restore vanilla components	7 years ago
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	6 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