Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-03 06:54:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,393 Commits 23 Branches 75 Tags
9ee7ffa7951fbf345aa95faaf3a0bf9cb8becbbf
Commit Graph

292 Commits

Author SHA1 Message Date
Xose Pérez
2e3664f76f Remove wifi distance calculation 2018-03-01 05:19:19 +01:00
Xose Pérez
59553cad2c Update support for basic RF receivers, using RFBridge web interface to learn codes (#594) 2018-02-28 21:40:14 +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
Xose Pérez
0e767dbffc Allowing hostname breaks on spaces 2018-02-26 23:36:30 +01:00
Xose Pérez
9a21820692 Change copy from 'Use colorpicker' to 'Use color'. Better hint. (#590) 2018-02-26 22:12:42 +01:00
Xose Pérez
d7af09e769 Added new relay & wifi led mode (#604) 2018-02-26 22:02:46 +01:00
Xose Pérez
cbafa74ddc Option to report power data in kW (#523) 2018-02-26 20:49:08 +01:00
Xose Pérez
da3f7b7055 Option to report energy data in kWh (#523) 2018-02-26 13:56:37 +01:00
Teo Pavel
a5965b25fe Removed unsaved settings confirmation 
Always confirm Factory reset
 2018-02-15 14:47:21 +02: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
ccc1cb73f0 Do not show scheduler tab in Web UI if build without scheduler support (#527) 2018-02-05 22:07:31 +01:00
Xose Pérez
8e392d94ae Check upgrade file size and signature in web UI 2018-02-05 21:19:05 +01:00
Lee Marlow
bd4ffb2940 Two more small changes by @Sanfam 
https://github.com/xoseperez/espurna/pull/510#pullrequestreview-93817068
https://github.com/xoseperez/espurna/pull/510#pullrequestreview-93817150
 2018-02-03 10:17:50 -07:00
Lee Marlow
69d0b74e61 Make some small spelling and grammar fixes. 2018-02-02 10:22:17 -07:00
Xose Pérez
fce0dbd8f6 Checking trailing slash in mqttTopic (#422) 2018-01-29 00:48:25 +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
f60f5d82a2 Added LED_MODE_STATUS 2018-01-27 09:48:46 +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
9b751b0540 Merge branch 'master' into dev 2018-01-24 15:36:18 +01:00
Xose Pérez
fe03c1ee2f Changed references to github 2018-01-24 15:29:33 +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
b6ca687484 Changed 'time offset' for 'time zone' in web UI copy 2018-01-21 00:45:39 +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
Xose Pérez
1d558891b6 Merged in espurna/dev (pull request #46) 
Conflicts:
	code/html/custom.js
 2018-01-15 19:55:02 +01:00
Xose Pérez
ff56e38254 Added hostname and mac placeholders for MQTT base topic 2018-01-15 13:51:46 +01:00
Xose Pérez
56d3b36296 Changed the order of the hostname and version in side menu. Removed unnedded HTML attributes. 2018-01-14 23:59:37 +01:00
Xose Pérez
b7a5c128df Fix webUI layout so signature does not overlay buttons on small screens (#396) 2018-01-14 22:19:04 +01:00
Xose Pérez
c6e62bde36 Fix typo in web UI (#421) 2018-01-14 22:00:51 +01:00
Xose Pérez
2f1d7fdc98 Added hostname to web UI side menu (#404) 2018-01-14 21:15:16 +01:00
Xose Pérez
a5df00b569 Option to disable network scanning (#392, #399). Scan networks from web UI 2018-01-14 13:58:16 +01:00
Rene Hexel
4710cd9703 Merge remote-tracking branch 'xoseperez/dev' into dev 2018-01-13 12:21:29 +10:00
Lazar Obradovic
7969db6e32 try 3 2018-01-12 16:33:03 +01:00
Lazar Obradovic
023f70d203 lintfixes, try1 2018-01-12 15:00:46 +01:00
Xose Pérez
9e593ada12 Fix typo in web UI copy (#394) 2018-01-11 23:44:46 +01:00