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,298 Commits 23 Branches 75 Tags
55ddae8a16ffb9ebd565ffef12c6dfd9be772e13
Commit Graph

269 Commits

Author SHA1 Message Date
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
Xose Pérez
f3421a6a4a Added BSSID, channel, RSSI and distance to status tab 2018-01-10 23:51:26 +01:00
Xose Pérez
006c8f2380 Fix delete last scheduler 2018-01-10 23:51:02 +01:00
Xose Pérez
2e7613af83 Scheduler: web UI layout fixes, allow toggling, change first weeday to Monday, dinamically load relays in dropdown 2018-01-10 22:21:29 +01:00
Xose Pérez
449da5203f Clean up code, stick to conventions in settings naming 2018-01-10 19:24:28 +01:00
Xose Pérez
d64f2916cb Some code fixes and movinig stuff around 2018-01-09 23:53:37 +01:00
Xose Pérez
eee4c47658 Merged in faina09/espurna/dev (pull request #42) 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-09 23:28:21 +01:00
Xose Pérez
9062c70e63 Removed anti-recursion check in Domoticz module 2018-01-09 23:01:46 +01:00
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
Xose Pérez
207726b049 Merge branch 'thingspeak' into dev 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-09 00:23:42 +01:00
Xose Pérez
6035ed8eee Allow MQTT keep alive value of up to 3600s 2018-01-09 00:14:26 +01:00
Xose Pérez
df97cef8d1 Merge branch 'dev' into thingspeak 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-07 16:02:57 +01:00
Xose Pérez
9d6a5727a5 Non SSL version of Thingspeak module 2018-01-07 15:26:29 +01:00
Stefano Cotterli
db408fbf95 Merge remote-tracking branch 'upstream/master' into dev 
# Conflicts:
#	code/espurna/data/index.html.gz
#	code/espurna/static/index.html.gz.h
 2018-01-07 12:47:02 +01:00
Rene Hexel
b83ed58c61 Merge remote-tracking branch 'xoseperez/dev' into dev 2018-01-07 13:52:22 +10:00
Xose Pérez
af805ab045 Update copyright notices 2018-01-07 01:21:23 +01:00
Xose Pérez
ad05448603 Preliminary support for Thingspeak REST API over SSL 2018-01-07 01:18:01 +01:00
Xose Pérez
4624ab9078 Added option to specify MQTT client ID 2018-01-05 13:41:05 +01:00
Ryan Jarvis
46de434674 Fix typo: TOOGLE -> TOGGLE 2018-01-05 09:31:37 +01:00
Xose Pérez
50ee5be3e4 Color synchronisation between different lights via MQTT 2018-01-03 00:07:02 +01:00
Rene Hexel
78272a9bfc Set on switch maxlength to 116 for raw RF codes 2018-01-03 07:56:28 +10:00
Rene Hexel
243aa8d1f5 Add raw support through web interface 2018-01-03 07:55:59 +10:00
Xose Pérez
f06c841639 New LED modes: always ON and always OFF (#348) 2017-12-29 22:57:43 +01:00
Xose Pérez
a45d253a7e Clean HTML layout 2017-12-29 14:12:07 +01:00