Merge branch 'develop' into features-2872
# Conflicts: # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
Showing
- CellFrameDashboardGUI/CellFrameDashboardGUI.pro 0 additions, 2 deletionsCellFrameDashboardGUI/CellFrameDashboardGUI.pro
- CellFrameDashboardGUI/DapCommandController.cpp 0 additions, 29 deletionsCellFrameDashboardGUI/DapCommandController.cpp
- CellFrameDashboardGUI/DapCommandController.h 0 additions, 36 deletionsCellFrameDashboardGUI/DapCommandController.h
- CellFrameDashboardGUI/DapServiceController.cpp 52 additions, 7 deletionsCellFrameDashboardGUI/DapServiceController.cpp
- CellFrameDashboardGUI/DapServiceController.h 28 additions, 6 deletionsCellFrameDashboardGUI/DapServiceController.h
- CellFrameDashboardService/CellFrameDashboardService.pro 2 additions, 2 deletionsCellFrameDashboardService/CellFrameDashboardService.pro
- CellFrameDashboardService/DapChainDashboardService.cpp.autosave 6 additions, 1 deletion...ameDashboardService/DapChainDashboardService.cpp.autosave
- CellFrameDashboardService/DapServiceController.cpp 39 additions, 0 deletionsCellFrameDashboardService/DapServiceController.cpp
- CellFrameDashboardService/DapServiceController.h 21 additions, 16 deletionsCellFrameDashboardService/DapServiceController.h
- CellFrameDashboardService/main.cpp 3 additions, 6 deletionsCellFrameDashboardService/main.cpp
- DapRPCProtocol/DapRpcService.cpp 7 additions, 2 deletionsDapRPCProtocol/DapRpcService.cpp
- DapRPCProtocol/DapRpcService.h 4 additions, 1 deletionDapRPCProtocol/DapRpcService.h
- DapRPCProtocol/DapRpcServiceProvider.cpp 8 additions, 4 deletionsDapRPCProtocol/DapRpcServiceProvider.cpp
- libCellFrameDashboardCommon/DapLogModel.cpp 0 additions, 115 deletionslibCellFrameDashboardCommon/DapLogModel.cpp
- libCellFrameDashboardCommon/DapLogModel.h 0 additions, 94 deletionslibCellFrameDashboardCommon/DapLogModel.h
- libCellFrameDashboardCommon/Handlers/DapAbstractCommand.cpp 70 additions, 0 deletionslibCellFrameDashboardCommon/Handlers/DapAbstractCommand.cpp
- libCellFrameDashboardCommon/Handlers/DapAbstractCommand.h 85 additions, 0 deletionslibCellFrameDashboardCommon/Handlers/DapAbstractCommand.h
- libCellFrameDashboardCommon/Handlers/DapAddWalletCommand.cpp 55 additions, 0 deletionslibCellFrameDashboardCommon/Handlers/DapAddWalletCommand.cpp
- libCellFrameDashboardCommon/Handlers/DapAddWalletCommand.h 42 additions, 0 deletionslibCellFrameDashboardCommon/Handlers/DapAddWalletCommand.h
- libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri 6 additions, 4 deletionslibCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
Loading
Please register or sign in to comment