mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2018-08-01	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
2018-07-29	Fix size/dimension values in avatar/header hint localizations (#8088)	Eugen Rochko

2018-07-28	Redesign public profiles and toots (#8068)	Eugen Rochko

2018-05-10	Merge branch 'master' into glitch-soc/master	Thibaut Girka
	Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-07	Bot nameplates (#7391)	Eugen Rochko
	* Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues
2018-04-14	Merge remote-tracking branch 'origin/master' into gs-master	David Yip
	Conflicts: db/schema.rb
2018-04-14	Add bio fields (#6645)	Eugen Rochko
	* 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
2017-11-27	Merge remote-tracking branch 'tootsuite/master'	David Yip

2017-11-27	Add UI for setting up account migration (#5832)	Eugen Rochko

2017-09-28	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	Ondřej Hruška

2017-09-11	Reset preview image if avatar/header image selection was cancelled (#4893)	unarist

2017-07-22	Merge that good fresh upstream shit	beatrix-bitrot

2017-07-21	Fix #3220 - Show avatar/header on edit profile page (#4288)	Eugen Rochko

2017-06-26	update bio length to 500	beatrix-bitrot

2017-05-18	Fix character counter not updating for bio (#3101)	Eugen Rochko

2017-05-13	feat(count): Just yml count syntax to provide different rule for 1 (#2685)	Stephen Burgess
	Update all translation forms that use this "counter" element.
2017-05-08	Prevent selection of unacceptable Content-Type files (#2910)	Yamagishi Kazutoshi
	* Prevent selection of unacceptable Content-Type files * replace hard code * media_attachments accept content-types in initial state
2017-05-08	Added haml-lint and fix warnings (#2773)	yhirano
	* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
2017-04-21	Display remaining characters when editing display name and bio (#2219)	Sebastian Morr

2017-01-28	Update settings to re-use admin layout, one big navigation tree, improve ↵	Eugen Rochko
	settings forms
2016-12-22	Follow call on locked account creates follow request instead	Eugen Rochko
	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	Add "locked" flag to accounts, prevent blocked users from following, ↵	Eugen Rochko
	force-unfollow blocked users
2016-11-30	Per-status control for unlisted mode, also federation for unlisted mode	Eugen Rochko
	Fix #233, fix #268
2016-11-21	Local accounts can control "silenced" attribute which removes them from ↵	Eugen Rochko
	public timeline
2016-11-15	Adding some localizations	Eugen Rochko

2016-10-18	Improving all forms	Eugen Rochko

2016-10-14	E-mail preferences page	Eugen Rochko