Commits · master · cellframe / libdap-qt-ui-qml · GitLab

Snippets Groups Projects

Mar 19, 2020
- Merge branch 'develop' into 'master' · dbc8fd8e
  andrey.daragan authored 5 years ago
```
Develop

See merge request !45
```
  dbc8fd8e
- Develop · 13aba51d
  andrey.daragan authored 5 years ago
  
  13aba51d
- Merge branch 'develop' into 'master' · ad19de22
  andrey.daragan authored 5 years ago
```
Develop

See merge request !43
```
  ad19de22
- Develop · 4347dd62
  andrey.daragan authored 5 years ago
  
  4347dd62
Mar 12, 2020
- Merge branch 'develop' · cbd9916d
  andrey.daragan authored 5 years ago
  
  cbd9916d
- Merge branch 'features-2989' into 'develop' · 72f6ca3e
  andrey.daragan authored 5 years ago
```
Features 2989

See merge request !40
```
  72f6ca3e
- [-] Delete debug output · e6c67a10
  tatiana.novikova authored 5 years ago
  
  e6c67a10
- Merge branch 'develop' · 8fedbf33
  andrey.daragan authored 5 years ago
  
  8fedbf33
- Merge branch 'features-2989' into 'develop' · bba9a5c3
  andrey.daragan authored 5 years ago
```
Features 2989

See merge request !39
```
  bba9a5c3
- Features 2989 · 1364f74d
  andrey.daragan authored 5 years ago
  
  1364f74d
- Merge branch 'features-2989' into 'develop' · b6e833c2
  andrey.daragan authored 5 years ago
```
Features 2989

See merge request !38
```
  b6e833c2
- Features 2989 · 326bec3b
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
  
  326bec3b
Mar 03, 2020
- Merge branch 'bugs-3222' into 'develop' · 43c5b227
  andrey.daragan authored 5 years ago
```
Bugs-3222

See merge request !37
```
  43c5b227
- Bugs-3222 · 50f12dfe
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
  
  50f12dfe
Feb 27, 2020
- Merge branch 'develop' · 77eab0b0
  littletux89@gmail.com authored 5 years ago
  
  77eab0b0
Feb 26, 2020
- Merge branch 'features-3034' into 'develop' · 64876e9d
  andrey.daragan authored 5 years ago
```
Features 3034

See merge request !36
```
  64876e9d
- Features 3034 · 105ce279
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
  
  105ce279
Feb 21, 2020
- Merge branch 'revert-bfa83d77' into 'develop' · 8c68a2ae
  andrey.daragan authored 5 years ago
```
Revert "Merge branch 'master' into 'develop'"

See merge request !34
```
  8c68a2ae
- Revert "Merge branch 'master' into 'develop'" · d00c1931
  andrey.daragan authored 5 years ago
```
This reverts merge request !33
```
  d00c1931
- Merge branch 'master' into 'develop' · bfa83d77
  andrey.daragan authored 5 years ago
```
Master

See merge request !33
```
  bfa83d77
- Master · 77cb2829
  andrey.daragan authored 5 years ago
  
  77cb2829
- Merge branch 'develop' · 1d0402c5
  littletux89@gmail.com authored 5 years ago
  
  1d0402c5
Feb 19, 2020
- Merge branch 'features-2994' into 'develop' · 7b447f24
  andrey.daragan authored 5 years ago
```
features-2994

See merge request !30
```
  7b447f24
- [+] Added widget for informational message window. · 1deee6f9
  littletux89@gmail.com authored 5 years ago
  
  1deee6f9
Feb 17, 2020
- Merge branch 'develop' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui-qml into develop · 8be59b39
  littletux89@gmail.com authored 5 years ago
  
  8be59b39
- [*] Changed the import version. · d313fc65
  littletux89@gmail.com authored 5 years ago
  
  d313fc65
- Merge branch 'features-3048' into 'develop' · b96517ee
  andrey.daragan authored 5 years ago
```
Features 3048

See merge request !28
```
  b96517ee
- Features 3048 · 4fd16f35
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
  
  4fd16f35
Feb 15, 2020
- Merge branch 'features-3048' into 'develop' · 678bef1b
  andrey.daragan authored 5 years ago
```
Features 3048

See merge request !27
```
  678bef1b
- Features 3048 · 928c2f3c
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
  
  928c2f3c
Feb 12, 2020
- Merge branch 'features-3048' into 'develop' · 1ec6bce1
  andrey.daragan authored 5 years ago
```
Features 3048

See merge request !26
```
  1ec6bce1
- [*] Change DapText interface and logic · f7d926bc
  andrey.daragan authored 5 years ago
```
[*] Change model handler of ComboBox
```
  f7d926bc
- Merge branch 'features-2607' into 'develop' · 070b8ca9
  andrey.daragan authored 5 years ago
```
features-2607

See merge request !25
```
  070b8ca9
- features-2607 · 6346134e
  andrey.daragan authored 5 years ago
  
  6346134e
- Merge branch 'features-3000' into 'develop' · c28766f7
  andrey.daragan authored 5 years ago
```
[*] Update onEntered event for scroll

See merge request !24
```
  c28766f7
- [*] Update onEntered event for scroll · 52e5a2d1
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
  
  52e5a2d1
Feb 06, 2020
- Merge branch 'features-3048' into 'develop' · ceadb4ef
  andrey.daragan authored 5 years ago
```
Features 3048

See merge request !23
```
  ceadb4ef
- [*] Change DapText interface and logic · 28dda648
  tatiana.novikova authored 5 years ago and andrey.daragan committed 5 years ago
```
[*] Change model handler of ComboBox
```
  28dda648
Feb 01, 2020
- Merge branch 'develop' into features-3005 · 103c3d10
  littletux89@gmail.com authored 5 years ago
  
  103c3d10
- [+] Property added. · f067fa0c
  littletux89@gmail.com authored 5 years ago
  
  f067fa0c