Philippe Renon
|
17c9c8d8b0
|
Merge remote-tracking branch 'origin/next' into filnet/telemetry
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro
|
2013-12-07 16:39:19 +01:00 |
|
Corvus Corax
|
2f2cff3dc6
|
uncrustification
|
2013-12-07 15:25:15 +01:00 |
|
Corvus Corax
|
e8150399f6
|
Merge branch 'corvuscorax/onboardlogging' into next OP-56 OPReview-586 OPReview-587 OPReview-585
|
2013-12-07 15:21:10 +01:00 |
|
Fredrik Arvidsson
|
a68c4da62d
|
Disable dragging of icons in the configuration plugin.
|
2013-12-06 18:46:58 +01:00 |
|
Fredrik Arvidsson
|
07c7faa144
|
Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into next
Conflicts:
artwork/PFD/pfd.svg
|
2013-12-03 22:47:12 +01:00 |
|
Fredrik Arvidsson
|
fbea95e817
|
OP-1063 Fixed text
|
2013-12-03 22:03:32 +01:00 |
|
Fredrik Arvidsson
|
336510c3e6
|
OP-771 Added some descriptive text.
OP-1059 Fixed typos.
|
2013-12-03 20:48:40 +01:00 |
|
Philippe Renon
|
035c8afcba
|
OP-963 minor UI tweak to the status bar icon tray margins
|
2013-12-02 23:51:01 +01:00 |
|
Philippe Renon
|
b627b71d0e
|
uncrustification
|
2013-12-02 23:49:03 +01:00 |
|
Philippe Renon
|
37dab0e4fc
|
Merge remote-tracking branch 'origin/next' into filnet/telemetry
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
ground/openpilotgcs/src/plugins/coreplugin/telemetrymonitorwidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
|
2013-12-02 22:54:00 +01:00 |
|
Philippe Renon
|
56c404e778
|
OP-1132 added new openssl-install that downloads and install the required SSL libraries for Windows
the missing SSLEAY32.DLL and LIBEAY32.DLL are copied to GCS bin dir
OpenSSL version 1.0.1e was downloaded from http://slproweb.com/products/Win32OpenSSL.html
|
2013-12-01 23:17:48 +01:00 |
|
Fredrik Arvidsson
|
2fce485e26
|
Merge remote-tracking branch 'origin/patrickh/OP-1118_QComboBox_Focus_issue' into next
|
2013-12-01 10:39:41 +01:00 |
|
Corvus Corax
|
d235a24e23
|
Merge branch 'next' into corvuscorax/onboardlogging
|
2013-11-19 18:49:58 +01:00 |
|
Bertrand Songis
|
9183e2bb20
|
Fix for OP-1099: Hidden icons in Configuration tab
|
2013-11-18 14:10:17 +01:00 |
|
Patrick Huebner
|
42ad960044
|
OP-1109 Fix uninitialised use of m_container in welcomemode
|
2013-11-18 22:43:14 +11:00 |
|
Fredrik Larrson
|
0afbed5995
|
Doh, stupid type in comment, sorry.
|
2013-11-18 20:13:05 +11:00 |
|
Fredrik Larrson
|
d8772c5529
|
Clean this up, so debug DDLs don't hang around in a release and vice versa
|
2013-11-18 20:04:11 +11:00 |
|
Corvus Corax
|
fcc479f5cb
|
more intelligent log interfacing, including flash formatting option
|
2013-11-17 20:14:50 +01:00 |
|
Corvus Corax
|
354ca88cd6
|
Updated UAVObject metadata to include correct flags needed for on board logging
|
2013-11-17 14:00:42 +01:00 |
|
Corvus Corax
|
a0746d87fa
|
Logging facility: logs debug data to logfs and exports it through container UAVObject
|
2013-11-17 02:54:26 +01:00 |
|
Corvus Corax
|
89f7dab2de
|
uncrustification for ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h
|
2013-11-16 17:34:43 +01:00 |
|
Corvus Corax
|
cf5d59a677
|
uncrustification for ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h
|
2013-11-16 17:34:43 +01:00 |
|
Corvus Corax
|
31d4234c79
|
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h
|
2013-11-16 17:34:43 +01:00 |
|
Corvus Corax
|
7420276a06
|
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h
|
2013-11-16 17:34:43 +01:00 |
|
Corvus Corax
|
2582eefaed
|
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
28d79420c1
|
uncrustification for ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
f73e2c1a75
|
uncrustification for ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
0e8f01baa8
|
uncrustification for ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
e7bd28e14c
|
uncrustification for ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
436293dbaf
|
uncrustification for ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
5c6885caf4
|
uncrustification for ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
68a8863fbd
|
uncrustification for ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
406daf316c
|
uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
a21357d8e9
|
uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
2c04a338b4
|
uncrustification for ground/openpilotgcs/src/plugins/scope/scopeplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
cef290ddca
|
uncrustification for ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h
|
2013-11-16 17:34:42 +01:00 |
|
Corvus Corax
|
04b7fbbf35
|
uncrustification for ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
9b5c7e20c3
|
uncrustification for ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
0fd357ae61
|
uncrustification for ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
4babcedfe2
|
uncrustification for ground/openpilotgcs/src/plugins/opmap/opmapplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
55eb581e45
|
uncrustification for ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
df77cd7613
|
uncrustification for ground/openpilotgcs/src/plugins/notify/notifyplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
2cbe028cd5
|
uncrustification for ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
cc04e31b5d
|
uncrustification for ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
bc83fd6ffa
|
uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
3c23b1f464
|
uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
968470037f
|
uncrustification for ground/openpilotgcs/src/plugins/logging/logfile.cpp
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
98d213f1a2
|
uncrustification for ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h
|
2013-11-16 17:34:41 +01:00 |
|
Corvus Corax
|
33616e6af4
|
uncrustification for ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h
|
2013-11-16 17:34:40 +01:00 |
|
Corvus Corax
|
bcc651ddc8
|
uncrustification for ground/openpilotgcs/src/plugins/importexport/importexportplugin.h
|
2013-11-16 17:34:40 +01:00 |
|