68 commits

Author	SHA1	Message	Date
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	2017-09-28 09:12:17 +02:00
unarist	47d48fed8d	Reset preview image if avatar/header image selection was cancelled (#4893)	2017-09-11 16:19:54 +02:00
beatrix-bitrot	984d2d4cb6	Merge that good fresh upstream shit	2017-07-22 01:16:53 +00:00
Eugen Rochko	7bf7ed6123	Fix #3220 - Show avatar/header on edit profile page (#4288)	2017-07-21 05:28:51 +02:00
beatrix-bitrot	c0a665865e	update bio length to 500	2017-06-26 02:18:52 +00:00
Eugen Rochko	76449df903	Fix character counter not updating for bio (#3101)	2017-05-18 00:38:18 +02:00
Stephen Burgess	4bd0488a77	feat(count): Just yml count syntax to provide different rule for 1 (#2685) ... Update all translation forms that use this "counter" element.	2017-05-13 17:13:17 +02:00
Yamagishi Kazutoshi	459bbfa4b2	Prevent selection of unacceptable Content-Type files (#2910) ... * Prevent selection of unacceptable Content-Type files * replace hard code * media_attachments accept content-types in initial state	2017-05-08 16:49:53 +02:00
yhirano	48594b18e6	Added haml-lint and fix warnings (#2773) ... * add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint	2017-05-08 03:35:25 +02:00
Sebastian Morr	74c474a652	Display remaining characters when editing display name and bio (#2219)	2017-04-21 18:17:21 +02:00
Eugen Rochko	f4bc9620a9	Update settings to re-use admin layout, one big navigation tree, improve settings forms	2017-01-28 03:56:10 +01:00
Eugen Rochko	b891a81008	Follow call on locked account creates follow request instead ... Reflect "requested" relationship in API and UI Reflect inability of private posts to be reblogged in the UI Disable Webfinger for locked accounts	2016-12-22 23:03:57 +01:00
Eugen Rochko	2d2154ba75	Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users	2016-12-22 21:34:19 +01:00
Eugen Rochko	14bd46946d	Per-status control for unlisted mode, also federation for unlisted mode ... Fix #233, fix #268	2016-11-30 21:34:59 +01:00
Eugen Rochko	1788164352	Local accounts can control "silenced" attribute which removes them from public timeline	2016-11-21 23:06:41 +01:00
Eugen Rochko	3ce6ac0ce2	Adding some localizations	2016-11-15 23:02:57 +01:00
Eugen Rochko	43df35213e	Improving all forms	2016-10-18 16:37:15 +02:00
Eugen Rochko	7a6d95f70c	E-mail preferences page	2016-10-14 02:28:49 +02:00

Renamed from app/views/settings/show.html.haml (Browse further)