tootlab-mastodon/app/javascript/mastodon/features/compose/components
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
2018-07-09 07:13:59 +02:00
..
action_bar.js Add profile options on compose form (#7789) 2018-06-13 14:44:50 +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-06-15 20:51:39 +02:00
emoji_picker_dropdown.js Rename emoji sheet to avoid caching issue (#7777) 2018-06-10 16:12:47 +02:00
navigation_bar.js Fix "Invalid DOM property `class`" (#7798) 2018-06-14 08:03:07 +02:00
privacy_dropdown.js Dropdowns accessibility (#7318) 2018-05-04 22:13:26 +02:00
reply_indicator.js Fix low-contrasted cancel button of reply indicator (#7300) 2018-05-01 14:02:04 +02:00
search.js When search enabled, display hint in search popout (#6593) 2018-03-02 06:02:42 +01:00
search_results.js Remove trending hashtags (#7711) 2018-06-04 02:18:18 +02:00
text_icon_button.js Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
upload.js Change wording of the “undo” media upload button (fixes #6857) (#7417) 2018-05-11 13:20:31 +02:00
upload_button.js Improve accessibility (part 3) (#4405) 2017-07-28 00:54: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 Add option to reduce motion (#5393) 2017-10-16 09:36:15 +02:00
warning.js Add option to reduce motion (#5393) 2017-10-16 09:36:15 +02:00