|
|
76073ca15b
|
Merge branch '94-curtains-creation-does-not-supply-a-default-name' into 'dev'
Resolve "curtains creation does not supply a default name"
Closes #94
See merge request sa4-2020/the-sanmarinoes/frontend!116
|
2020-05-04 14:40:49 +02:00 |
|
Claudio Maggioni (maggicl)
|
9f4bc21fa8
|
Fixed curtains creation default name
|
2020-05-04 14:38:18 +02:00 |
|
|
|
c7334b735f
|
Merge branch '72-7-users-can-invite-guests' into 'dev'
Resolve "7. Users can invite guests"
Closes #72
See merge request sa4-2020/the-sanmarinoes/frontend!115
|
2020-05-04 12:06:50 +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 |
|
Andrea Brites Marto
|
fabcce15a1
|
Merge branch '92-fix-videocamera' into 'dev'
fix videocamera turn on/off
Closes #92
See merge request sa4-2020/the-sanmarinoes/frontend!114
|
2020-05-03 14:43:01 +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 |
|
Andrea Brites Marto
|
b99641125c
|
Merge branch '90-fix-devices' into 'dev'
Resolve "fix-devices"
Closes #90
See merge request sa4-2020/the-sanmarinoes/frontend!113
|
2020-05-02 17:05:11 +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 |
|
|
|
2c298ec4bb
|
Merge branch 'log-fix' into 'dev'
Cleaned logs across repository
See merge request sa4-2020/the-sanmarinoes/frontend!112
|
2020-05-02 14:54:01 +02:00 |
|
Claudio Maggioni (maggicl)
|
8b1a7d4b20
|
Cleaned logs across repository
|
2020-05-02 14:51:31 +02:00 |
|
|
|
f058ca8502
|
Merge branch 'thermostat-fix' into 'dev'
Thermostats fixed (for scenes)
See merge request sa4-2020/the-sanmarinoes/frontend!111
|
2020-05-02 14:00:26 +02:00 |
|
Claudio Maggioni (maggicl)
|
518760e925
|
Thermostats fixed (for scenes)
|
2020-05-02 13:58:02 +02:00 |
|
|
|
126efe3b53
|
Merge branch 'thermostat-fix' into 'dev'
Thermostats fixed
See merge request sa4-2020/the-sanmarinoes/frontend!110
|
2020-05-02 11:14:35 +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 |
|
Andrea Brites Marto
|
89a4f2f068
|
Merge branch '89-fix-scenes' into 'dev'
fixed scenes, add multiple states
Closes #89
See merge request sa4-2020/the-sanmarinoes/frontend!108
|
2020-05-01 19:58:36 +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 |
|
|
|
9d8524c7c9
|
Merge branch 'dev-copy' into 'dev'
Dev copy
See merge request sa4-2020/the-sanmarinoes/frontend!107
|
2020-05-01 11:47:45 +02:00 |
|
Claudio Maggioni (maggicl)
|
52befca126
|
Fixed videocamera
|
2020-05-01 11:45:19 +02:00 |
|
|
|
c2f646d29a
|
Merge branch 'dev-copy' into 'dev'
Dev copy
See merge request sa4-2020/the-sanmarinoes/frontend!106
|
2020-05-01 11:21:38 +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 |
|
|
|
361c82c264
|
Merge branch '88-fix-dimmable-state' into 'dev'
fix dimmable state
Closes #88
See merge request sa4-2020/the-sanmarinoes/frontend!103
|
2020-04-28 11:02:46 +02:00 |
|
britea
|
7de6331f0f
|
fix dimmable state
|
2020-04-28 10:59:47 +02:00 |
|
Andrea Brites Marto
|
7135ddc588
|
Merge branch '87-fix-thermostat' into 'dev'
fix thermostat
Closes #87
See merge request sa4-2020/the-sanmarinoes/frontend!102
|
2020-04-28 10:51:07 +02:00 |
|
britea
|
0b840e7f8e
|
fix thermostat
|
2020-04-28 10:48:07 +02:00 |
|
Andrea Brites Marto
|
13f75e986e
|
Merge branch '86-hope-fix' into 'dev'
fix dimmer scene state
Closes #86
See merge request sa4-2020/the-sanmarinoes/frontend!101
|
2020-04-28 10:29:02 +02:00 |
|
britea
|
c7c121182b
|
fix dimmer scene state
|
2020-04-28 10:24:58 +02:00 |
|
