Xose Pérez 3c21dc3e78 Merge branch 'dev' into light ...

Conflicts:
	code/espurna/config/general.h
	code/espurna/config/hardware.h
	code/espurna/hardware.ino
	code/html/custom.css
	code/html/custom.js

2017-08-18 14:17:20 +02:00

..

images

Cleaner web embedding process

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

checkboxes.css

Cleaner web embedding process

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

checkboxes.js

Replaced slide checkbox images with sprite

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

custom.css

Merge branch 'dev' into light

2017-08-18 14:17:20 +02:00

custom.js

Merge branch 'dev' into light

2017-08-18 14:17:20 +02:00

favicon.ico

Moved web interface to PureCSS

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

grids-responsive-min.css

Moved web interface to PureCSS

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

index.html

Merge branch 'dev' into light

2017-08-18 14:17:20 +02:00

jquery-1.12.3.min.js

Moved web interface to PureCSS

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

jquery.wheelcolorpicker-3.0.2.min.js

MY9291 and color picker

2017-02-24 23:16:51 +01:00

nouislider.min.css

Allow to disable color picker

2017-08-18 11:39:45 +02:00

nouislider.min.js

Allow to disable color picker

2017-08-18 11:39:45 +02:00

pure-min.css

Moved web interface to PureCSS

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

side-menu.css

Moved web interface to PureCSS

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

wheelcolorpicker.css

MY9291 and color picker

2017-02-24 23:16:51 +01:00