24 Commits (8bd7b9b586634de4a21f8346f831ce4a87ad67a4)

Author	SHA1	Message	Date
Thibaut Girka	af504e62ff	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Eugen Rochko	7ff3c849d1	Bot nameplates (#7391) ... * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues	7 years ago
David Yip	9697c6d9f0	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: db/schema.rb	7 years ago
Eugen Rochko	466442b764	Add bio fields (#6645) ... * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	7 years ago
David Yip	bc10a0dced	Merge remote-tracking branch 'tootsuite/master'	7 years ago
Eugen Rochko	55d9abcceb	Add UI for setting up account migration (#5832)	7 years ago
Ondřej Hruška	914c0465b1	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	7 years ago
unarist	b25c112d31	Reset preview image if avatar/header image selection was cancelled (#4893)	7 years ago
beatrix-bitrot	8deb2072ef	Merge that good fresh upstream shit	7 years ago
Eugen Rochko	c35ea3636c	Fix #3220 - Show avatar/header on edit profile page (#4288)	7 years ago
beatrix-bitrot	ecfb516588	update bio length to 500	7 years ago
Eugen Rochko	ae6984de48	Fix character counter not updating for bio (#3101)	8 years ago
Stephen Burgess	095c99fb53	feat(count): Just yml count syntax to provide different rule for 1 (#2685) ... Update all translation forms that use this "counter" element.	8 years ago
Yamagishi Kazutoshi	cd27deb5e3	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	8 years ago
yhirano	cf1f65bf58	Added haml-lint and fix warnings (#2773) ... * add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint	8 years ago
Sebastian Morr	6a85e79583	Display remaining characters when editing display name and bio (#2219)	8 years ago
Eugen Rochko	557de8e24c	Update settings to re-use admin layout, one big navigation tree, improve settings forms	8 years ago
Eugen Rochko	238233440f	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	8 years ago
Eugen Rochko	09a477c782	Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users	8 years ago
Eugen Rochko	8d4ef0b6c3	Per-status control for unlisted mode, also federation for unlisted mode ... Fix #233, fix #268	8 years ago
Eugen Rochko	74df3ba1d7	Local accounts can control "silenced" attribute which removes them from public timeline	8 years ago
Eugen Rochko	0e956910c3	Adding some localizations	8 years ago
Eugen Rochko	be98addccc	Improving all forms	8 years ago
Eugen Rochko	588cb77e9f	E-mail preferences page	8 years ago