diff --git a/DDV_Controller/Makefile b/DDV_Controller/Makefile index 3b3b8eb6..bd52641d 100644 --- a/DDV_Controller/Makefile +++ b/DDV_Controller/Makefile @@ -17,7 +17,7 @@ LIBS = -lssl -lcrypto .PHONY: clean default default: cversion $(OUT) .cpp.o: - $(CC) $(INCLUDES) $(CCFLAGS) $(LIBS) -c $< -o $@ + $(CC) $(INCLUDES) $(CCFLAGS) -c $< -o $@ $(OUT): $(OBJ) $(CC) -o $(OUT) $(OBJ) $(LIBS) clean: diff --git a/server.html b/server.html index 9da3cf56..743cbc33 100644 --- a/server.html +++ b/server.html @@ -510,7 +510,7 @@ $('#config-name').val(settings.settings.config.name); $('#config-version').text('version: ' + (settings.settings.config.version || '')); - $('#config-time').text('time: ' + new Date(settings.settings.config.time).toUTCString() || ''); + $('#config-time').text('time: ' + new Date(settings.settings.config.time*1000).toUTCString() || ''); $('#config-status').text('status: ' + (settings.settings.config.status || '')); }