me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
History
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
2018-10-01 12:43:20 +02:00
..
account/components Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
account_gallery Add a new preference to always hide all media (#8569) 2018-09-25 05:09:35 +02:00
account_timeline Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
list_timeline Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
pinned_statuses Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
ui Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
video Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00