Commit Graph

156 Commits

Author SHA1 Message Date
Admin
5ccb793ddb Merge and update changes from pull requests 2017-06-19 15:10:40 -05:00
BWS Systems
3ebab82977 Merge pull request #654 from fgather/master
Add possibility to set qos and retained state of MQTT messages
2017-06-19 15:01:32 -05:00
Admin
998450af4e Updating HAL changes 2017-05-31 16:32:33 -05:00
Admin
d78c7c536d Updateing HAL handling 2017-05-30 16:41:26 -05:00
fgather
a55c53299a Add possibility to set qos and retained state of MQTT messages 2017-05-30 21:49:31 +02:00
Admin
ea80925533 remove .map files and remove async from run function. 2017-05-24 15:54:21 -05:00
Admin
62b896ee07 Implement devimal percent for no locale, add HAL https and debugging for
link buttton usage.
2017-05-19 15:45:56 -05:00
Admin
19256e4eaa Updated code for issues and included new pull requests from others. 2017-05-11 15:30:34 -05:00
Admin
13c84ba174 Hopefully, final testing release 2017-04-06 16:23:14 -05:00
Admin
b19fe5c86a Took care of dynamic test user creation 2017-04-05 16:02:40 -05:00
Admin
ff9d0a5a77 Moving to release candidate 1 2017-04-04 15:54:58 -05:00
Admin
0737c54a0e Updated security changes for exec command with the exec garden. 2017-04-04 11:47:04 -05:00
Admin
a7e516925c Updated security to have basic auth and also remove login when reinit
happens.
2017-04-03 16:40:46 -05:00
Admin
2f1adf9d4b First round of testing for Security complete, now alpha 2017-03-31 14:57:48 -05:00
Admin
cd5417c2e0 Testing security impl 2017-03-30 15:55:36 -05:00
Admin
ba621fcb85 Continue with security impl, starting to gell.... 2017-03-29 16:41:59 -05:00
bwssystems
7442b0d0ca more security handling 2017-03-28 18:58:33 -05:00
Admin
c275926117 continue security update 2017-03-28 16:39:30 -05:00
Admin
895a9ec99b Continue adding security 2017-03-27 16:50:29 -05:00
Admin
6dfd70dfee Continue security 2017-03-24 16:33:12 -05:00
Admin
0bdb321fd7 Continue security update 2017-03-24 13:38:08 -05:00
Admin
b508a8a16a Continue with security update 2017-03-23 16:36: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
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
7da4bf13e0 Merge pull request #492 from hobbe/patch-1
Use relative path in URLs
2017-03-10 08:58:43 -06:00
Admin
7b97bd75ae fixed uniqueid on copy 2017-03-03 16:25:45 -06:00
Olivier B
3a8c64aac6 Merge branch 'patch-1' into master 2017-03-01 14:13:53 +01: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
Admin
afd1af4094 Merge remote-tracking branch 'origin/master' into NewConnectors1
Conflicts:
	README.md
	pom.xml
2017-02-16 15:22:06 -06:00
Monica Goward
f8474f5f41 Initial fixes and cleanup prior to pull request 1 2017-02-09 14:26:16 +00: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
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
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
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
24dd427fb4 Fixed immediate bugs for
Fixes #129 Hue pass-thru always set to purple
Fixes #406 Dimming with Home Assistant
Fixes #414 Domoticz error retrieving devices
2017-01-30 15:40:58 -06:00
Admin
b5e6e3ad60 v4.1.0 Added feature for Domoticz and fixed some major bugs, ie: mqtt,
and some enhancements.
2017-01-27 15:11:30 -06:00
Admin
4b7ba0fabe Finished Domoticz impl and secure calls for Home Assistant 2017-01-25 16:24:44 -06:00