NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Administration/UI
History
Morb0 e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
..
AdminRemarks Better notes and bans (#14228) 2023-07-21 13:38:52 +02:00
BanList Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
BanPanel IP ban by default (#18545) 2023-08-01 16:05:14 -05:00
Bwoink Add ahelp typing indicator for admins (#19060) 2023-08-13 18:03:17 -05:00
CustomControls Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
Logs Fix new players added to admin logs always defaulting to selected (#19104) 2023-08-13 20:53:48 -05:00
ManageSolutions Fix solution EUIs (#20033) 2023-09-12 14:35:30 +10:00
Notes Fix editing a watchlist note temporarily making it appear as a low severity note (#19100) 2023-08-14 15:05:47 -06:00
SetOutfit Fix misc commands (#20004) 2023-09-11 15:21:52 +10:00
SpawnExplosion Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
Tabs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
AdminAnnounceWindow.xaml Multiline edit everywhere (#15216) 2023-04-14 12:57:47 -07:00
AdminAnnounceWindow.xaml.cs Multiline edit everywhere (#15216) 2023-04-14 12:57:47 -07:00
AdminMenuWindow.xaml Defibrillator (#15922) 2023-05-03 10:10:19 +10:00
AdminMenuWindow.xaml.cs Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-07-10 07:03:24 +03:00
AdminMenuWindowEui.cs Ensure EUIs close themselves (#15860) 2023-04-29 13:16:24 +10:00
PermissionsEui.cs Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00