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 0fd3f87ea2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
action_bar.js	Add confirmation modal when logging out from the web app (#11671)	5 years ago
autosuggest_account.js	Display full username in tooltip on search and autosuggest #7478 (#7920)	6 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 '64909cf0d988fb09917c41cfbc81b1e9a5132aca' into glitch-soc/merge-upstream	5 years ago
emoji_picker_dropdown.js	Add announcements (#12662)	5 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	Change description of privacy levels to be more intuitive in web UI (#13197)	5 years ago
reply_indicator.js	List attachments in reply indicator and boost modal (#10997)	5 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	Change camera icon to paperclip icon in upload form (#11149)	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