britea
4688995d12
fix apply scene
2020-05-08 14:55:26 +02:00
britea
d1cd93afe5
apply scene in host
2020-05-08 13:45:13 +02:00
c1898ffa6c
Merge branch '100-background-image-for-rooms' into 'dev'
...
Added the background image for romms
Closes #100
See merge request sa4-2020/the-sanmarinoes/frontend!137
2020-05-07 22:41:51 +02:00
Luca Ponzanelli
873a136c68
Issue #111 : add sonarqube analysis
...
- add sonar-scanner dev dependency
- add sonar-scanner job in ci configuration
2020-05-07 16:17:03 +02:00
Jacob Salvi
a82c4b2c77
Merge branch 'dev' into '100-background-image-for-rooms'
...
# Conflicts:
# smart-hut/src/components/RoomModal.js
2020-05-07 15:35:44 +02:00
Jacob Salvi
697ed70ea9
trying to solve a merge conflict
2020-05-07 15:34:56 +02:00
Jacob Salvi
cc60ff06ee
trying to solve a merge conflict
2020-05-07 15:33:50 +02:00
Fil Cesana
74bccad636
added: icons for curtains and thermostat, all links in the footer now work, centered the toggle for the videocam component - also, I do not know if it was already merged, but the modal now looks better (I hope)
2020-05-07 13:13:02 +02:00
Andrea Brites Marto
1dd25968be
Merge branch '105-room' into 'dev'
...
Resolve "Room view with no devices is now bugged and tells the user to create a room"
Closes #105
See merge request sa4-2020/the-sanmarinoes/frontend!132
2020-05-07 10:32:00 +02:00
Jacob Salvi
5e76bbfa2f
Added the background image for romms
2020-05-07 09:58:49 +02:00
Nicola Brunner
bb91bb1ee2
fixed warning message in device panel thanks to andrea
2020-05-07 09:51:38 +02:00
omenem
74d5be7967
fix
2020-05-07 09:29:22 +02:00
b61148b24a
Merge branch '104-creation-of-a-switch-error-message-if-no-light-selected' into 'dev'
...
found NewDevice class
Closes #104
See merge request sa4-2020/the-sanmarinoes/frontend!130
2020-05-06 15:55:04 +02:00
8414813070
found NewDevice class
2020-05-06 15:51:26 +02:00
717734fecb
Merge branch 'fix-brunny' into 'dev'
...
fix di brunner
See merge request sa4-2020/the-sanmarinoes/frontend!129
2020-05-06 13:47:46 +02:00
Nicola Brunner
bf8e822fc7
modified signup, uniformed message if no scene, device or hosts
2020-05-06 13:43:07 +02:00
Claudio Maggioni (maggicl)
3b55a8ea78
Fixed style issues on scene share guest button
2020-05-06 11:28:27 +02:00
Claudio Maggioni (maggicl)
194e502578
Added label to share cameras button and other minor fixes
2020-05-06 11:13:17 +02:00
bb16d5c475
Done 1 read scene part
2020-05-05 17:04:53 +02:00
5c5988526b
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 93-guests-implement-scenes-2
2020-05-05 16:35:27 +02:00
bcb2105847
Merge branch '93-guests-implement-scenes' into 'dev'
...
Resolve "Guests: implement scenes"
Closes #93
See merge request sa4-2020/the-sanmarinoes/frontend!120
2020-05-05 16:33:21 +02:00
britea
246fdb1de8
points 2,3,4
2020-05-05 15:53:07 +02:00
britea
bbd8074732
added option to use external temperature sensor
2020-05-04 19:42:13 +02:00
Claudio Maggioni (maggicl)
bf77b676eb
Removed current user from list of possible guests in guest modal
2020-05-04 18:22:21 +02:00
Claudio Maggioni (maggicl)
6454a369df
Room remove image button fixed
2020-05-04 17:58:08 +02:00
Claudio Maggioni (maggicl)
94ef7ef558
Scene copy implemented
2020-05-04 16:09:56 +02:00
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
