Merge branch 'master' into hotfixes

This commit is contained in:
Shawn A
2018-09-20 12:15:44 -05:00
4 changed files with 20 additions and 7 deletions
+17 -4
View File
@@ -1,5 +1,7 @@
## PLEASE TRY DEVELOPMENT BRANCH before submitting bugs on release or master, in case they were already fixed. ##
## POST SERIAL OUTPUT !
Issues without basic info will be ignored or closed!
Please fill the info fields, it helps to get you faster support ;)
@@ -15,13 +17,24 @@ https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/debugging.rst
### Basic Infos
#### Hardware
WiFimanager Branch/Release: Development
**WiFimanager Branch/Release:**
- [ ] Master
- [ ] Development
Esp8266/Esp32:
**Esp8266/Esp32:**
- [ ] ESP8266
- [ ] ESP32
Hardware: ESP-12e, esp01, esp25
**Hardware: ESP-12e, esp01, esp25**
- [ ] ESP01
- [ ] ESP12 E/F/S (nodemcu, wemos, feather)
- [ ] Other
Core Version: 2.4.0, staging
**ESP Core Version: 2.4.0, staging**
- [ ] 2.3.0
- [ ] 2.4.0
- [ ] staging (master/dev)
### Description
+1 -1
View File
@@ -22,7 +22,7 @@ extern "C" {
#include "user_interface.h"
}
const char HTTP_HEAD[] PROGMEM = "<!DOCTYPE html><html lang=\"en\"><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/><title>{v}</title>";
const char HTTP_HEAD[] PROGMEM = "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"UTF-8\" name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/><title>{v}</title>";
const char HTTP_STYLE[] PROGMEM = "<style>.c{text-align: center;} div,input{padding:5px;font-size:1em;} input{width:95%;} body{text-align: center;font-family:verdana;} button{border:0;border-radius:0.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;} .q{float: right;width: 64px;text-align: right;} .l{background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAALVBMVEX///8EBwfBwsLw8PAzNjaCg4NTVVUjJiZDRUUUFxdiZGSho6OSk5Pg4eFydHTCjaf3AAAAZElEQVQ4je2NSw7AIAhEBamKn97/uMXEGBvozkWb9C2Zx4xzWykBhFAeYp9gkLyZE0zIMno9n4g19hmdY39scwqVkOXaxph0ZCXQcqxSpgQpONa59wkRDOL93eAXvimwlbPbwwVAegLS1HGfZAAAAABJRU5ErkJggg==\") no-repeat left center;background-size: 1em;}</style>";
const char HTTP_SCRIPT[] PROGMEM = "<script>function c(l){document.getElementById('s').value=l.innerText||l.textContent;document.getElementById('p').focus();}</script>";
const char HTTP_HEAD_END[] PROGMEM = "</head><body><div style='text-align:left;display:inline-block;min-width:260px;'>";
+1 -1
View File
@@ -9,5 +9,5 @@
},
"frameworks": "arduino",
"platforms": "espressif8266",
"version": "0.12"
"version": "0.14"
}
+1 -1
View File
@@ -1,5 +1,5 @@
name=WiFiManager
version=0.12
version=0.14
author=tzapu
maintainer=tzapu
sentence=ESP8266 WiFi Connection manager with fallback web configuration portal