glitchier-soc

History

Thibaut Girka 6fdc4e8d47 Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
account	Add option to be notified when a followed user posts (#13546 )	4 years ago
account_gallery	Change web UI to show empty profile for suspended accounts (#14766 )	4 years ago
account_timeline	Add option to be notified when a followed user posts (#13546 )	4 years ago
audio	Add pop-out player for audio/video in web UI (#14870 )	4 years ago
blocks	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445 )	5 years ago
bookmarked_statuses	Add bookmarks (#7107 )	5 years ago
community_timeline	Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330 )	5 years ago
compose	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
direct_timeline	Freeze scroll position when a dropdown menu is open in the TL (#14271 )	4 years ago
directory	Replace shortNumberFormat with <ShortNumber> (#14061 )	4 years ago
domain_blocks	Change the string "hidden" to "blocked" in WebUI (#13221 )	5 years ago
emoji	Change how CDN_HOST is passed down to make assets build reproducible (#14381 )	4 years ago
favourited_statuses	Fix scroll to top in single column UI (#11463 )	5 years ago
favourites	Code style improvements in JavaScript (#13159 )	5 years ago
follow_requests	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445 )	5 years ago
followers	Fix the conditions for incomplete remote content (#14195 )	4 years ago
following	Fix the conditions for incomplete remote content (#14195 )	4 years ago
generic_not_found	Fix performance of home feed regeneration (#12084 )	5 years ago
getting_started	Change how CDN_HOST is passed down to make assets build reproducible (#14381 )	4 years ago
hashtag_timeline	Fix hashtag column options styling (#14247 )	4 years ago
home_timeline	Change how unread announcements are handled (#13020 )	5 years ago
introduction	Add option to disable swiping motions across the WebUI (#13885 )	4 years ago
keyboard_shortcuts	Add hotkey for toggling content warning composer field (#13987 )	4 years ago
list_adder	Refactor icons in web UI to use Icon component (#9951 )	6 years ago
list_editor	Disable list title validation button when list title is empty (#11475 )	5 years ago
list_timeline	Add configuration option to filter replies in lists (#9205 )	4 years ago
lists	Code style improvements in JavaScript (#13159 )	5 years ago
mutes	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445 )	5 years ago
notifications	Change how missing desktop notifications permission is displayed (#14985 )	4 years ago
picture_in_picture	Add pop-out player for audio/video in web UI (#14870 )	4 years ago
pinned_statuses	Fix scroll to top in single column UI (#11463 )	5 years ago
public_timeline	Add remote only to public timeline (#13504 )	5 years ago
reblogs	Code style improvements in JavaScript (#13159 )	5 years ago
report	Add blurhash (#10630 )	6 years ago
search	Add responsive panels to the single-column layout (#10820 )	6 years ago
standalone	Add local only to hashtag timeline (#13502 )	5 years ago
status	Add pop-out player for audio/video in web UI (#14870 )	4 years ago
ui	Fix strings that could not be translated (#14980 )	4 years ago
video	Add pop-out player for audio/video in web UI (#14870 )	4 years ago