Merge branch 'master' into bugs-2797 (4a6123f9) · 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

4a6123f9

Commit 4a6123f9 authored 5 years ago by Evgenii Tagiltsev

Downloads
- Plain Diff

Merge branch 'master' into bugs-2797

parents 6b106b95 ce53ecbd

No related branches found

No related tags found

Loading

Pipeline #1435 passed with stage

in 19 minutes and 59 seconds

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml 2 additions, 1 deletion

CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml 44 additions, 38 deletions

...ardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml 36 additions, 30 deletions

...hboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml 0 additions, 2 deletions

...rdGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml 69 additions, 57 deletions

...creen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml 5 additions, 4 deletions

...screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml 9 additions, 8 deletions

...ardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml 8 additions, 3 deletions

...DashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml 1 addition, 1 deletion

...screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml

with 174 additions and 144 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