me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/settings
History
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
..
applications Remove empty strings (#5732) 2017-11-17 10:52:30 +09:00
deletes Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00
exports Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
flavours Don't show skins selector when there's only one (#256) 2018-01-08 16:45:32 -08:00
follower_domains Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
imports Optimize user setting page for mobile browser (#1924) 2017-04-17 10:37:00 +02:00
keyword_mutes Override Action View name inference in settings/keyword_mutes. 2017-10-24 18:40:28 -05:00
migrations Add UI for setting up account migration (#5832) 2017-11-27 22:47:06 +01:00
notifications Add option to block direct messages from people you don't follow (#5669) 2017-11-14 21:12:57 +01:00
preferences Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
profiles Merge remote-tracking branch 'tootsuite/master' 2017-11-27 22:33:26 -06:00
shared 2FA controller cleanup (#2296) 2017-04-22 04:23:17 +02:00
two_factor_authentication Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00
two_factor_authentications Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00