Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Pull Request] 仪表盘自组网完成-UI优化-库界面支持拖拽安装kxp插件, 一些其它更新 #181

Merged
merged 8 commits into from
Nov 30, 2022
Merged

[Pull Request] 仪表盘自组网完成-UI优化-库界面支持拖拽安装kxp插件, 一些其它更新 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29e3876
📄Doc: add'.vscode/'in .gitignore
StardustSeemsInk Nov 25, 2022
efe4f92
💾 📝 Feat, Chore: 新增的用于同时启动的辅助工具
Dynesshely Nov 25, 2022
742c093
🔧 Fix: 编码问题
Dynesshely Nov 25, 2022
914ddfd
💾 Feat: 自组网竣工! Crequency/KitX#176.8
Dynesshely Nov 25, 2022
c6dc612
💾 Feat: Merge remote-tracking branch 'origin/dev=main' into dev=main
Dynesshely Nov 25, 2022
f95f7d2
💾 Feat: 添加对主控地址及端口的显示
Dynesshely Nov 26, 2022
09a760c
💾 📝 Feat, Chore: Update Submodules
Dynesshely Nov 30, 2022
81bf846
💾 Feat: Crequency/KitX-Dashboard#2 Merged
Dynesshely Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,3 +351,4 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/
.vscode/
2 changes: 1 addition & 1 deletion KitX Dashboard
Open in desktop
Submodule KitX Dashboard updated 11 files
+9 −1 Data/AppConfig.cs
+1 −1 KitX Dashboard.csproj
+20 −0 Services/DevicesManager.cs
+29 −6 Services/DevicesServer.cs
+34 −14 Services/EventHandlers.cs
+2 −0 Services/WebManager.cs
+8 −0 ViewModels/Pages/Controls/DeviceCardViewModel.cs
+2 −1 Views/Pages/Controls/DeviceCard.axaml
+1 −1 Views/Pages/Controls/Settings_Performence.axaml
+1 −1 Views/Pages/RepoPage.axaml
+44 −0 Views/Pages/RepoPage.axaml.cs
2 changes: 1 addition & 1 deletion KitX Installer
Open in desktop
Submodule KitX Installer updated 1 files
+1 −1 Installer for Linux/install-kitx.sh
2 changes: 1 addition & 1 deletion KitX Loaders
Open in desktop
Submodule KitX Loaders updated 1 files
+2 −1 KitX.Loader.WPF.Core/App.xaml.cs
2 changes: 1 addition & 1 deletion KitX Rules
Open in desktop
Submodule KitX Rules updated from 6122e1 to 140489
2 changes: 1 addition & 1 deletion KitX Test
Open in desktop
Submodule KitX Test updated from 463446 to 6ac26d
2 changes: 1 addition & 1 deletion KitX Tools
Open in desktop
Submodule KitX Tools updated from 8a56e1 to ac8dbe
15 changes: 15 additions & 0 deletions KitX.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Website", "KitX Websit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX Website", "KitX Website\KitX Website.csproj", "{B303BF2A-229C-4FB3-A5CA-282673C9FD18}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KitX.SameTime.Start", "KitX Tools\KitX.SameTime.Start\KitX.SameTime.Start.csproj", "{C52823D3-0909-4BEA-B9A5-60033DE233CB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -413,6 +415,18 @@ Global
{B303BF2A-229C-4FB3-A5CA-282673C9FD18}.Release|x64.Build.0 = Release|Any CPU
{B303BF2A-229C-4FB3-A5CA-282673C9FD18}.Release|x86.ActiveCfg = Release|Any CPU
{B303BF2A-229C-4FB3-A5CA-282673C9FD18}.Release|x86.Build.0 = Release|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Debug|x64.ActiveCfg = Debug|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Debug|x64.Build.0 = Debug|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Debug|x86.ActiveCfg = Debug|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Debug|x86.Build.0 = Debug|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Release|Any CPU.Build.0 = Release|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Release|x64.ActiveCfg = Release|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Release|x64.Build.0 = Release|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Release|x86.ActiveCfg = Release|Any CPU
{C52823D3-0909-4BEA-B9A5-60033DE233CB}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -452,6 +466,7 @@ Global
{AA4F23E5-BA8F-4D8A-B1FD-ACAF358E82AC} = {81AFB1A2-B2A3-4ED7-B946-935A8A105960}
{2BF2E4C8-46A2-4F5B-AE6B-B3460BAE3A08} = {81AFB1A2-B2A3-4ED7-B946-935A8A105960}
{B303BF2A-229C-4FB3-A5CA-282673C9FD18} = {A4F56EE3-4930-481C-A91B-EAE3AAC73659}
{C52823D3-0909-4BEA-B9A5-60033DE233CB} = {CF9D7D6C-CE00-4D88-AD1C-B084BB35CA99}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {09BBC227-F41B-4D10-9E38-0EEE07ED17BC}
Expand Down