Merge branch 'develop' into CertificateManager (f28bae23) · Commits · cellframe / cellframe-dashboard · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cellframe-dashboard
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f28bae23

Commit f28bae23 authored 4 years ago by Vladimir Golovchenko

Downloads
- Plain Diff

Merge branch 'develop' into CertificateManager

parents a31c42e8 1773e900

1 merge request!163add Certificate manager

Pipeline #4101 passed with stage

in 23 minutes and 22 seconds

Changes 8
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml 6 additions, 6 deletions

...hboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml 11 additions, 8 deletions

...DashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml 12 additions, 1 deletion

...oardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml 3 additions, 0 deletions

.../screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml 1 addition, 1 deletion

...ard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml 2 additions, 0 deletions

...ktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml 9 additions, 6 deletions

...shboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml 1 addition, 1 deletion

...rameDashboardGUI/screen/desktop/History/DapHistoryTab.qml

with 45 additions and 23 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment