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 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		5 years ago
..
action_bar.js	Added logout to dropdown menu (#11353)	5 years ago
autosuggest_account.js	…
character_counter.js	…
compose_form.js	Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	5 years ago
emoji_picker_dropdown.js	…
navigation_bar.js	…
poll_button.js	…
poll_form.js	…
privacy_dropdown.js	Improve keyboard navigation in privacy dropdown (#11492)	5 years ago
reply_indicator.js	…
search.js	…
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	…
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	…