Commits · b18f4fec89f2c8cf88fae3f636aaea4923216231 · cellframe / libdap-qt-ui · GitLab

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

Apr 23, 2020
- Merge remote-tracking branch 'origin/features-3489' into release-5.x · b18f4fec
  alexandr.mruchok authored 4 years ago
```
# Conflicts:
#	controls/ScreenOverlaying.cpp
#	controls/ScreenOverlaying.h
```
  b18f4fec
Apr 22, 2020
- Merge branch 'feature-3388' into release-5.x · 3e2bbbcf
  alexandr.mruchok authored 4 years ago
  
  3e2bbbcf
- [+] ScreenOverlaying: mousePressEvent(), acceptBlurEffect();; · c0ea393c
  alexandr.mruchok authored 4 years ago
```
[*] Changed ScreenOverlaying methods;
[+] ScreenOverlaying::clicked()
```
  c0ea393c
- Merge branch 'master' into release-5.x · 89c33d32
  alexandr.mruchok authored 4 years ago
  
  89c33d32
Apr 21, 2020
- [*]Fixed connection of the alignment property · 6b658de7
  konstantin.kukharenko authored 4 years ago
  
  6b658de7
- [+] AdaptiveWidget::connectBtnToSignall() · 9e6fd246
  alexandr.mruchok authored 4 years ago
  
  9e6fd246
- Merge branch 'bugs-3404' into 'master' · a3a63a50
  dmitriy.gerasimov authored 4 years ago
```
bugs-3404 | Fixed ServerComboBox for dashboard

See merge request !36
```
  a3a63a50
- Merge branch 'feature-3354' into release-5.x · 59951f71
  alexandr.mruchok authored 4 years ago
  
  59951f71
- bugs-3404 | Fixed ServerComboBox for dashboard · ae102027
  Danil Martynenko authored 4 years ago
  
  ae102027
Apr 20, 2020
- Merge branch 'features-3257' into 'release-5.x' · 6c74cd93
  Alexandr Mruchok authored 4 years ago
```
Features 3257

See merge request !33
```
  6c74cd93
- Features 3257 · 34e4ba1a
  konstantin.kukharenko authored 4 years ago and Alexandr Mruchok committed 4 years ago
  
  34e4ba1a
- [*] changed Utils::findChild() · 7683574f
  alexandr.mruchok authored 4 years ago
  
  7683574f
Apr 19, 2020
- [*]Edit for release · 5b9b7ebb
  konstantin.kukharenko authored 4 years ago
  
  5b9b7ebb
- Merge branch 'release-5.x' into features-3489 · 9fee29bc
  konstantin.kukharenko authored 4 years ago
  
  9fee29bc
- [*] · ebe15121
  konstantin.kukharenko authored 4 years ago
  
  ebe15121
Apr 18, 2020
- [*] Changed Utils::findChild; · 379f0611
  alexandr.mruchok authored 4 years ago
  
  379f0611
- Merge branch 'master' into release-5.x · bcac7b1e
  alexandr.mruchok authored 4 years ago
```
# Conflicts:
#	controls/CustomPlacementButton.h
```
  bcac7b1e
Apr 17, 2020
- [*] · b69809fa
  konstantin.kukharenko authored 4 years ago
  
  b69809fa
- Merge branch 'release-5.x' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui into feature-3388 · 223cafd6
  konstantin.kukharenko authored 4 years ago
  
  223cafd6
- [*] · ce647b60
  konstantin.kukharenko authored 4 years ago
  
  ce647b60
- Merge branch 'features-3487' into 'release-5.x' · a1d2072e
  Alexandr Mruchok authored 4 years ago
```
Features 3487

See merge request !32
```
  a1d2072e
- Features 3487 · 1a985053
  konstantin.kukharenko authored 4 years ago and Alexandr Mruchok committed 4 years ago
  
  1a985053
- [*] Renamed findObjectChild to findChild · 825de38e
  alexandr.mruchok authored 4 years ago
  
  825de38e
- [+] Utils::findObjectChild() · 469d13a2
  alexandr.mruchok authored 4 years ago
  
  469d13a2
- Merge branch 'features-3455' into 'release-5.x' · 90d54009
  Alexandr Mruchok authored 4 years ago
```
features-3455

See merge request !31
```
  90d54009
Apr 16, 2020
- [*]Edit property shedow · 4b6b2ba7
  konstantin.kukharenko authored 4 years ago
  
  4b6b2ba7
- [*]del some property · 7e0a9d6c
  konstantin.kukharenko authored 4 years ago
  
  7e0a9d6c
- [*]Edit comments · 668cad98
  konstantin.kukharenko authored 4 years ago
  
  668cad98
- Merge branch 'bugs-3437' into 'master' · 7ef936e3
  dmitriy.gerasimov authored 4 years ago
```
bugs-3437 | Fixed tab-focus control

See merge request !30
```
  7ef936e3
Apr 15, 2020
- [*]new overlay · ada3c426
  konstantin.kukharenko authored 4 years ago
  
  ada3c426
- bugs-3437 | Fixed tab-focus control · 66dfd1e3
  Danil Martynenko authored 4 years ago
  
  66dfd1e3
- [*]Reload effect · c0c0f984
  konstantin.kukharenko authored 4 years ago
  
  c0c0f984
Apr 09, 2020
- Merge branch 'develop_old' into develop · 71b9bb73
  alexandr.mruchok authored 4 years ago
  
  71b9bb73
- Merge branch 'features-3351' into develop_old · e32ab3c4
  alexandr.mruchok authored 4 years ago
  
  e32ab3c4
- [*] moved CaptionPolicy to CustomButtonComboBox · c8570516
  alexandr.mruchok authored 4 years ago
```
[*] minorChanges
[-] removed default destructor
```
  c8570516
Apr 05, 2020
- [+]New Widget · a2cdcdfe
  konstantin.kukharenko authored 4 years ago
  
  a2cdcdfe
Apr 04, 2020
- Merge https://gitlab.demlabs.net/cellframe/libdap-qt-ui into feature-3349 · d841a233
  konstantin.kukharenko authored 4 years ago
  
  d841a233
- Merge branch 'features-3349' into feature-3349 · 1e6d835c
  konstantin.kukharenko authored 4 years ago
  
  1e6d835c
- Merge branch 'features-3332' into features-3349 · e0bfbe70
  konstantin.kukharenko authored 4 years ago
  
  e0bfbe70
Apr 03, 2020
- Merge branch 'features-3332' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui into feature-3349 · 1924a536
  konstantin.kukharenko authored 4 years ago
  
  1924a536