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.

Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		3 years ago
..
action_bar.js	Add link to bookmarks in web UI dropdown (#13273)	4 years ago
autosuggest_account.js	…
character_counter.js	…
compose_form.js	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
emoji_picker_dropdown.js	Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003)	4 years ago
navigation_bar.js	Add confirmation modal when logging out from the web app (#11671)	5 years ago
poll_button.js	…
poll_form.js	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
privacy_dropdown.js	fix typo (#15705)	3 years ago
reply_indicator.js	Add “translate” class to other user strings (#15611)	3 years ago
search.js	Scroll into search bar when focus (#12032)	5 years ago
search_results.js	Fix not to show follow button in global suggestion (#16045)	3 years ago
text_icon_button.js	Change icon button styles to make hover/focus states more obvious (#11474)	5 years ago
upload.js	Add media editing modal (#11563)	5 years ago
upload_button.js	Improve wording of the “Add media” button tooltip (#13954)	4 years ago
upload_form.js	Add OCR tool to media editing modal (#11566)	5 years ago
upload_progress.js	Add OCR tool to media editing modal (#11566)	5 years ago
warning.js	…