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 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		5 years ago
..
action_bar.js	Added logout to dropdown menu (#11353)	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 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	5 years ago
emoji_picker_dropdown.js	Add categories for custom emojis (#11196)	5 years ago
navigation_bar.js	Add responsive panels to the single-column layout (#10820)	5 years ago
poll_button.js	Add UI for creating polls (#10184)	5 years ago
poll_form.js	Add emoji suggestions to CW and poll option fields (#10555)	5 years ago
privacy_dropdown.js	Fix emoji-button appearing above privacy-dropdown (#11027)	5 years ago
reply_indicator.js	List attachments in reply indicator and boost modal (#10997)	5 years ago
search.js	Fix overlap of emoji button on search popup (#10978)	5 years ago
search_results.js	Add message telling FTS is disabled when no toot can be found because of this (#11112)	5 years ago
text_icon_button.js	Use Class and Property Decorators (#3730)	7 years ago
upload.js	Improve image description user experience (#10036)	5 years ago
upload_button.js	Change camera icon to paperclip icon in upload form (#11149)	5 years ago
upload_form.js	Make the "mark media as sensitive" button more obvious in web UI (#10673)	5 years ago
upload_progress.js	Refactor icons in web UI to use Icon component (#9951)	5 years ago
warning.js	Add option to reduce motion (#5393)	7 years ago