Commit Graph
3507 Commits
Author SHA1 Message Date
mhotar 4cc6b6f8aa Merge branch 'next' into mhotar/modelsetup_items
Conflicts:
	radio/src/translations/en.h.txt
	radio/src/translations/fr.h.txt
2014-03-04 22:46:22 +01:00
mhotar 21f2130d13 TR_POTTYPES "None" in cz.h.txt 2014-03-04 22:31:41 +01:00
mhotar b919773b56 TR_POTTYPES "None" was missing in some translations 2014-03-04 22:26:15 +01:00
mhotar b506259d76 Conflicts fix 2014-03-04 21:52:54 +01:00
Kjell Kernen e45410c257 Check for updates dialog now always on top.
The check for downloads dialogs were started asynchonously. This was the reason for the dialog ending up under other windows and behaving strangely since other windows will steal focus as soon as the dialog lets go of it.
2014-03-04 18:05:51 +01:00
Kjell Kernen bb767ca863 Slowing down the close of the download dialog with 2 seconds to avoid unpeasant flashing dialogs. 2014-03-04 17:03:54 +01:00
Bertrand Songis 0b83d9e0d7 Update DONATIONS.txt 2014-03-04 16:42:26 +01:00
Bertrand Songis cd6acebaaa Update DONATIONS.txt 2014-03-04 11:58:13 +01:00
bsongis e0b8e55e73 French translations aligned 2014-03-04 07:28:12 +01:00
mhotar df462447e0 Merge branch 'next' into mhotar/modelsetup_items
Conflicts:
	radio/src/translations.cpp
	radio/src/translations.h
	radio/src/translations/de.h.txt
	radio/src/translations/en.h.txt
	radio/src/translations/fr.h.txt
2014-03-04 02:13:15 +01:00
mhotar 13a2fdfc00 indentations and ifdef corrected 2014-03-03 23:48:49 +01:00
bsongis 9bb64c07ae Align french translations 2014-03-03 22:57:46 +01:00
bsongis 145c741307 Warnings fixed 2014-03-03 15:56:59 +01:00
Bertrand Songis 8a0dc22578 Merge pull request #770 from opentx/bsongis/Issue767_extra_pot
Bsongis/issue767 extra pot
2014-03-03 15:44:59 +01:00
Bertrand Songis 55cea50824 Merge pull request #755 from opentx/bsongis/Issue524_SPORT_GPS
Bsongis/issue524 sport gps
2014-03-03 15:44:45 +01:00
bsongis 88b7374c6c Compilation error 2014-03-03 15:42:13 +01:00
bsongis cdce9b0da7 Merge remote-tracking branch 'origin/next' into
bsongis/Issue524_SPORT_GPS

Conflicts:
	radio/src/telemetry/frsky_sport.cpp
	radio/src/translations/de.h.txt
2014-03-03 15:36:34 +01:00
bsongis c8f1758bc1 Conversion of °C->°F on HDG
Altitude stored as feet in logs when imperial mode chosen
2014-03-03 15:33:26 +01:00
bsongis adf08a59fb Issue #731 fixed - Default mixes/expos created on an empty model 2014-03-03 13:01:17 +01:00
bsongis bf7919bd8d Issue #731 - Conversion issues (Inputs) fixed 2014-03-03 12:24:42 +01:00
Bertrand Songis 5fb301b9e2 Update DONATIONS.txt 2014-03-02 21:43:29 +01:00
bsongis e59ebed474 Issue #534 missing control 2014-03-02 15:44:34 +01:00
bsongis aed219cbd1 EEPROM conversions problems 2014-03-02 14:35:42 +01:00
mhotar 61bb02ceea Thr grouping for Taranis only 2014-03-01 23:32:05 +01:00
bsongis e5cfef711f Vario didn't stop beeping when in sink mode 2014-03-01 22:25:06 +01:00
bsongis cac6314ce1 Issue #767 - Companion part 2014-03-01 22:18:43 +01:00
Bertrand Songis 06e945be67 Update DONATIONS.txt 2014-03-01 21:36:00 +01:00
bsongis 3215346a1b Issue #767 - Extra Pot (S3) support 2014-03-01 18:54:08 +01:00
bsongis f9e6819b37 Ignore list updated 2014-03-01 08:48:42 +01:00
bsongis 35b2346ba8 DE translations 2014-03-01 08:45:06 +01:00
mhotar 83651486f4 Translations updated 2014-03-01 02:08:45 +01:00
mhotar 55ff2e6b5e Throttle label and missing string defs 2014-03-01 01:20:47 +01:00
mhotar 4506328144 Preflight check label and items 2014-03-01 00:25:18 +01:00
bsongis dcb52913a5 Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-28 23:19:01 +01:00
bsongis 09e427d73e Indentation issues 2014-02-28 23:18:21 +01:00
Andre Bernet 4d66fd8061 PPMx were missing in Inputs source list 2014-02-28 15:07:34 +01:00
Andre Bernet 3ab86c90a6 Sky9x support for 16CH input on trainer port (untested) 2014-02-28 13:51:18 +01:00
Andre Bernet c2912eb5e1 French translation fix 2014-02-28 13:18:03 +01:00
Andre Bernet 56cb40dd38 Taranis trainer driver support for 16CH input 2014-02-28 13:07:45 +01:00
Andre Bernet 89970776a6 Merge pull request #737 from opentx/bsongis/spare_values_in_telemetry_and_functions
Bsongis/spare values in telemetry and functions
2014-02-28 12:45:07 +01:00
bsongis da41f43ff4 Merge remote-tracking branch 'origin/next' into
bsongis/spare_values_in_telemetry_and_functions

Conflicts:
	radio/src/translations/fr.h.txt
2014-02-28 12:22:59 +01:00
bsongis f250d381e5 Issue #764 fixed 2014-02-28 12:16:43 +01:00
bsongis c4bff418e3 Issue #762 fixed 2014-02-28 11:58:37 +01:00
bsongis 3692ad0eb0 Merge branch 'bsongis/spare_values_in_telemetry_and_functions' of https://github.com/opentx/opentx into bsongis/spare_values_in_telemetry_and_functions 2014-02-28 11:45:07 +01:00
bsongis 38fd271246 Shift in Telemetry when importing EEPROM < 216 2014-02-28 11:44:02 +01:00
Andre Bernet 2d678b781e Units in all languages 2014-02-28 11:18:38 +01:00
Andre Bernet c6b64a9305 Merge branch 'next' of https://github.com/opentx/opentx into bsongis/Issue524_SPORT_GPS 2014-02-28 11:06:52 +01:00
Andre Bernet 88cba206ff Hide dTE 2014-02-28 10:37:35 +01:00
bsongis d6fefe71c0 Rename continued 2014-02-28 10:12:07 +01:00
bsongis 8d9039532a Search & Replace CUSTOMSW by LOGICALSW 2014-02-28 10:12:07 +01:00