11 Commits

Author	SHA1	Message	Date
Lukas Matena	ac501bdf8b	Merge branch 'master' into dev	2020-03-24 21:51:05 +01:00
bubnikv	43c31730b6	Fix of Crash when trying to set up non-existent flashair (#3899) ... fixed a typo in formatting text, throwing an exception.	2020-03-24 10:04:41 +01:00
Lukas Matena	18fd7fa45f	Fixing build against wxWidgets 3.0 ... The wxString saga continues. wxWidgets 3.0 don't have the wxString::FromUTF8(const std::string&) overload, we must use the GUI::from_u8 helper Also wxWidgets 3.0 don't allow to disable wxString->const char* conversion, so calling show_info(wxWindow*, wxString, const char*) was ambiguous Several includes moved around	2020-03-04 10:34:59 +01:00
Lukas Matena	bffd07baa6	Fixed some more warnings	2020-03-03 15:53:26 +01:00
Lukas Matena	4949150313	Fixing wxString::Format encoding mismatches (part 3)	2020-03-03 10:54:17 +01:00
vintagepc	0546aebd0d	Removed stray comment	2020-01-20 11:07:23 -05:00
vintagepc	6c0a4ee7ac	Added directory support to FlashAir upload	2020-01-20 11:07:23 -05:00
bubnikv	eacf1b8334	Clean-up of the "Upload to" code (AstroBox, Duet, FlashAir, OctoPrint)	2020-01-06 10:59:57 +01:00
Enrico Turri	644d7e2cca	Added missing include	2019-11-04 14:28:18 +01:00
Stephan	6c7917aa90	* fix compile error and removed json includes	2019-11-04 12:53:48 +01:00
Stephan Reichhelm	b6eeabf75a	+ add FlashAir support for host upload	2019-11-04 12:53:48 +01:00