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 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
action_bar.js	Add link to bookmarks in web UI dropdown (#13273)	5 years ago
autosuggest_account.js	Display full username in tooltip on search and autosuggest #7478 (#7920)	7 years ago
character_counter.js	Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)	7 years ago
compose_form.js	Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	6 years ago
emoji_picker_dropdown.js	Fix crash when failing to load emoji picker (#14525)	4 years ago
navigation_bar.js	Add confirmation modal when logging out from the web app (#11671)	5 years ago
poll_button.js	Add UI for creating polls (#10184)	6 years ago
poll_form.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
privacy_dropdown.js	Fix scrolling issues when closing some dropdown menus (#14606)	4 years ago
reply_indicator.js	List attachments in reply indicator and boost modal (#10997)	6 years ago
search.js	Scroll into search bar when focus (#12032)	5 years ago
search_results.js	Add search results pagination to web UI (#11409)	5 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)	5 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	Add option to reduce motion (#5393)	7 years ago