Stefano Cotterli 2d5e14b3a3 Merge remote-tracking branch 'remotes/upstream/dev' into dev ...

# Conflicts:
#	code/espurna/config/version.h
#	code/espurna/data/index.html.gz
#	code/espurna/espurna.ino
#	code/espurna/static/index.html.gz.h
#	code/extra_scripts.py
#	code/html/index.html
#	code/ota.py
#	code/platformio.ini

2018-01-09 22:04:07 +01:00

..

images

Cleaner web embedding process

2017-02-20 23:34:40 +01:00

checkboxes.css

Change MQTT retain flag, QoS and keep alive time from web UI (#321)

2017-12-29 14:06:28 +01:00

checkboxes.js

Replaced slide checkbox images with sprite

2016-10-16 10:35:08 +02:00

custom.css

Merge remote-tracking branch 'upstream/master' into dev

2018-01-07 12:47:02 +01:00

custom.js

Merge remote-tracking branch 'remotes/upstream/dev' into dev

2018-01-09 22:04:07 +01:00

favicon.ico

Moved web interface to PureCSS

2016-08-29 00:50:23 +02:00

index.html

Merge branch 'thingspeak' into dev

2018-01-09 00:23:42 +01:00

jquery-3.2.1.min.js

Update web UI components

2017-10-23 16:50:25 +02:00

jquery.wheelcolorpicker-3.0.3.css

Update web UI components

2017-10-23 16:50:25 +02:00

jquery.wheelcolorpicker-3.0.3.min.js

Update web UI components

2017-10-23 16:50:25 +02:00

pure-1.0.0.min.css

Update web UI components

2017-10-23 16:50:25 +02:00

pure-grids-responsive-1.0.0.min.css

Rename pure.css files

2017-12-25 12:42:37 +01:00

side-menu.css

Update web UI components

2017-10-23 16:50:25 +02:00