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 ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
action_bar.js	Add link to bookmarks in web UI dropdown (#13273)	4 years ago
autosuggest_account.js	Display full username in tooltip on search and autosuggest #7478 (#7920)	6 years ago
character_counter.js	…
compose_form.js	Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	5 years ago
emoji_picker_dropdown.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	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)	5 years ago
poll_form.js	Merge branch 'master' into glitch-soc/merge-upstream	4 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)	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	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	…