Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml

2018-08-27 18:09:28 +02:00

..

action_bar.js

Add link to filters in web UI dropdown (#7990)

2018-07-11 00:56:54 +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

…

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

Make dropdown animations respect their placement (#8292)

2018-08-19 17:11:12 +02:00

reply_indicator.js

Fix #8264 - Do not override ctrl/cmd+click. (#8265)

2018-08-18 12:50:32 +02:00

search_results.js

Remove trending hashtags (#7711)

2018-06-04 02:18:18 +02:00

search.js

…

text_icon_button.js

…

upload_button.js

Include MOV in upload button tooltip. (#8480)

2018-08-27 13:05:27 +02:00

upload_form.js

…

upload_progress.js

…

upload.js

Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273)

2018-08-18 19:40:35 +02:00

warning.js

…