Commits · 7755dd9d6b2f2b42707429d68d2ca5ddaecf4a71 · cellframe / cellframe-dashboard · GitLab

Snippets Groups Projects

Jan 02, 2020
- Merge branch 'features-2872' into 'develop' · 7755dd9d
  andrey.daragan authored 5 years ago
```
Features - 2872

See merge request !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 !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 !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
- [*] Functional restored. · 08caf2a3
  Andrey Daragan authored 5 years ago
  
  08caf2a3
- [*] Refactoring. · de7d7f58
  littletux89@gmail.com authored 5 years ago
  
  de7d7f58
Dec 25, 2019
- [*] Made corrections. · 86711d54
  littletux89@gmail.com authored 5 years ago
  
  86711d54
Dec 23, 2019
- [+] Implemented inheritance for desktop and mobile devices. · bbe2bdd1
  littletux89@gmail.com authored 5 years ago
  
  bbe2bdd1
- [*] Fixed item redefinition error. · ff4e6273
  littletux89@gmail.com authored 5 years ago
  
  ff4e6273
- [+] Took out paths to forms in properties. · 258b3a12
  Andrey Daragan authored 5 years ago
  
  258b3a12
Dec 20, 2019
- [+] Modifying the mobile version. · 10b26314
  Andrey Daragan authored 5 years ago
  
  10b26314
Dec 19, 2019
- [+] Added screens for the mobile version. · 9f3313be
  littletux89@gmail.com authored 5 years ago
  
  9f3313be
- [+] The header and widget stackwidget of the right panel. · c34fde1c
  Andrey Daragan authored 5 years ago
  
  c34fde1c
Dec 18, 2019
- [+] Started making forms inheritance algorithm. · 7646a018
  littletux89@gmail.com authored 5 years ago
  
  7646a018
- [+] Refining library widgets. · 664f8361
  Andrey Daragan authored 5 years ago
  
  664f8361
Dec 17, 2019
- [+] Added menu bar. · 82ea64c9
  littletux89@gmail.com authored 5 years ago
  
  82ea64c9
- [+] Added main window. · f3fec511
  Andrey Daragan authored 5 years ago
  
  f3fec511
- [+] Added widgets for tabs. · 5d130eed
  Andrey Daragan authored 5 years ago
  
  5d130eed
Dec 15, 2019
- Merge branch 'bugs-2797' into 'master' · a5b8d454
  andrey.daragan authored 5 years ago
```
Bugs 2797

See merge request !65
```
  a5b8d454
- Merge branch 'master' into bugs-2797 · 06c4263f
  littletux89@gmail.com authored 5 years ago
```
# Conflicts:
#	libdap-qt-ui-qml
```
  06c4263f
- [*] Made changes. · 79e3bf06
  littletux89@gmail.com authored 5 years ago
  
  79e3bf06
- Merge branch 'feature-2624' into 'master' · 1fcce308
  andrey.daragan authored 5 years ago
```
Feature 2624

See merge request !64
```
  1fcce308
- Feature 2624 · f42395b4
  konstantin.kukharenko authored 5 years ago and andrey.daragan committed 5 years ago
  
  f42395b4
Dec 13, 2019
- [*] removed tails · 153a6065
  Evgenii Tagiltsev authored 5 years ago
  
  153a6065
- Merge branch 'master' into bugs-2797 · 6208cdc1
  Evgenii Tagiltsev authored 5 years ago
  
  6208cdc1
- [*] moved slots and signals from DapTransaction to DapServiceController · f50e71a7
  Evgenii Tagiltsev authored 5 years ago
  
  f50e71a7
Dec 12, 2019
- [*] added comments for code · e77ddbb1
  Evgenii Tagiltsev authored 5 years ago
  
  e77ddbb1
- Merge branch 'features-2608' into 'master' · 2c7f7f7a
  andrey.daragan authored 5 years ago
```
Features 2608

See merge request !59
```
  2c7f7f7a
- Merge branch 'master' into bugs-2797 · 4a6123f9
  Evgenii Tagiltsev authored 5 years ago
  
  4a6123f9
- [*] Corrected the code so that it was going to yat 5.9.7. · a66daf77
  littletux89@gmail.com authored 5 years ago
  
  a66daf77
- [*] divided mempool and sending money · 6b106b95
  Evgenii Tagiltsev authored 5 years ago
  
  6b106b95
- Merge branch 'features-2608' into 'master' · ce53ecbd
  andrey.daragan authored 5 years ago
```
Features 2608

See merge request !51
```
  ce53ecbd
- Features 2608 · 6cbfd5f4
  Alexander authored 5 years ago and andrey.daragan committed 5 years ago
  
  6cbfd5f4