glitchier-soc

History

Thibaut Girka 83dc54c487 Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		4 years ago
..
account/components	Change “hide/show boosts from …” menu to be hidden when the account is muted (#13748 )	5 years ago
account_gallery	Add noopener and/or noreferrer (#12202 )	5 years ago
account_timeline	Add “account timeline” filter category (#12918 )	5 years ago
audio	Add tooltips to audio/video player buttons (#13203 )	5 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	5 years ago
direct_timeline	Improve toot clicking areas (#13327 )	5 years ago
directory	Fix unfollow confirmations in account directory (#12922 )	5 years ago
domain_blocks	Change the string "hidden" to "blocked" in WebUI (#13221 )	5 years ago
emoji	Improve rendering of emoji which do not contrast with background (#13772 )	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 WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445 )	5 years ago
following	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445 )	5 years ago
generic_not_found	Fix performance of home feed regeneration (#12084 )	5 years ago
getting_started	Fix frontend crash when deleting announcements (#13312 )	5 years ago
hashtag_timeline	Fix local streaming of hashtag timelines (#13827 )	5 years ago
home_timeline	Change how unread announcements are handled (#13020 )	5 years ago
introduction	change "finish tutorial" text to "finish toot-orial" (#9905 )	6 years ago
keyboard_shortcuts	Add hotkey for opening media files (#12498 )	5 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	Fix scroll to top in single column UI (#11463 )	5 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	Add follow_request notification type (#12198 )	5 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	Hide sensitive preview cards with blurhash (#13985 )	5 years ago
ui	Fix unsent toot confirmation dialog not popping up in single column (#13888 )	5 years ago
video	Fix expanded video player issues (#13541 )	5 years ago