Commit graph

567 commits

Author SHA1 Message Date
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
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
Jacob Salvi
886f43bf62 small fix to thermostat controller 2020-04-25 14:38:47 +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
a428d57fe1 WIP: controllers check for owner or guest, device service needs review 2020-04-22 15:30:23 +02:00
db21aa0a26 Code review 2020-04-21 17:36:17 +02:00
c4f295d7d9 refactored controllers code 2020-04-21 17:09:11 +02:00
Claudio Maggioni (maggicl)
4357606187 Code review 2020-04-21 16:58:12 +02:00
omenem
618c152466 wip 2020-04-21 15:21:47 +02:00
Claudio Maggioni (maggicl)
eef0887da1 Code review 2020-04-21 14:57:11 +02:00
omenem
0692f7e2ee wip 2020-04-21 14:45:04 +02:00
Claudio Maggioni (maggicl)
6317ac99e4 Code review 2020-04-21 14:25:42 +02:00
Claudio Maggioni (maggicl)
cfe3848d7e Done method to get dimmable light if owner or guest 2020-04-21 14:06:56 +02:00
db102f75e4 light and room controller routes check for guest authorization 2020-04-20 16:41:11 +02:00
Claudio Maggioni (maggicl)
319629a681 Pseudocode for automation implemmentation 2020-04-20 14:14:04 +02:00
omenem
5c0df55de9 wip 2020-04-20 13:47:27 +02:00
7b80b52f9e guest controller should be finished, must be reviewed 2020-04-19 17:10:42 +02:00
36a7a649d5 started guest controllers (WIP) 2020-04-18 17:35:14 +02:00
566a2e72e3 invited model finally works 2020-04-18 15:35:04 +02:00
262dbf12e7 hopefully fixed invited relationship II: The Revenge 2020-04-18 14:52:11 +02:00
d2aaa45a8b hopefully fixed invited relationship 2020-04-18 14:11:21 +02:00
6e36d7d306 updated onetomany relationship 2020-04-18 12:43:01 +02:00
3921fe1330 started invitation relationship 2020-04-18 12:43:01 +02:00
a4213198ba Merge branch '53-users-can-create-scenes' into 'dev'
Resolve "Users can create scenes"

Closes #53

See merge request sa4-2020/the-sanmarinoes/backend!74
2020-04-18 12:42:03 +02:00