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 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.		6 years ago
..
action_bar.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
autosuggest_account.js	…
character_counter.js	…
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
emoji_picker_dropdown.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
navigation_bar.js	…
privacy_dropdown.js	fix: initial state of PrivacyDropdown is should not be null (#9008)	6 years ago
reply_indicator.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
search.js	Revert Font Awesome 5 upgrade (#8810)	6 years ago
search_results.js	Show suggested follows on search screen in mobile layout (#9010)	6 years ago
text_icon_button.js	…
upload.js	Show upload options on click as well as hover (#9074)	6 years ago
upload_button.js	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
upload_form.js	…
upload_progress.js	Revert Font Awesome 5 upgrade (#8810)	6 years ago
warning.js	…