b3157fe9eb
Merge branch 'dev' into 'master'
...
Dev
See merge request sa4-2020/the-sanmarinoes/backend!103
2020-04-28 10:49:11 +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
f8989f7bc5
Merge branch 'dev' into 'master'
...
Dev
See merge request sa4-2020/the-sanmarinoes/backend!101
2020-04-28 10:14:10 +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
9f7319a25b
Merge branch 'dev' into 'master'
...
Dev
See merge request sa4-2020/the-sanmarinoes/backend!99
2020-04-28 09:34:16 +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
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
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
Matteo Omenetti
ca05c0a596
Merge branch '60-we-forgot-the-controllers-for-automations-and-scenepriority-as-well-s-the-dtos' into 'dev'
...
Resolve "We forgot the controllers for Automations and ScenePriority as well s the DTOs"
Closes #60
See merge request sa4-2020/the-sanmarinoes/backend!85
2020-04-25 16:23:58 +02:00
omenem
d61c7bbc0b
controller for triggers
2020-04-25 15:59:06 +02:00
omenem
db35205ed8
controller for scenePriority
2020-04-25 15:20:00 +02:00
omenem
5eadb2314c
wip
2020-04-25 15:00:22 +02:00
omenem
509d890c7e
Controllers for automation
2020-04-25 14:56:07 +02:00
Matteo Omenetti
fc25177a69
Merge branch '59-fix-scene-repository-2' into 'dev'
...
fix scene repository
Closes #59
See merge request sa4-2020/the-sanmarinoes/backend!83
2020-04-24 23:13:34 +02:00
britea
24804d2d82
fix scene repository
2020-04-24 23:09:31 +02:00
6a90f478d1
Merge branch 'fix' into 'dev'
...
Fixed DeviceService
See merge request sa4-2020/the-sanmarinoes/backend!81
2020-04-23 17:11:26 +02:00
54c27921d9
Fixed DeviceService
2020-04-23 17:10:59 +02:00
df8a9e6449
Merge branch '54-users-can-create-basic-automations' into 'dev'
...
Resolve "Users can create basic automations"
Closes #54
See merge request sa4-2020/the-sanmarinoes/backend!80
2020-04-23 11:20:55 +02:00
Claudio Maggioni (maggicl)
3da04ccaef
Fixed user story 5 and 7
2020-04-23 11:17:46 +02:00
Claudio Maggioni (maggicl)
7ebf74a4c8
WIP merge with dev
2020-04-22 23:11:32 +02:00
Claudio Maggioni (maggicl)
37ea9591cf
Code review
2020-04-22 23:04:43 +02:00
8a1dc8674a
Merge branch '56-users-can-invite-guests' into 'dev'
...
Resolve "Users can invite guests"
Closes #56
See merge request sa4-2020/the-sanmarinoes/backend!79
2020-04-22 22:58:11 +02:00
Claudio Maggioni (maggicl)
3894fa14a9
Code review
2020-04-22 22:54:34 +02:00
389af7c04d
all device controllers have been updated with device service
2020-04-22 18:13:06 +02:00
omenem
570b1e8b29
wip, implemented very long stream in DeviceService, SceneService is missing though
2020-04-22 17:30:16 +02:00
c6d5a1acd7
controllers fixed and updated for guest or host checks
2020-04-22 17:17:07 +02:00
omenem
5c2f828834
wid, added implements keyword for Boolean/RangeTriggerable in all the devices
2020-04-22 16:48:49 +02:00
