smarthut/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
426 commits 2 branches 3 tags 23 MiB
Commit graph

426 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
b26162415c Merge branch '97-if-i-create-a-new-room-with-an-image-remove-image-does-not-work' into 'dev' 
Resolve "If I create a new room with an image - remove image does not work"

Closes #97

See merge request sa4-2020/the-sanmarinoes/frontend!121
 2020-05-04 18:01:50 +02:00
Claudio Maggioni (maggicl)
6454a369df Room remove image button fixed 2020-05-04 17:58:08 +02:00
Claudio Maggioni
0c98ed0e49 Merge branch 'mailmap-fix' into 'dev' 
Fixed my duplicate entry in repo stats

See merge request sa4-2020/the-sanmarinoes/frontend!119
 2020-05-04 17:35:59 +02:00
Claudio Maggioni (maggicl)
781394c788 Fixed my duplicate entry in repo stats 2020-05-04 17:35:33 +02:00
Claudio Maggioni
88dca6b144 Merge branch '96-when-creating-a-scene-users-can-t-copy-the-configuration-from-another-scene' into 'dev' 
Resolve "When creating a scene, users can't copy the configuration from another scene."

Closes #96

See merge request sa4-2020/the-sanmarinoes/frontend!118
 2020-05-04 16:12:31 +02:00
britea
be8c049e47 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-04 16:11:26 +02:00
Claudio Maggioni (maggicl)
94ef7ef558 Scene copy implemented 2020-05-04 16:09:56 +02:00
Claudio Maggioni
da120b377e Merge branch '95-scene-has-no-customizable-icon' into 'dev' 
Resolve "scene has no customizable icon"

Closes #95

See merge request sa4-2020/the-sanmarinoes/frontend!117
 2020-05-04 15:11:46 +02:00
Claudio Maggioni (maggicl)
5fac9890a6 Added icons to scenes 2020-05-04 15:08:17 +02:00
Claudio Maggioni
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
britea
46c1c3caf3 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-04 13:59:15 +02:00
Claudio Maggioni
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
Claudio Maggioni
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
britea
6c58ca4d64 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-03 18:18:26 +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
Claudio Maggioni
a6fbd1a5d2 WIP 2020-05-02 20:50:34 +02:00
britea
8e3a9a57e0 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-02 17:10:45 +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
britea
87922f689d Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-02 17:01:39 +02:00
Claudio Maggioni (maggicl)
091ab50c0e WIP 2020-05-02 16:40:29 +02:00
tommi27
c5e1e1bd8d added actions without working code 2020-05-02 15:30:10 +02:00
tommi27
43615ba3b1 Host should work, cannot solve an error 2020-05-02 15:30:10 +02:00
Claudio Maggioni
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
Claudio Maggioni
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
britea
8b1b22cd88 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-02 13:40:54 +02:00
Claudio Maggioni
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
britea
3769ea32b0 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-01 20:28:39 +02:00
Claudio Maggioni
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
3871657b3b Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-01 20:07:10 +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
britea
8aed75faf2 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-01 19:29:42 +02:00