mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-24 04:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/accounts
History
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
..
_follow_button.html.haml Fix follow/unfollow buttons on public profile (fixes #7036) (#7040) 2018-04-08 13:40:22 +02:00
_follow_grid.html.haml Add preference to hide following/followers lists (#7532) 2018-05-18 02:26:51 +02:00
_follow_grid_hidden.html.haml Add preference to hide following/followers lists (#7532) 2018-05-18 02:26:51 +02:00
_grid_card.html.haml Enable custom emojis in profiles (notes, field values, display names) (#7374) 2018-05-06 11:48:51 +02:00
_header.html.haml Fix glitch-style bio fields incorrect HTML escaping in public profiles 2018-05-12 17:45:30 +02:00
_moved_strip.html.haml Enable custom emojis in profiles (notes, field values, display names) (#7374) 2018-05-06 11:48:51 +02:00
_nothing_here.html.haml Localizations for most server-side strings 2016-11-16 00:55:33 +01:00
_og.html.haml Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) 2018-03-18 20:33:07 +01:00
show.html.haml Add alternate for RSS (#7436) 2018-05-10 14:38:19 +02:00