Commit graph

410 commits

Author SHA1 Message Date
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
Matteo Omenetti
d77ff7dc08 Merge branch '108-when-i-delete-a-room-add-maybe-an-are-you-sure-confirmation-message' into 'dev'
fix

Closes #108

See merge request sa4-2020/the-sanmarinoes/frontend!133
2020-05-07 09:33:11 +02:00
omenem
74d5be7967 fix 2020-05-07 09:29:22 +02:00
Christian Capeáns Pérez
78f6e508ec Check values for different types of sensors when creating a trigger for an automation 2020-05-06 21:36:32 +02:00
Christian Capeáns Pérez
bdfc7fc424 Merge branch '103-temperature-sensor-color-circle-change-with-temperature-value' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into 103-temperature-sensor-color-circle-change-with-temperature-value 2020-05-06 18:43:11 +02:00
Christian Capeáns Pérez
6c1e309ce4 Color of the temperature sensor changes with the temperature value (up to 20 degrees is green, from 20 to 30 is yellow and from 30 on is red) 2020-05-06 18:42:58 +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
britea
5828cb3ffd Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-06 14:19:50 +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
4e96670dfa Merge branch 'mailmap-fix' into 'dev'
Added updated mailmap for everyone in the repo

See merge request sa4-2020/the-sanmarinoes/frontend!128
2020-05-06 12:04:35 +02:00
261e2ece8e Merge branch 'mailmap-fix' into 'dev'
Added updated mailmap for everyone in the repo

See merge request sa4-2020/the-sanmarinoes/frontend!128
2020-05-06 12:02:41 +02:00
e09c56a4bd Merge branch 'dev' into 'mailmap-fix'
# Conflicts:
#   .mailmap
2020-05-06 12:02:33 +02:00
ff26f88cfd Added updated mailmap for everyone in the repo 2020-05-06 12:02:02 +02:00
1811c74a6a Merge branch 'mailmap-fix' into 'dev'
Added updated mailmap for everyone in the repo

See merge request sa4-2020/the-sanmarinoes/frontend!127
2020-05-06 11:59:30 +02:00
a223cdbb40 Added updated mailmap for everyone in the repo 2020-05-06 11:59:09 +02:00
britea
40af5c8f2b Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-06 11:35:59 +02:00
3dcd24f36d Merge branch 'scene-fix' into 'dev'
Fixed style issues on scene share guest button

See merge request sa4-2020/the-sanmarinoes/frontend!126
2020-05-06 11:32:07 +02:00
Claudio Maggioni (maggicl)
3b55a8ea78 Fixed style issues on scene share guest button 2020-05-06 11:28:27 +02:00
7a1ca33dfc Merge branch '101-share-cameras-button-is-unlableled' into 'dev'
Resolve "Share cameras button is unlableled"

Closes #101

See merge request sa4-2020/the-sanmarinoes/frontend!125
2020-05-06 11:16:35 +02:00
Claudio Maggioni (maggicl)
194e502578 Added label to share cameras button and other minor fixes 2020-05-06 11:13:17 +02:00
britea
76d5125d79 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-05 18:02:16 +02:00
Andrea Brites Marto
ede920b628 Merge branch '93-guests-implement-scenes-2' into 'dev'
Resolve "Guests: implement scenes"

Closes #93

See merge request sa4-2020/the-sanmarinoes/frontend!124
2020-05-05 17:59:58 +02:00
britea
5433b5fd8d Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-05 17:57:10 +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
3670d16e4d Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-05 15:06:28 +02:00
af7d93b44a Merge branch '98-thermostats-must-have-an-option-to-choose-between-internal-and-external-sensors-must-be-disabled' into 'dev'
Resolve "thermostats must have an option to choose between internal and external sensors (must be disabled when no temp sensors are in the room) @britea"

Closes #98

See merge request sa4-2020/the-sanmarinoes/frontend!123
2020-05-04 19:45:33 +02:00
britea
bbd8074732 added option to use external temperature sensor 2020-05-04 19:42:13 +02:00
britea
fcd940e364 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-04 18:24:15 +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
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
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
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
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
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
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