Commits · 33480f629558b4ee9c0e2f5f9565bc33c31d92bc · Valentin Platzgummer / qgroundcontrol

17 Apr, 2018 1 commit
- Merge pull request #6360 from DonLakeFlyer/UpstreamStableMerge · 33480f62
  Don Gagne authored Apr 17, 2018
```
Upstream stable merge
```
  33480f62
16 Apr, 2018 9 commits
- Merge conflict fix · a76dd63b
  DonLakeFlyer authored Apr 16, 2018
  
  a76dd63b
- Merge pull request #6319 from Rogni/CustomCommandWidget · 08d6ac3a
  Don Gagne authored Apr 16, 2018
```
Added clickable link and ScrollView to CustomCommandWidget
```
  08d6ac3a
- Fix merge conflict · 8b8a55c2
  DonLakeFlyer authored Apr 16, 2018
  
  8b8a55c2
- Merge branch 'Stable_V3.3' of https://github.com/mavlink/qgroundcontrol into UpstreamStableMerge · 56ad8a7c
  DonLakeFlyer authored Apr 16, 2018
  
  56ad8a7c
- Merge pull request #6354 from wingtra/fix/windowsSsl · cafac557
  Don Gagne authored Apr 16, 2018
```
Fix OpenSSL for Windows
```
  cafac557
- Merge pull request #6355 from wingtra/fix/deserializing · f3fbd655
  Don Gagne authored Apr 16, 2018
```
Guard terrain tile from reading beyond the bytearray end
```
  f3fbd655
- Merge pull request #6358 from mavlink/terrainCachedRequest · 96f66569
  Don Gagne authored Apr 16, 2018
```
Separate terrain from tile maps within cached tile request system.
```
  96f66569
- Skip emitting terrainDone on timeout as it will get handled by networkReplyError. · 9420ed44
  Gus Grubba authored Apr 16, 2018
```
Fix typo.
```
  9420ed44
- Separate terrain from tile maps within cached tile request system. · 4eedf9d5
  Gus Grubba authored Apr 16, 2018
  
  4eedf9d5
15 Apr, 2018 5 commits
- Guard terrain tile from reading beyond the bytearray end · 83300003
  birchera authored Apr 15, 2018
  
  83300003
- adding more libraries · cacff0ec
  birchera authored Mar 02, 2018
  
  cacff0ec
- updating the ssl library · 84fd7a5e
  birchera authored Mar 02, 2018
  
  84fd7a5e
- Update mavlink v2.0 submodule Sun Apr 15 00:39:11 UTC 2018 · d7a73b51
  PX4 Jenkins authored Apr 15, 2018
  
  d7a73b51
- Merge pull request #6351 from DonLakeFlyer/WindowClose · 3aa2c507
  Don Gagne authored Apr 14, 2018
```
Back out bad pull: #6155
```
  3aa2c507
14 Apr, 2018 5 commits
- Back out bad pull · 0638c885
  DonLakeFlyer authored Apr 14, 2018
```
Try/Finally causes window to close all the time
```
  0638c885
- Jenkins add Android release build · 23a1c919
  Daniel Agar authored Apr 14, 2018
  
  23a1c919
- Jenkins OSX installer build and archive · 17904eed
  Daniel Agar authored Apr 14, 2018
  
  17904eed
- Jenkins update to linux and android docker 2018-04-14 · 32716b43
  Daniel Agar authored Apr 14, 2018
  
  32716b43
- Update PX4 Firmware metadata Sat Apr 14 00:37:06 EDT 2018 · 3728a25d
  PX4 Jenkins authored Apr 14, 2018
  
  3728a25d
12 Apr, 2018 4 commits
- moved visible check from textOutput to container · b01216ce
  mak authored Apr 12, 2018
  
  b01216ce
- Revert "moved visible check from textOutput to container" · c4a4aca6
  mak authored Apr 12, 2018
```
This reverts commit 7e6588f6.
```
  c4a4aca6
- moved visible check from textOutput to container · 7e6588f6
  mak authored Apr 12, 2018
  
  7e6588f6
- Merge pull request #6341 from DonLakeFlyer/LinkReadBytes · b4f4085c
  Don Gagne authored Apr 11, 2018
```
Link read/write: Better guarding against crashes
```
  b4f4085c
11 Apr, 2018 10 commits
- Merge pull request #6340 from DonLakeFlyer/LogTerrain · 7ecfdf16
  Don Gagne authored Apr 11, 2018
```
More logging in terrain, more work on log output to file
```
  7ecfdf16
- Better guarding against crashes · ed2f294c
  DonLakeFlyer authored Apr 11, 2018
  
  ed2f294c
- Better console log to file support · 1e3db639
  Don Gagne authored Apr 11, 2018
  
  1e3db639
- More log output · 671a615a
  Don Gagne authored Apr 11, 2018
  
  671a615a
- Merge pull request #6339 from DonLakeFlyer/LogShutdownCrash · 27de23be
  Don Gagne authored Apr 11, 2018
```
Fix crash from bad toolbox reference during shutdown
```
  27de23be
- Fix crash from bad toolbox reference during shutdown · 8b7f0358
  DonLakeFlyer authored Apr 11, 2018
  
  8b7f0358
- Merge pull request #6336 from DonLakeFlyer/LogOutput · c4478240
  Don Gagne authored Apr 11, 2018
```
Allow logging console output to file from command line
```
  c4478240
- Release build fixes · 8e83e199
  DonLakeFlyer authored Apr 11, 2018
  
  8e83e199
- Allow logging console output to file from command line · bc319fa4
  DonLakeFlyer authored Apr 11, 2018
  
  bc319fa4
- Merge pull request #6334 from DonLakeFlyer/FactValueSlider · 928ad194
  Don Gagne authored Apr 11, 2018
```
New FactValueSlider control
```
  928ad194
10 Apr, 2018 6 commits
- New FactValueSlider control · f50391d9
  DonLakeFlyer authored Apr 10, 2018
  
  f50391d9
- Merge pull request #6327 from DonLakeFlyer/MobileTileImportExport · f0b9e8cb
  Don Gagne authored Apr 10, 2018
```
Allow map tile import/export on mobile
```
  f0b9e8cb
- Merge pull request #6332 from DonLakeFlyer/WPPositionFromVehicle · e992a0d0
  Don Gagne authored Apr 10, 2018
```
Plan/Edit Position: Change position to vehicle position
```
  e992a0d0
- set flickableDirection as VerticalFlick · 732b0e0e
  mak authored Apr 10, 2018
  
  732b0e0e
- Change position to vehicle position · 27aa9098
  Don Gagne authored Apr 10, 2018
  
  27aa9098
- Merge pull request #6331 from DonLakeFlyer/TerrainCrashGuard · 6d2c04e2
  Don Gagne authored Apr 10, 2018
```
Guard against crash in terrain code
```
  6d2c04e2