Commits · 24eb7d80be02844983d8b4e8b0a3b89420278fea · DapCash / DapCash Wallet

Feb 11, 2020

removed junk and removed direct publish call from gitlab-runner. It will be... · 24eb7d80

alexandr.kravchenko authored 5 years ago

removed junk and removed direct publish call from gitlab-runner. It will be the responsibility of chroot-wrapper.sh (Maybe I should rename this script?)

24eb7d80

Feb 10, 2020
- Merge branch 'support-2649' into 'develop' · fa12163f
  dmitriy.gerasimov authored 5 years ago
```
Added build scripts to work with prob

See merge request cellframe/cellframe-dashboard!112
```
  fa12163f
- Added build scripts to work with prob · d11b5f9e
  alexandr.kravchenko authored 5 years ago and dmitriy.gerasimov committed 5 years ago
  
  d11b5f9e
Feb 07, 2020
- Merge branch 'revert-20055ebe' into 'develop' · 881c9167
  andrey.daragan authored 5 years ago
```
Revert "Merge branch 'bugs-3089' into 'develop'"

See merge request cellframe/cellframe-dashboard!111
```
  881c9167
- Revert "Merge branch 'bugs-3089' into 'develop'" · 05a0cd98
  andrey.daragan authored 5 years ago
```
This reverts merge request !110
```
  05a0cd98
- Merge branch 'bugs-3089' into 'develop' · 20055ebe
  andrey.daragan authored 5 years ago
```
Bugs 3089

See merge request cellframe/cellframe-dashboard!110
```
  20055ebe
- [*] Change rules of keyUp and keyDown · 06c0edda
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
```
[+] Add handler for the doubleClick on right history panel
```
  06c0edda
Feb 06, 2020
- Merge branch 'features-3092' into 'develop' · 32de245a
  andrey.daragan authored 5 years ago
```
features-3092

See merge request cellframe/cellframe-dashboard!109
```
  32de245a
- [+] Added a screen design History. · 6d710834
  littletux89@gmail.com authored 5 years ago
  
  6d710834
Feb 05, 2020
- Merge branch 'features-3087' into 'develop' · 1773c58a
  andrey.daragan authored 5 years ago
```
features-3087

See merge request cellframe/cellframe-dashboard!107
```
  1773c58a
- features-3087 · 0ac4d371
  andrey.daragan authored 5 years ago
  
  0ac4d371
- Merge branch 'features-3061' into 'develop' · c2b96ba6
  andrey.daragan authored 5 years ago
```
features-3061

See merge request cellframe/cellframe-dashboard!106
```
  c2b96ba6
Feb 04, 2020
- [+] Added functionality to display the history of trianctions by wallet. · 06f1ed3b
  littletux89@gmail.com authored 5 years ago
  
  06f1ed3b
- Merge branch 'master' into develop · 626a7932
  littletux89@gmail.com authored 5 years ago
  
  626a7932
Feb 03, 2020
- Update README.md · b32c87c2
  alexandr.kravchenko authored 5 years ago
  
  b32c87c2
- [*] Made design changes. · 0a489113
  littletux89@gmail.com authored 5 years ago
  
  0a489113
- [+] New functionality added. · 8e4456b1
  littletux89@gmail.com authored 5 years ago
  
  8e4456b1
Jan 30, 2020

[+] Added code. · 481269b2
littletux89@gmail.com authored 5 years ago

481269b2

Merge branch 'develop' into features-3005 · 8a2fee9b

littletux89@gmail.com authored 5 years ago

# Conflicts:
#	CellFrameDashboardGUI/DapServiceController.cpp
#	CellFrameDashboardGUI/DapServiceController.h
#	CellFrameDashboardGUI/qml.qrc
#	CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
#	CellFrameDashboardService/DapServiceController.cpp
#	CellFrameDashboardService/DapServiceController.h
#	libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
#	libdap-qt-ui-qml

