Source code for the custom Mastodon (Glitchsoc) instance on berserker.town. https://berserker.town/

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tag: Branch: Tree: 1fbd1fa5c4

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '1fbd1fa5c4'

${ noResults }

microblog/app/javascript/mastodon/features

History

Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.		2 years ago
..
account	Remove Keybase integration (#17045)	3 years ago
account_gallery	Add aliases for WebUI routes that were renamed in #16171 (#16772)	3 years ago
account_timeline	Remove Keybase integration (#17045)	3 years ago
audio	Add hotkeys for audio/video control (#15158)	4 years ago
blocks	Improve modal flow and back button handling (#16499)	3 years ago
bookmarked_statuses	Improve modal flow and back button handling (#16499)	3 years ago
community_timeline	Improve modal flow and back button handling (#16499)	3 years ago
compose	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
direct_timeline	Fix incorrect use of old WebUI paths (#16773)	3 years ago
directory	Change appearance of account cards in web UI (#17689)	2 years ago
domain_blocks	Improve modal flow and back button handling (#16499)	3 years ago
emoji	Fix various typos (#17621)	2 years ago
explore	Change appearance of account cards in web UI (#17689)	2 years ago
favourited_statuses	Improve modal flow and back button handling (#16499)	3 years ago
favourites	Improve modal flow and back button handling (#16499)	3 years ago
follow_recommendations	Fix incorrect use of old WebUI paths (#16773)	3 years ago
follow_requests	Change routing paths to use usernames in web UI (#16171)	3 years ago
followers	Add aliases for WebUI routes that were renamed in #16171 (#16772)	3 years ago
following	Add aliases for WebUI routes that were renamed in #16171 (#16772)	3 years ago
generic_not_found	Fix performance of home feed regeneration (#12084)	5 years ago
getting_started	Remove profile directory link from main navigation panel (#17688)	2 years ago
hashtag_timeline	Fix tag rendering error in hashtag column settings (#17184)	2 years ago
home_timeline	Improve modal flow and back button handling (#16499)	3 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)	5 years ago
list_editor	Disable list title validation button when list title is empty (#11475)	5 years ago
list_timeline	Improve modal flow and back button handling (#16499)	3 years ago
lists	Change routing paths to use usernames in web UI (#16171)	3 years ago
mutes	Improve modal flow and back button handling (#16499)	3 years ago
notifications	Add notifications for new sign-ups (#16953)	2 years ago
picture_in_picture	Fix media modal footer's “external link” not being a link (#17561)	2 years ago
pinned_statuses	Improve modal flow and back button handling (#16499)	3 years ago
public_timeline	Improve modal flow and back button handling (#16499)	3 years ago
reblogs	Improve modal flow and back button handling (#16499)	3 years ago
report	Spelling (#17705)	2 years ago
standalone	Add local only to hashtag timeline (#13502)	4 years ago
status	Chore: Disable menu items for editing statuses in web UI (#17497)	2 years ago
ui	Remove profile directory link from main navigation panel (#17688)	2 years ago
video	Spelling (#17705)	2 years ago