mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-18 08:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
401 Commits 4 Branches 99 Tags
6bf1bbc8a89173f6da610ea860237e90e22b9eae
Commit Graph

289 Commits

Author SHA1 Message Date
bwssystems
1a402e425e Merged msbg array fix. 
Fixed #558 for null pointer on startup without habridge.conf
 2017-03-18 17:26:25 -05:00
Monica Goward
7d4f953c89 Array iteration bugfix 2017-03-18 17:32:43 +00:00
Admin
bb0ffeb570 Added device data value passing, off state change for brigthness, hex 
intensity values, updatd ui to cgo back to device touched after
edit/add.
 2017-03-17 16:53:21 -05:00
Admin
0c4292bfd7 Update scrollable table and try implement scroll to row. 2017-03-16 17:05:40 -05:00
Admin
0083c5854f Merge branch 'master' into NewConnectors3.1 
Conflicts:
	src/main/java/com/bwssystems/HABridge/BridgeSettings.java
 2017-03-16 15:18:39 -05:00
Admin
c13b9bd8f4 upate for editing with fields that need not be saved when empty. 2017-03-16 14:57:21 -05:00
Monica Goward
c9c6d6e66d Cleanup json->pojo mapping 2017-03-16 13:13:53 +00:00
Monica Goward
c8b1827150 Fixes post merge to comply with updated js code json 2017-03-16 12:59:43 +00:00
Monica Goward
d7d83e866e Post latest merge from master 2017-03-16 11:55:02 +00:00
Admin
fb24e9d1a3 Updated whitelist handling to save users when created. Also, added 
default test user for habridge UI. Made change state to be validated
against whitelist.
 2017-03-13 16:37:42 -05:00
BWS Systems
08c87eb3aa Merge pull request #324 from CrEaK/master 
Added a optional webhook for harmony-activity changes
 2017-03-10 08:59:14 -06:00
BWS Systems
7da4bf13e0 Merge pull request #492 from hobbe/patch-1 
Use relative path in URLs
 2017-03-10 08:58:43 -06:00
Admin
ed8fc95782 Fixed HA group support. Added JSON check for new devices. Added Device 
level filtering. Added decimal percentage.
 2017-03-08 14:59:04 -06:00
Admin
f6cb41b880 Fixed hex handling of intensity. Added handling for \n, \t, \r and so 
forth in tcp,udp and mqtt.
 2017-03-07 16:36:25 -06:00
Admin
a578aa9fd8 Update TCP handling to save connection. Added debug to http handler. 2017-03-06 16:30:23 -06:00
Admin
7b97bd75ae fixed uniqueid on copy 2017-03-03 16:25:45 -06:00
Admin
4de14217b4 Fixed null http handler issue for close 2017-03-02 16:36:56 -06:00
Olivier B
3a8c64aac6 Merge branch 'patch-1' into master 2017-03-01 14:13:53 +01:00
Admin
745986f08f Finished Domoticz updates 2017-02-24 15:45:45 -06:00
Admin
5e59b33ed7 Fixed hex conversions. Added checks for formats. Finished Bulk add 
issues. Fixing Domoticz home and handler  for user/pwd.
 2017-02-23 16:47:06 -06:00
Olivier B
c45cb24b20 Use relative path in URLs 
This change allows to use HA-Bridge web app from a sub-folder of the web server, eg. http://example.com/habridge.
 2017-02-23 21:22:47 +01:00
Admin
adc34ddaa6 Fix issue with LIFx bcast being null. Continue fixing bulk add. 2017-02-22 16:28:31 -06:00
Monica Goward
88f34f3221 Update to use HABridge HTTPHandler 2017-02-22 21:44:17 +00:00
Admin
afd1af4094 Merge remote-tracking branch 'origin/master' into NewConnectors1 
Conflicts:
	README.md
	pom.xml
 2017-02-16 15:22:06 -06:00
Admin
61156e9820 Updated edit screen field layout with bootstrap grid. Added error 
checking for HTTP handler.
 2017-02-16 13:36:23 -06:00
Monica Goward
f8474f5f41 Initial fixes and cleanup prior to pull request 1 2017-02-09 14:26:16 +00:00
Admin
0305646b4f Updated LIFX connection for broadcast address and changed the item 
collection to be asynchronous with LIFX.
 2017-02-08 15:15:53 -06:00
Niklas
3fea7f4f1a Change to Generic HTTPClient 2017-02-08 08:29:37 +01:00
Niklas
44fbaa68f8 Merge remote-tracking branch 'upstream/master' 2017-02-08 08:28:53 +01:00
Admin
dd0032a567 updatre lifx 2017-02-07 15:50:21 -06:00
Monica Goward
470f6b3c15 Merge branch 'master' of https://github.com/bwssytems/ha-bridge 2017-02-06 21:24:44 +00:00
bwssystems
3016712ad8 Fixed closing homes to actually call the close on the homes. Updated the 
lowest setting on the test dim function to b 1.

Fixes #438
Fixes #440
 2017-02-05 14:37:35 -06:00
Monica Goward
2fbf26a5fa Merge branch 'master' of https://github.com/bwssytems/ha-bridge 2017-02-05 20:02:14 +00:00
bwssystems
71258c7e52 Fix some bugs for brightness decode in tcp and udp plugins 
Fixes #434
Fixes #435
 2017-02-04 18:40:13 -06:00
Monica Goward
ee066f1449 Cleanup 2017-02-04 19:12:20 +00:00
Monica Goward
e5871e61b5 Added some initial docs 2017-02-04 19:04:34 +00:00
Monica Goward
6b8a714959 Re-instating line endings that were erroneously removed 2017-02-04 18:40:28 +00:00
Monica Goward
cf3ec7cfe4 Merge branch 'master' of https://github.com/bwssytems/ha-bridge 2017-02-04 18:30:07 +00:00
Monica Goward
805aac9fde Add Somfy devices 2017-02-04 18:29:50 +00:00
Monica Goward
1221df4c96 add Somfy settings 2017-02-04 18:28:59 +00:00
Monica Goward
1c897e3b36 Add Somfy devices 2017-02-04 18:28:25 +00:00
Admin
0ac8061118 Updated LIFX impl 2017-02-03 09:29:49 -06:00
Monica Goward
65b0d6e470 HTML headers updates only 2017-02-03 12:08:46 +00:00
Monica Goward
99e2243e2d HTML headers updates only 2017-02-03 12:07:44 +00:00
Monica Goward
7a354619d0 Generated pojos from JSON Somfy return data 2017-02-03 12:01:47 +00:00
Monica Goward
2dc245bb96 HTML headers updates only 2017-02-03 11:51:05 +00:00
Admin
c679548bbd Beta impl of LIFX complete 2017-02-02 11:00:50 -06:00
Admin
16a248ba8e Starting impl of LIFX devices 2017-02-01 16:53:08 -06:00
Admin
1c7260600a Minor update for HAL decode issue 
Fixes #428
 2017-02-01 11:31:04 -06:00
Admin
f1592a1998 Issue with not checking for null 2017-01-30 15:57:35 -06:00