8a2fee9b

[*] Edits made. · d80186f7
littletux89@gmail.com authored 5 years ago

d80186f7
[+] New functionality added. · 34b74415
littletux89@gmail.com authored 5 years ago

34b74415
Merge branch 'features-2959' into 'develop' · 052e3e10
andrey.daragan authored 5 years ago
```
Features 2959

See merge request cellframe/cellframe-dashboard!102
```
052e3e10

[+] Add history limits and append rules · a6a78b95

tatiana.novikova authored 5 years ago and

andrey.daragan committed 5 years ago

[+] Add automatic sending selected by double click command from history
[+] Add using KeyUp and KeyDown to console history navigation
[+] Add DapScrollView to the console ListView

a6a78b95

Jan 29, 2020
- Merge branch 'features-3031' into 'develop' · 961116c5
  andrey.daragan authored 5 years ago
```
Features 3031

See merge request cellframe/cellframe-dashboard!103
```
  961116c5
- Features 3031 · dea8adf1
  andrey.daragan authored 5 years ago
  
  dea8adf1
Jan 28, 2020
- Merge branch 'features-2609' into 'develop' · e5900572
  andrey.daragan authored 5 years ago
```
features-2609

See merge request cellframe/cellframe-dashboard!101
```
  e5900572
- features-2609 · ca0cafd4
  andrey.daragan authored 5 years ago
  
  ca0cafd4
- Merge branch 'features-2609' into 'develop' · 66e2dca9
  andrey.daragan authored 5 years ago
```
features-2609

See merge request cellframe/cellframe-dashboard!100
```
  66e2dca9
- features-2609 · a146c326
  andrey.daragan authored 5 years ago
  
  a146c326
Jan 25, 2020
- Merge branch 'develop' into features-3005 · 0494a354
  littletux89@gmail.com authored 5 years ago
  
  0494a354
Jan 24, 2020
- Merge branch 'feature-2956' into 'develop' · f81179b5
  andrey.daragan authored 5 years ago
```
Added Dashboard form.

See merge request cellframe/cellframe-dashboard!99
```
  f81179b5
- Added Dashboard form. · 12150f31
  Kirill Anisimov authored 5 years ago and andrey.daragan committed 5 years ago
  
  12150f31
- Merge branch 'develop' into features-3005 · 7819fa0c
  littletux89@gmail.com authored 5 years ago
```
# Conflicts:
#	CellFrameDashboardGUI/DapServiceController.cpp
#	CellFrameDashboardGUI/DapServiceController.h
#	CellFrameDashboardService/DapServiceController.cpp
#	CellFrameDashboardService/DapServiceController.h
#	libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
```
  7819fa0c
- Merge branch 'features-3026' into 'develop' · a2553323
  andrey.daragan authored 5 years ago
```
[+] Added a combo box of tokens.

See merge request cellframe/cellframe-dashboard!98
```
  a2553323
- [+] Added a combo box of tokens. · 65bf00a6
  andrey.daragan authored 5 years ago
  
  65bf00a6
- [+] Test implementation of passing your own object in qml. · 1f5249d8
  littletux89@gmail.com authored 5 years ago
  
  1f5249d8
- Merge branch 'features-2997' into 'develop' · 7e77764f
  andrey.daragan authored 5 years ago
```
Features 2997

See merge request cellframe/cellframe-dashboard!97
```
  7e77764f
- Features 2997 · dd48a6c0
  konstantin.kukharenko authored 5 years ago and andrey.daragan committed 5 years ago
  
  dd48a6c0
Jan 23, 2020
- [+] Added commands. · a41908f1
  littletux89@gmail.com authored 5 years ago
  
  a41908f1
- Merge branch 'features-2988' into 'develop' · 54c3316c
  andrey.daragan authored 5 years ago
```
Features 2988

See merge request cellframe/cellframe-dashboard!95
```
  54c3316c