Commit graph

208 commits

Author SHA1 Message Date
Claudio Maggioni (maggicl)
5fac9890a6 Added icons to scenes 2020-05-04 15:08:17 +02:00
Claudio Maggioni (maggicl)
9f4bc21fa8 Fixed curtains creation default name 2020-05-04 14:38:18 +02:00
61430bb42e Merge branch 'dev' into '72-7-users-can-invite-guests'
# Conflicts:
#   smart-hut/src/components/dashboard/devices/Device.js
2020-05-04 12:03:28 +02:00
Claudio Maggioni (maggicl)
cfe1f35226 Deletion propagation implemented 2020-05-04 11:57:42 +02:00
Claudio Maggioni (maggicl)
c145be02b4 Lights can be modified by a guest 2020-05-04 11:13:19 +02:00
Claudio Maggioni (maggicl)
770469ade3 Socket update handling done except deletion messages, currently not implemented in the server side 2020-05-03 19:51:00 +02:00
Claudio Maggioni (maggicl)
c7dc34eedc other minor fixes 2020-05-03 18:13:50 +02:00
Claudio Maggioni (maggicl)
0252870c70 fixed bug in deviceProps.js 2020-05-03 18:11:04 +02:00
Claudio Maggioni (maggicl)
3014b73323 Device guest view implemented 2020-05-03 18:09:53 +02:00
Claudio Maggioni (maggicl)
c95f7a95f7 Fixes to Device in preparation to use in Hosts tab 2020-05-03 17:18:34 +02:00
Claudio Maggioni (maggicl)
f6f46918c6 Fixed warning and merge in thermostats 2020-05-03 16:37:04 +02:00
britea
65756d0dc9 firx videocamera turn on/off 2020-05-03 14:39:44 +02:00
Claudio Maggioni (maggicl)
74a5e49776 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 72-7-users-can-invite-guests 2020-05-02 22:46:40 +02:00
Claudio Maggioni (maggicl)
9b2253b161 Guest selection panel working 2020-05-02 22:37:20 +02:00
a6fbd1a5d2 WIP 2020-05-02 20:50:34 +02:00
britea
9537c12978 fix devices 2020-05-02 17:02:50 +02:00
Claudio Maggioni (maggicl)
091ab50c0e WIP 2020-05-02 16:40:29 +02:00
c5e1e1bd8d added actions without working code 2020-05-02 15:30:10 +02:00
43615ba3b1 Host should work, cannot solve an error 2020-05-02 15:30:10 +02:00
Claudio Maggioni (maggicl)
8b1a7d4b20 Cleaned logs across repository 2020-05-02 14:51:31 +02:00
Claudio Maggioni (maggicl)
518760e925 Thermostats fixed (for scenes) 2020-05-02 13:58:02 +02:00
Claudio Maggioni (maggicl)
d49d6361ef Thermostats fixed 2020-05-02 11:11:21 +02:00
3af3b85aa9 Merge branch 'automations-fix' into 'dev'
Automations fix

See merge request sa4-2020/the-sanmarinoes/frontend!109
2020-05-01 20:10:54 +02:00
Claudio Maggioni (maggicl)
ac1bcdbc29 More fixes on automations 2020-05-01 20:07:37 +02:00
britea
6db8e928f1 fixed scenes, add multiple states 2020-05-01 19:55:08 +02:00
Claudio Maggioni (maggicl)
96184c76c9 Fixing automations and ui in general 2020-05-01 16:42:42 +02:00
Claudio Maggioni (maggicl)
52befca126 Fixed videocamera 2020-05-01 11:45:19 +02:00
Claudio Maggioni (maggicl)
292a33e5bc Fixed updates from @christiancp 2020-05-01 11:18:25 +02:00
Claudio Maggioni (maggicl)
146aae1684 prettier run 2020-04-30 11:56:06 +02:00
Claudio Maggioni (maggicl)
697a348058 Merge branch '78-fix-light-problems-in-the-first-bach' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into dev-copy 2020-04-30 11:55:43 +02:00
1de7b9992e Merge branch '70-5-users-can-create-basic-automations' into 'dev'
Resolve "5. Users can create basic automations"

Closes #70

See merge request sa4-2020/the-sanmarinoes/frontend!104
2020-04-28 12:07:58 +02:00
Claudio Maggioni (maggicl)
5b2bd7cc48 runned beautifier 2020-04-28 12:04:01 +02:00
Claudio Maggioni (maggicl)
b9be38d467 removed warnings 2020-04-28 12:02:46 +02:00
Claudio Maggioni (maggicl)
b0b281263e fix 2020-04-28 11:56:34 +02:00
Christian Capeáns Pérez
835ac99a8e Automation deletion added 2020-04-28 11:39:38 +02:00
britea
7de6331f0f fix dimmable state 2020-04-28 10:59:47 +02:00
britea
0b840e7f8e fix thermostat 2020-04-28 10:48:07 +02:00
britea
c7c121182b fix dimmer scene state 2020-04-28 10:24:58 +02:00
britea
2eaa0e8345 thermostat fix 2020-04-27 19:24:21 +02:00
Christian Capeáns Pérez
cc23824a37 Automations basic stuff is working: create, get 2020-04-27 17:00:46 +02:00
britea
71d9731fc7 fixed device settings on scenes 2020-04-27 16:58:55 +02:00
Andrea Brites Marto
b7e17fc770 Merge branch 'dev' into 'apply'
# Conflicts:
#   smart-hut/src/components/dashboard/devices/Curtain.js
2020-04-27 15:50:37 +02:00
britea
a7f05f0200 fixed scenes 2020-04-27 15:47:59 +02:00
britea
af0c157205 fixed update state 2020-04-27 15:20:48 +02:00
britea
c878702331 try to fix 2020-04-27 14:44:48 +02:00
Claudio Maggioni (maggicl)
29d2815a77 Curtains style fix 2020-04-27 14:14:11 +02:00
Fil Cesana
9ca3becd8d security camera icon added, I also did a restyling of the modal for the security camera: now it is centerd, and it occupies basically the entire scream, but leaving a fair margin on the for directions. Much better now, I think, but let me know in case. 2020-04-27 11:10:04 +02:00
britea
2a1cc0292c fixed many things 2020-04-26 13:38:54 +02:00
Jacob Salvi
cce1650bd9 scene apply preparations 2020-04-26 11:15:05 +02:00
Jacob Salvi
07f4a8ee43 scene apply preparations 2020-04-26 11:09:49 +02:00