13 Commits (a24b954baae33983ca7532a4fcd36eddb335ebdb)

Author	SHA1	Message	Date
Thibaut Girka	61631f4751	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline	5 years ago
Eugen Rochko	538db85d3c	Remove `lang` attribute from individual statuses (#12124) ... Fix #10930	5 years ago
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	5 years ago
ThibG	3babf8464b	Add voters count support (#11917) ... * Add voters count to polls * Add ActivityPub serialization and parsing of voters count * Add support for voters count in WebUI * Move incrementation of voters count out of redis lock * Reword “voters” to “people”	5 years ago
ThibG	b359974d9b	Show user what options they have voted (#11195) ... * Add own_votes field to poll results in REST API Fixes #10679 * Display user votes in WebUI * Update styling * Add vote checkmark to public pages	5 years ago
Thibaut Girka	48b8a1f414	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.	5 years ago
Eugen Rochko	e72bac7576	Fix public page crash due to audio player, fix unpause in audio player (#11652)	5 years ago
Eugen Rochko	4190e31626	Add audio player (#11644)	5 years ago
Thibaut Girka	bca3825c17	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Jeong Arm	6a1f08d29a	Prevent archiving when user set "noindex" (#11421)	5 years ago
Thibaut Girka	249991c498	Merge branch 'master' into glitch-soc/merge-upstream ... 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	5 years ago
Eugen Rochko	63c7fe8e48	Refactor controllers for statuses, accounts, and more (#11249)	5 years ago
Eugen Rochko	b851456139	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago