Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-03 15:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,606 Commits 23 Branches 75 Tags
80a28e95bbd140b455bc48dd2b86909486ffa0cd
Commit Graph

165 Commits

Author SHA1 Message Date
Xose Pérez
0e6f2d1ca3 Preliminary support for CSE7766 (Sonoff S31 & Sonoff POW R2) 2018-04-03 20:16:39 +02:00
Xose Pérez
f43137daf0 Prevent pressing ENTER on dbgcmd input to download config 2018-03-31 00:06:32 +02:00
Xose Pérez
448ce2ccb9 Revert "Escape html for weblog in the client" 
This reverts commit 8da3f54e91.
 2018-03-30 23:59:41 +02:00
Xose Pérez
15f2d56fc9 Merge pull request #727 from mcspr/weblog-list 
Escape html for weblog in the client
 2018-03-30 23:05:01 +02:00
Maxim Prokhorov
8da3f54e91 Escape html for weblog in the client 2018-03-26 02:44:20 +03:00
gn0st1c
96dbf9ca3b web 
updated sensor names and types
 2018-03-25 12:07:39 +03:00
Xose Pérez
ec56573741 Option to reset energy count #671 2018-03-24 19:12:20 +01:00
wysiwyng
1bab8e0142 schedules properly fixed 2018-03-21 18:35:38 +01:00
wysiwyng
2348bc684e switch schedules work again 2018-03-20 22:34:49 +01:00
Maxim Prokhorov
e7f7df54b3 using faster "prop" method to find checked element 2018-03-15 11:52:56 +03:00
Maxim Prokhorov
04fa014bde use native selectors for checkboxes 2018-03-15 11:52:47 +03:00
Maxim Prokhorov
5dafb02cbf Resize checkboxes only when they are visible 2018-03-15 11:39:48 +03:00
Xose Pérez
c69d47acd3 Fix codacy issues 2018-03-13 08:40:46 +01:00
Xose Pérez
e46a904ff4 Fix codacy issues 2018-03-12 13:44:36 +01:00
Xose Pérez
2e872525f3 Added button to clear weblog 2018-03-12 11:49:31 +01:00
Xose Pérez
8777d29f7c Merge branch 'pwm-dimmer' of https://github.com/wysiwyng/espurna into wysiwyng-pwm-dimmer 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
	code/html/custom.js
 2018-03-12 11:07:53 +01:00
Xose Pérez
94c57698e0 Merge branch 'ResetRelay' of https://github.com/a-tom-s/espurna into a-tom-s-ResetRelay 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
	code/html/custom.js
 2018-03-11 23:39:52 +01:00
Xose Pérez
5f2b22d063 Fix web debug layout. Added command execution from web UI 2018-03-11 22:09:20 +01:00
Lazar Obradovic
3780eb8f50 Making Codacy happy. 2018-03-10 20:55:20 +01:00
Lazar Obradovic
e1802de827 Add debug console to Status page. 2018-03-10 19:08:25 +01:00
a-tom-s
0bbf7e0453 Bug: MQTT disconnection reaction setting incorrectly displayed on web interface after reboot 2018-03-10 18:58:27 +01:00
a-tom-s
3c853b25f2 Reset relays on MQTT disconnection 
Improved version, where you can set the expected reaction on MQTT disconnection separate for every relay on the SWITCHES page of the web interface
 2018-03-09 21:59:06 +01:00
Xose Pérez
207f58f0e9 Show home assistant configuration in web UI 2018-03-02 20:54:32 +01:00
Xose Pérez
ab07def2d8 Merge pull request #558 from hyteoo/master 
Add Reset to factory settings in admin page of web UI
 2018-02-26 23:38:46 +01:00
wysiwyng
60901f5dfd change single quotes to make codacy happy 2018-02-16 22:14:14 +01:00
wysiwyng
86d1817801 made scheduler templates more beautiful, added checks to not add unsupported schedules 2018-02-16 20:25:03 +01:00
Teo Pavel
a5965b25fe Removed unsaved settings confirmation 
Always confirm Factory reset
 2018-02-15 14:47:21 +02:00
wysiwyng
3827ff37d2 light scheduler working 2018-02-15 02:27:43 +01:00
Teo Pavel
66eabc46f4 changed to LF 2018-02-13 09:30:29 +02:00
Teo Pavel
c3454ad217 Added Reset to factory settings in admin page of web UI 2018-02-13 09:15:42 +02:00
Xose Pérez
4f790688c1 Fix misplaced semicolons 2018-02-09 00:14:31 +01:00
Xose Pérez
a6dbd3ef7b Fix actions without data 2018-02-09 00:08:27 +01:00
Xose Pérez
14509efacb Remove code 2018-02-08 23:45:42 +01:00
Xose Pérez
536211f030 Still refactoring custom.js 2018-02-08 23:01:14 +01:00
Xose Pérez
d0d03a7212 Further refactor in custom.js 2018-02-08 22:19:08 +01:00
Xose Pérez
7a40bef9db Refactor custom.js 2018-02-08 21:47:00 +01:00
Xose Pérez
21fb8d8b59 Small fixes to custom and gulpfile js 2018-02-08 13:00:33 +01:00
Xose Pérez
1d5c856791 Only check first magic byte on file upgrade from webUI 2018-02-06 00:36:46 +01:00
Xose Pérez
8e392d94ae Check upgrade file size and signature in web UI 2018-02-05 21:19:05 +01:00
Xose Pérez
bc76f1d233 Merge branch 'dev' into sensors 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-27 10:03:50 +01:00
Xose Pérez
939a1e184a Added CSS lint to gulp file 2018-01-26 23:54:38 +01:00
Xose Pérez
a0d1d7aa7f Merge branch 'dev' into sensors 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-26 12:07:03 +01:00
Xose Pérez
f7295859c3 Option to disable schedules without delting them (#453) 2018-01-22 16:16:11 +01:00
Xose Pérez
85b195e27d Change CRC error copy in web interface 2018-01-21 20:03:22 +01:00
Xose Pérez
95968a97c3 Improved NTP support 2018-01-21 00:36:06 +01:00
Xose Pérez
3e4313fae3 Updated NTPClientLib. Support for non full hour time offsets (#265) 2018-01-20 01:00:13 +01:00
Xose Pérez
f97419d1a7 Move web third party files to vendor folder 2018-01-16 12:06:10 +01:00
Xose Pérez
cc873a8471 Merged in rhexel/espurna/master (pull request #43) 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-15 21:48:36 +01:00
Xose Pérez
90027eb2ee More js fixes 2018-01-15 20:33:27 +01:00
Xose Pérez
a843698b9f More js fixes 2018-01-15 20:30:22 +01:00