mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2019-08-30	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.
2019-08-30	Change layout of public profile directory to be the same as in web UI (#11705)	Eugen Rochko

2019-07-19	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml
2019-07-07	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` ↵	Eugen Rochko
	(#11247)
2016-09-05	PostStatusService can attach media to status, ProcessFeedService likewise	Eugen Rochko

2016-03-21	Adding Turbolinks, adding status posting form on homepage	Eugen Rochko