|
|
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 |
|
Andrea Brites Marto
|
1d1fbe335e
|
Merge branch '85-thermostat-fix-2' into 'dev'
thermostat fix
Closes #85
See merge request sa4-2020/the-sanmarinoes/frontend!100
|
2020-04-27 19:27:49 +02:00 |
|
britea
|
2eaa0e8345
|
thermostat fix
|
2020-04-27 19:24:21 +02:00 |
|
Andrea Brites Marto
|
f6c8379fa0
|
Merge branch '84-small-fix' into 'dev'
fixed device settings on scenes
Closes #84
See merge request sa4-2020/the-sanmarinoes/frontend!98
|
2020-04-27 17:02:31 +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
|
23ad5e2ff3
|
Merge branch 'apply' into 'dev'
Apply
See merge request sa4-2020/the-sanmarinoes/frontend!97
|
2020-04-27 15:55:06 +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 |
|
|
|
a09b1dac57
|
Merge branch 'curtains-fix' into 'dev'
Curtains style fix
See merge request sa4-2020/the-sanmarinoes/frontend!96
|
2020-04-27 14:14:32 +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 |
|
Andrea Brites Marto
|
a54df637cd
|
Merge branch '82-scene-states-update' into 'dev'
Resolve "scene-states-update"
Closes #82
See merge request sa4-2020/the-sanmarinoes/frontend!94
|
2020-04-25 19:03:41 +02:00 |
|
britea
|
34f83c9cce
|
Merge branch '82-scene-states-update' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into 82-scene-states-update
|
2020-04-25 19:00:56 +02:00 |
|
britea
|
b73206e07a
|
fixed add state
|
2020-04-25 19:00:39 +02:00 |
|
Jacob Salvi
|
79afe780b3
|
idk how but delete works
|
2020-04-25 18:44:54 +02:00 |
|
britea
|
b6a27195fe
|
delete state
|
2020-04-25 18:27:09 +02:00 |
|
britea
|
2d9bdf63fb
|
fixed problem in scene state
|
2020-04-25 18:23:40 +02:00 |
|
Jacob Salvi
|
d231ce7e84
|
fix to stateOrDevice
|
2020-04-25 17:52:50 +02:00 |
|
Jacob Salvi
|
2d04439948
|
Merge branch '82-scene-states-update' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 82-scene-states-update
# Conflicts:
# smart-hut/src/components/dashboard/devices/Light.js
|
2020-04-25 17:50:05 +02:00 |
|
Jacob Salvi
|
1e668f499d
|
fix to stateOrDevice
|
2020-04-25 17:46:43 +02:00 |
|
britea
|
bd3a39181c
|
fix states scenes
|
2020-04-25 17:46:04 +02:00 |
|
Jacob Salvi
|
b301c97212
|
fix to stateOrDevice
|
2020-04-25 17:45:22 +02:00 |
|
Jacob Salvi
|
fd5c28b1c9
|
stateOrDevice() added in various places
|
2020-04-25 17:27:56 +02:00 |
|
Jacob Salvi
|
7f9a42fb84
|
sceneState.kind
|
2020-04-25 16:47:53 +02:00 |
|
Jacob Salvi
|
12f64ffbc2
|
changes to various devices
|
2020-04-25 16:18:01 +02:00 |
|
Jacob Salvi
|
a4c13a2691
|
i am dumb
|
2020-04-25 15:44:02 +02:00 |
|
Jacob Salvi
|
b56b9a8260
|
added updateState to store
|
2020-04-25 15:43:27 +02:00 |
|
Jacob Salvi
|
1484026afd
|
added updateState to store
|
2020-04-25 15:37:40 +02:00 |
|
Andrea Brites Marto
|
a3eff85149
|
Merge branch 'helpWithBackend' into 'dev'
Help with backend
See merge request sa4-2020/the-sanmarinoes/frontend!93
|
2020-04-25 14:50:07 +02:00 |
|
Jacob Salvi
|
1f063aebb6
|
small fixes and clean up
|
2020-04-25 14:46:49 +02:00 |
|
