Merge branch 'arendst/development' into development

This commit is contained in:
reloxx13 2018-07-07 11:11:41 +02:00
commit 62c2433eea

View File

@ -373,6 +373,8 @@ void StartWebserver(int type, IPAddress ipweb)
WebServer->on("/cs", HandleConsole);
WebServer->on("/ax", HandleAjaxConsoleRefresh);
WebServer->on("/ay", HandleAjaxStatusRefresh);
WebServer->on("/u2", HTTP_OPTIONS, HandlePreflightRequest);
WebServer->on("/cm", HandleHttpCommand);
WebServer->on("/rb", HandleRestart);
#ifndef BE_MINIMAL
WebServer->on("/cn", HandleConfiguration);
@ -397,8 +399,6 @@ void StartWebserver(int type, IPAddress ipweb)
WebServer->on("/sv", HandleSaveSettings);
WebServer->on("/rs", HandleRestoreConfiguration);
WebServer->on("/rt", HandleResetConfiguration);
WebServer->on("/u2", HTTP_OPTIONS, HandlePreflightRequest);
WebServer->on("/cm", HandleHttpCommand);
WebServer->on("/in", HandleInformation);
#ifdef USE_EMULATION
if (EMUL_WEMO == Settings.flag2.emulation) {