3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon-docker-playground/app/javascript/mastodon/features/compose/components
History
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
…
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.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
text_icon_button.js
…
upload.js Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
upload_button.js Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
upload_form.js
…
upload_progress.js
…
warning.js
…