Thibaut Girka 720cb01715 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		2018-12-18 16:55:15 +01:00
..
action_bar.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
autosuggest_account.js	Display full username in tooltip on search and autosuggest #7478 (#7920)	2018-07-01 04:16:13 +02:00
character_counter.js	Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)	2017-07-29 00:06:29 +02:00
compose_form.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
emoji_picker_dropdown.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
navigation_bar.js	Fix "Invalid DOM property class" (#7798)	2018-06-14 08:03:07 +02:00
privacy_dropdown.js	fix: initial state of PrivacyDropdown is should not be null (#9008)	2018-10-19 00:00:19 +02:00
reply_indicator.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
search.js	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
search_results.js	Show suggested follows on search screen in mobile layout (#9010)	2018-10-23 00:08:39 +02:00
text_icon_button.js
upload.js	Show upload options on click as well as hover (#9074)	2018-10-24 18:17:15 +02:00
upload_button.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
upload_form.js	Add ability to specify alternative text for media attachments (#5123)	2017-09-28 15:31:31 +02:00
upload_progress.js	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
warning.js	Add option to reduce motion (#5393)	2017-10-16 09:36:15 +02:00