namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon/features
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
..
account/components Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
account_gallery Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
account_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
blocks Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
community_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
direct_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
domain_blocks Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
emoji Skip VS15 (Emoji textual presentation). (#8553) 2018-09-01 19:42:02 +02:00
favourited_statuses Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
favourites Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
follow_requests Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
followers Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
following Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
hashtag_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
home_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
keyboard_shortcuts Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
list_editor Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
list_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
lists Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
mutes Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
notifications Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
pinned_statuses Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
public_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
reblogs Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
report Add missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00
standalone Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
status Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
ui Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
video Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00