|
|
297fe5f9b3
|
Merge branch '70-scene-has-not-a-customizable-icon' into 'dev'
Resolve "scene has not a customizable icon"
Closes #70
See merge request sa4-2020/the-sanmarinoes/backend!110
|
2020-05-04 15:12:46 +02:00 |
|
Claudio Maggioni (maggicl)
|
5bfce7e99b
|
Added icons to scenes
|
2020-05-04 15:09:11 +02:00 |
|
|
|
cb2713afa5
|
Merge branch 'guests-fix' into 'dev'
Guests fix
See merge request sa4-2020/the-sanmarinoes/backend!109
|
2020-05-04 12:02:39 +02:00 |
|
Claudio Maggioni (maggicl)
|
21bc66d24b
|
Deletion propagation implemented
|
2020-05-04 11:58:03 +02:00 |
|
Claudio Maggioni (maggicl)
|
69d1b38ff2
|
other minor fixes^2
|
2020-05-03 19:50:00 +02:00 |
|
Claudio Maggioni (maggicl)
|
4a963115bb
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into guests-fix
|
2020-05-03 16:38:27 +02:00 |
|
|
|
01541a843e
|
Merge branch '68-thermostat-updates-on-sensor-only-are-not-sent' into 'dev'
Resolve "Thermostat updates on sensor only are not sent"
Closes #68
See merge request sa4-2020/the-sanmarinoes/backend!108
|
2020-05-03 14:25:29 +02:00 |
|
Claudio Maggioni (maggicl)
|
aad6cc52ce
|
Fixed thermostat socket updates
|
2020-05-03 14:14:24 +02:00 |
|
Claudio Maggioni (maggicl)
|
25eb9555c0
|
Fixed for frontend to guest controllers
|
2020-05-02 22:37:54 +02:00 |
|
|
|
6263bd2d35
|
WIP
|
2020-05-02 20:50:50 +02:00 |
|
Claudio Maggioni (maggicl)
|
92e93c80e8
|
WIP
|
2020-05-02 16:41:11 +02:00 |
|
|
|
e8a3480add
|
Merge branch 'automations-fix-2' into 'dev'
Fixed propagation of device updates on automation scene application
See merge request sa4-2020/the-sanmarinoes/backend!107
|
2020-05-02 14:57:13 +02:00 |
|
Claudio Maggioni (maggicl)
|
7ae7522359
|
Fixed propagation of device updates on automation scene application
|
2020-05-02 14:53:12 +02:00 |
|
|
|
50508d95be
|
Merge branch 'thermostat-fix' into 'dev'
Thermostats fixed (for scenes)
See merge request sa4-2020/the-sanmarinoes/backend!106
|
2020-05-02 14:02:33 +02:00 |
|
Claudio Maggioni (maggicl)
|
c3d6590507
|
Thermostats fixed (for scenes)
|
2020-05-02 13:58:28 +02:00 |
|
|
|
36dbb0dac9
|
Merge branch 'thermostat-fix' into 'dev'
Thermostats fixed
See merge request sa4-2020/the-sanmarinoes/backend!105
|
2020-05-02 11:16:39 +02:00 |
|
Claudio Maggioni (maggicl)
|
e0ab831be9
|
Thermostats fixed
|
2020-05-02 11:12:11 +02:00 |
|
|
|
a7e26aee98
|
Merge branch 'automations-fix-1' into 'dev'
Fixed GSON serializations of triggers
See merge request sa4-2020/the-sanmarinoes/backend!104
|
2020-05-01 20:09:43 +02:00 |
|
Claudio Maggioni (maggicl)
|
3d74e02434
|
Fixed GSON serializations of triggers
|
2020-05-01 20:04:44 +02:00 |
|
|
|
74fee11814
|
Merge branch 'fix' into 'dev'
fix
See merge request sa4-2020/the-sanmarinoes/backend!102
|
2020-04-28 10:48:31 +02:00 |
|
Claudio Maggioni (maggicl)
|
cfa2f794cb
|
fix
|
2020-04-28 10:48:09 +02:00 |
|
|
|
f7f7d3a2a9
|
Merge branch 'fix' into 'dev'
fixz
See merge request sa4-2020/the-sanmarinoes/backend!100
|
2020-04-28 10:05:34 +02:00 |
|
Claudio Maggioni (maggicl)
|
ba73348a74
|
fixz
|
2020-04-28 10:05:08 +02:00 |
|
Jacob Salvi
|
36c921320b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-04-28 08:27:51 +02:00 |
|
Matteo Omenetti
|
3118c07a83
|
Merge branch '67-fix-in-thermostat-missing-field-in-saverequest' into 'dev'
fix
Closes #67
See merge request sa4-2020/the-sanmarinoes/backend!98
|
2020-04-27 19:09:20 +02:00 |
|
omenem
|
5fc63edf4f
|
fix
|
2020-04-27 19:04:52 +02:00 |
|
Matteo Omenetti
|
3af4b24a12
|
Merge branch '66-fix-in-thermostat' into 'dev'
fix
Closes #66
See merge request sa4-2020/the-sanmarinoes/backend!97
|
2020-04-27 19:03:07 +02:00 |
|
omenem
|
cf06950b62
|
fix
|
2020-04-27 18:59:01 +02:00 |
|
|
|
3df6812b1f
|
Merge branch 'fix4867594w867593428574ew' into 'dev'
fix
See merge request sa4-2020/the-sanmarinoes/backend!96
|
2020-04-27 18:55:45 +02:00 |
|
|
|
eacc77fa43
|
fix
|
2020-04-27 18:51:55 +02:00 |
|
Jacob Salvi
|
57fdb8eacd
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
|
2020-04-27 17:58:20 +02:00 |
|
|
|
79c0cd0fc1
|
Merge branch 'fix_automations' into 'dev'
fixed some stuff not working on automations
See merge request sa4-2020/the-sanmarinoes/backend!95
|
2020-04-27 17:04:20 +02:00 |
|
Christian Capeáns Pérez
|
c1147f02ae
|
fixed some stuff not working on automations
|
2020-04-27 17:03:17 +02:00 |
|
|
|
60c057ce5b
|
Merge branch 'socket-fix' into 'dev'
Socket fix
See merge request sa4-2020/the-sanmarinoes/backend!94
|
2020-04-27 14:30:11 +02:00 |
|
Claudio Maggioni (maggicl)
|
579dcaacfd
|
fix @SocketGsonExclude on device and children
|
2020-04-27 14:28:34 +02:00 |
|
Matteo Omenetti
|
fb229b03f0
|
Merge branch '65-fix-in-automation-controller' into 'dev'
fix
Closes #65
See merge request sa4-2020/the-sanmarinoes/backend!93
|
2020-04-27 14:00:47 +02:00 |
|
omenem
|
719bde0840
|
fix
|
2020-04-27 13:55:59 +02:00 |
|
Matteo Omenetti
|
27de35acf0
|
Merge branch '64-fix-in-sceneprioritycontroller' into 'dev'
fix
Closes #64
See merge request sa4-2020/the-sanmarinoes/backend!92
|
2020-04-27 11:59:14 +02:00 |
|
omenem
|
cc2a16f3e3
|
fix
|
2020-04-27 11:54:31 +02:00 |
|
Matteo Omenetti
|
15c6e99e4e
|
Merge branch '63-fix-table-relation-in-trigger' into 'dev'
fix
Closes #63
See merge request sa4-2020/the-sanmarinoes/backend!91
|
2020-04-26 14:01:16 +02:00 |
|
omenem
|
06dbd2bef0
|
fix
|
2020-04-26 13:57:30 +02:00 |
|
Matteo Omenetti
|
0383a547c1
|
Merge branch '62-fix-constraints-in-trigger' into 'dev'
fix
Closes #62
See merge request sa4-2020/the-sanmarinoes/backend!90
|
2020-04-26 13:33:38 +02:00 |
|
Jacob Salvi
|
e3d7908537
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-04-26 13:32:35 +02:00 |
|
omenem
|
c9395404e0
|
fix
|
2020-04-26 13:29:14 +02:00 |
|
Matteo Omenetti
|
46bb2e7d26
|
Merge branch '61-add-get-request-for-one-automation' into 'dev'
new route fix
Closes #61
See merge request sa4-2020/the-sanmarinoes/backend!88
|
2020-04-26 12:17:21 +02:00 |
|
omenem
|
10dc0c9741
|
new route fix
|
2020-04-26 12:13:46 +02:00 |
|
|
|
8be7b2c263
|
Merge branch 'name-fix' into 'dev'
fix duplicate device names
See merge request sa4-2020/the-sanmarinoes/backend!87
|
2020-04-25 22:52:14 +02:00 |
|
Claudio Maggioni (maggicl)
|
be7c9ce99f
|
fix duplicate device names
|
2020-04-25 22:51:30 +02:00 |
|
|
|
dbf9ef885b
|
Merge branch 'fix' into 'dev'
fix update sensor
See merge request sa4-2020/the-sanmarinoes/backend!86
|
2020-04-25 16:34:16 +02:00 |
|
Nicola Brunner
|
c5aab751df
|
fix update sensor
|
2020-04-25 16:33:00 +02:00 |
|
