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 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system		6 years ago
..
action_bar.js	…
autosuggest_account.js	…
character_counter.js	…
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
emoji_picker_dropdown.js	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)	6 years ago
navigation_bar.js	…
poll_button.js	Add UI for creating polls (#10184)	6 years ago
poll_form.js	Add emoji suggestions to CW and poll option fields (#10555)	6 years ago
privacy_dropdown.js	Refactor icons in web UI to use Icon component (#9951)	6 years ago
reply_indicator.js	…
search.js	Minor code cleanup (#10613)	6 years ago
search_results.js	Refactor icons in web UI to use Icon component (#9951)	6 years ago
text_icon_button.js	…
upload.js	Improve image description user experience (#10036)	6 years ago
upload_button.js	Add UI for creating polls (#10184)	6 years ago
upload_form.js	Make the "mark media as sensitive" button more obvious in web UI (#10673)	6 years ago
upload_progress.js	Refactor icons in web UI to use Icon component (#9951)	6 years ago
warning.js	…