mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2018-12-09	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
2018-12-06	Add profile directory (#9427)	Eugen Rochko
	Fix #5578
2018-10-25	Set @body_classes to admin layout (#9081)	Yamagishi Kazutoshi

2018-05-17	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2018-05-17	Ensure unfilled fields are shown when errors are shown (#7523)	Eugen Rochko
	Fix #7486
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-20	Finalized theme loading and stuff	kibigo!

2017-08-26	authorize-follow-requests-after-unlocking (#4658)	masarakki

2017-08-13	ActivityPub delivery (#4566)	Eugen Rochko
	* Deliver ActivityPub Like * Deliver ActivityPub Undo-Like * Deliver ActivityPub Create/Announce activities * Deliver ActivityPub creates from mentions * Deliver ActivityPub Block/Undo-Block * Deliver ActivityPub Accept/Reject-Follow * Deliver ActivityPub Undo-Follow * Deliver ActivityPub Follow * Deliver ActivityPub Delete activities Incidentally fix #889 * Adjust BatchedRemoveStatusService for ActivityPub * Add tests for ActivityPub workers * Add tests for FollowService * Add tests for FavouriteService, UnfollowService and PostStatusService * Add tests for ReblogService, BlockService, UnblockService, ProcessMentionsService * Add tests for AuthorizeFollowService, RejectFollowService, RemoveStatusService * Add tests for BatchedRemoveStatusService * Deliver updates to a local account to ActivityPub followers * Minor adjustments
2017-04-19	Simplify render in controllers (#2144)	Matt Jankowski

2017-01-28	Update settings to re-use admin layout, one big navigation tree, improve ↵	Eugen Rochko
	settings forms
2016-12-22	Add "locked" flag to accounts, prevent blocked users from following, ↵	Eugen Rochko
	force-unfollow blocked users
2016-12-06	Add filters for suspended accounts	Eugen Rochko

2016-11-30	Per-status control for unlisted mode, also federation for unlisted mode	Eugen Rochko
	Fix #233, fix #268
2016-11-24	Extract filename obfuscation into module	Alyssa Ross

2016-11-23	Rename media to avoid exposing filename (fixes #207)	Andrea Faulds

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-11-15	Fix rubocop issues, introduce usage of frozen literal to improve performance	Eugen Rochko

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