Commits · 1199449496d22ad6a654e2025e3cbfadfb4ccbbe · DapCash / DapCash Wallet

Jan 16, 2020

Features 2959 · 11994494
andrey.daragan authored 5 years ago

11994494
Merge branch 'bugs-2893' into 'develop' · 1b3266f1
andrey.daragan authored 5 years ago
```
Bugs 2893

See merge request cellframe/cellframe-dashboard!83
```
1b3266f1

Merge branch 'develop' into bugs-2893 · eb4154e1

littletux89@gmail.com authored 5 years ago

# Conflicts:
#	CellFrameDashboardGUI/qml.qrc
#	CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
#	libdap-qt-ui-qml

eb4154e1

Merge branch 'features-2961' into 'develop' · 040d5ecb
andrey.daragan authored 5 years ago
```
[+] Added a console tab.

See merge request cellframe/cellframe-dashboard!82
```
040d5ecb
[+] Added a console tab. · 43c84e2c
andrey.daragan authored 5 years ago

43c84e2c

Jan 15, 2020
- Merge branch 'feature-2842' into 'develop' · cfbb96aa
  andrey.daragan authored 5 years ago
```
[+] Changed the rules for placing elements in the event widget.

See merge request !80
```
  cfbb96aa
- [+] Changed the rules for placing elements in the event widget. · 7feaa20b
  andrey.daragan authored 5 years ago
  
  7feaa20b
- Merge branch 'feature-2842' into 'develop' · c9866469
  andrey.daragan authored 5 years ago
```
Feature 2842

See merge request !78
```
  c9866469
- Feature 2842 · cce54805
  konstantin.kukharenko authored 5 years ago and andrey.daragan committed 5 years ago
  
  cce54805
- Merge branch 'features-2603' into 'develop' · 733b0359
  andrey.daragan authored 5 years ago
```
Features 2603

See merge request cellframe/cellframe-dashboard!79
```
  733b0359
- Features 2603 · 18bc1564
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
  
  18bc1564
Jan 14, 2020
- Merge branch 'features-2949' into 'develop' · 98b897fa
  andrey.daragan authored 5 years ago
```
Features 2949

See merge request cellframe/cellframe-dashboard!77
```
  98b897fa
- Features 2949 · 5ac5fab7
  andrey.daragan authored 5 years ago
  
  5ac5fab7
Jan 13, 2020
- [+] Signal processing added. · e8f8fb8a
  littletux89@gmail.com authored 5 years ago
  
  e8f8fb8a
Jan 08, 2020
- [+] Changed code. · d03d4073
  Andrey Daragan authored 5 years ago
  
  d03d4073
- [+] Added process. · f9f0d28f
  littletux89@gmail.com authored 5 years ago
  
  f9f0d28f
Jan 04, 2020
- [*] Сommand registration algorithm has been improved. · ca965490
  Andrey Daragan authored 5 years ago
  
  ca965490
- [+] Moved the design of the right panel to restore access to the wallet with... · 1998bc20
  Andrey Daragan authored 5 years ago
```
[+] Moved the design of the right panel to restore access to the wallet with the introduction of design changes.
```
  1998bc20
- [*] Git bugs fixed. · 718c405d
  Andrey Daragan authored 5 years ago
  
  718c405d
Jan 03, 2020
- Merge branch 'bugs-2893' into 'develop' · 878270d5
  andrey.daragan authored 5 years ago
```
Bugs 2893

See merge request cellframe/cellframe-dashboard!75
```
  878270d5
- Bugs 2893 · 88edf70e
  andrey.daragan authored 5 years ago
  
  88edf70e
- [+] Modified the right wallet creation panel. · 8e97b5e0
  littletux89@gmail.com authored 5 years ago
  
  8e97b5e0
- [*] The right pane is set by default. · 4b7295d1
  Andrey Daragan authored 5 years ago
  
  4b7295d1
- Merge branch 'develop' into bugs-2893 · 56b2a51e
  Andrey Daragan authored 5 years ago
```
# Conflicts:
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
```
  56b2a51e
- [*] Made edits. · f4bfd6c0
  Andrey Daragan authored 5 years ago
  
  f4bfd6c0
- Merge branch 'feature-2894' into 'develop' · 3c5a3889
  andrey.daragan authored 5 years ago
```
[*]Edit property

See merge request cellframe/cellframe-dashboard!74
```
  3c5a3889
- [*]Edit property · d212bf0f
  konstantin.kukharenko authored 5 years ago and andrey.daragan committed 5 years ago
  
  d212bf0f
- [+] Partially implemented design. · cecadd45
  Andrey Daragan authored 5 years ago
  
  cecadd45
Jan 02, 2020
- [+] Added right panel widgets for the dashboard screen. · d4a4b261
  littletux89@gmail.com authored 5 years ago
  
  d4a4b261
- Merge branch 'features-2872' into 'develop' · 7755dd9d
  andrey.daragan authored 5 years ago
```
Features - 2872

See merge request cellframe/cellframe-dashboard!73
```
  7755dd9d
- [*] Turn the library branch over to develop. · e5c743de
  littletux89@gmail.com authored 5 years ago
  
  e5c743de
- Merge branch 'develop' into features-2872 · f8e79df5
  littletux89@gmail.com authored 5 years ago
```
# Conflicts:
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
```
  f8e79df5
Dec 31, 2019
- Merge branch 'features-2871' into 'develop' · a51c9c11
  andrey.daragan authored 5 years ago
```
Features 2871

See merge request cellframe/cellframe-dashboard!72
```
  a51c9c11
- Features 2871 · f2b2ac4d
  andrey.daragan authored 5 years ago
  
  f2b2ac4d
Dec 28, 2019
- [+] Partially moved widgets from the master branch. · 3d146049
  littletux89@gmail.com authored 5 years ago
  
  3d146049
Dec 27, 2019
- Merge branch 'bugs-2870' into 'develop' · 0ab71046
  andrey.daragan authored 5 years ago
```
Bugs 2870

See merge request cellframe/cellframe-dashboard!71
```
  0ab71046
- Bugs 2870 · 4c87b2e1
  andrey.daragan authored 5 years ago
  
  4c87b2e1
- Merge branch 'bugs-2864' into 'develop' · 5930ad6c
  andrey.daragan authored 5 years ago
```
[*] Cleared qml code.

See merge request !70
```
  5930ad6c
- [*] Cleared qml code. · c00d17ad
  Andrey Daragan authored 5 years ago
  
  c00d17ad
Dec 26, 2019
- [+] Improved frontend structure. · 9581fd7e
  littletux89@gmail.com authored 5 years ago
  
  9581fd7e