Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

2018-09-19 21:46:01 +02: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-09-19 21:46:01 +02: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

Upgrade Babel to version 7.0.0 (#5925)

2018-09-14 17:59:48 +02:00

reply_indicator.js

Upgrade Babel to version 7.0.0 (#5925)

2018-09-14 17:59:48 +02:00

search_results.js

Remove trending hashtags (#7711)

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

search.js

Upgrade Babel to version 7.0.0 (#5925)

2018-09-14 17:59:48 +02:00

text_icon_button.js

Use Class and Property Decorators (#3730)

2017-06-23 19:36:54 +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

Add option to reduce motion (#5393)

2017-10-16 09:36:15 +02:00

upload.js

Upgrade Babel to version 7.0.0 (#5925)

2018-09-14 17:59:48 +02:00

warning.js

Add option to reduce motion (#5393)

2017-10-16 09:36:15 +02:00