smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • 74fee11814 Merge branch 'fix' into 'dev' Claudio Maggioni 2020-04-28 10:48:31 +0200
  • cfa2f794cb fix Claudio Maggioni (maggicl) 2020-04-28 10:48:09 +0200
  • f8989f7bc5 Merge branch 'dev' into 'master' Claudio Maggioni 2020-04-28 10:14:10 +0200
  • f7f7d3a2a9 Merge branch 'fix' into 'dev' Claudio Maggioni 2020-04-28 10:05:34 +0200
  • ba73348a74 fixz Claudio Maggioni (maggicl) 2020-04-28 10:05:08 +0200
  • 9f7319a25b Merge branch 'dev' into 'master' M2 Claudio Maggioni 2020-04-28 09:34:16 +0200
  • 36c921320b Merge remote-tracking branch 'origin/dev' into dev Jacob Salvi 2020-04-28 08:27:51 +0200
  • 3118c07a83 Merge branch '67-fix-in-thermostat-missing-field-in-saverequest' into 'dev' Matteo Omenetti 2020-04-27 19:09:20 +0200
  • 5fc63edf4f fix omenem 2020-04-27 19:04:52 +0200
  • 3af4b24a12 Merge branch '66-fix-in-thermostat' into 'dev' Matteo Omenetti 2020-04-27 19:03:07 +0200
  • cf06950b62 fix omenem 2020-04-27 18:59:01 +0200
  • 3df6812b1f Merge branch 'fix4867594w867593428574ew' into 'dev' Claudio Maggioni 2020-04-27 18:55:45 +0200
  • eacc77fa43 fix Claudio Maggioni 2020-04-27 18:51:55 +0200
  • 57fdb8eacd Merge remote-tracking branch 'origin/dev' into dev Jacob Salvi 2020-04-27 17:58:20 +0200
  • 79c0cd0fc1 Merge branch 'fix_automations' into 'dev' Claudio Maggioni 2020-04-27 17:04:20 +0200
  • c1147f02ae fixed some stuff not working on automations Christian Capeáns Pérez 2020-04-27 17:03:17 +0200
  • 60c057ce5b Merge branch 'socket-fix' into 'dev' Claudio Maggioni 2020-04-27 14:30:11 +0200
  • 579dcaacfd fix @SocketGsonExclude on device and children Claudio Maggioni (maggicl) 2020-04-27 14:28:34 +0200
  • fb229b03f0 Merge branch '65-fix-in-automation-controller' into 'dev' Matteo Omenetti 2020-04-27 14:00:47 +0200
  • 719bde0840 fix omenem 2020-04-27 13:55:59 +0200
  • 27de35acf0 Merge branch '64-fix-in-sceneprioritycontroller' into 'dev' Matteo Omenetti 2020-04-27 11:59:14 +0200
  • cc2a16f3e3 fix omenem 2020-04-27 11:54:31 +0200
  • 15c6e99e4e Merge branch '63-fix-table-relation-in-trigger' into 'dev' Matteo Omenetti 2020-04-26 14:01:16 +0200
  • 06dbd2bef0 fix omenem 2020-04-26 13:57:30 +0200
  • 0383a547c1 Merge branch '62-fix-constraints-in-trigger' into 'dev' Matteo Omenetti 2020-04-26 13:33:38 +0200
  • e3d7908537 Merge remote-tracking branch 'origin/dev' into dev Jacob Salvi 2020-04-26 13:32:35 +0200
  • c9395404e0 fix omenem 2020-04-26 13:29:14 +0200
  • 46bb2e7d26 Merge branch '61-add-get-request-for-one-automation' into 'dev' Matteo Omenetti 2020-04-26 12:17:21 +0200
  • 10dc0c9741 new route fix omenem 2020-04-26 12:13:46 +0200
  • 8be7b2c263 Merge branch 'name-fix' into 'dev' Claudio Maggioni 2020-04-25 22:52:14 +0200
  • be7c9ce99f fix duplicate device names Claudio Maggioni (maggicl) 2020-04-25 22:51:30 +0200
  • dbf9ef885b Merge branch 'fix' into 'dev' Claudio Maggioni 2020-04-25 16:34:16 +0200
  • c5aab751df fix update sensor Nicola Brunner 2020-04-25 16:33:00 +0200
  • ca05c0a596 Merge branch '60-we-forgot-the-controllers-for-automations-and-scenepriority-as-well-s-the-dtos' into 'dev' Matteo Omenetti 2020-04-25 16:23:58 +0200
  • d61c7bbc0b controller for triggers omenem 2020-04-25 15:59:06 +0200
  • db35205ed8 controller for scenePriority omenem 2020-04-25 15:20:00 +0200
  • 5eadb2314c wip omenem 2020-04-25 15:00:22 +0200
  • 509d890c7e Controllers for automation omenem 2020-04-25 14:56:07 +0200
  • 886f43bf62 small fix to thermostat controller Jacob Salvi 2020-04-25 14:38:47 +0200
  • fc25177a69 Merge branch '59-fix-scene-repository-2' into 'dev' Matteo Omenetti 2020-04-24 23:13:34 +0200
  • 24804d2d82 fix scene repository britea 2020-04-24 23:09:31 +0200
  • 6a90f478d1 Merge branch 'fix' into 'dev' Claudio Maggioni 2020-04-23 17:11:26 +0200
  • 54c27921d9 Fixed DeviceService Claudio Maggioni 2020-04-23 17:10:59 +0200
  • df8a9e6449 Merge branch '54-users-can-create-basic-automations' into 'dev' Claudio Maggioni 2020-04-23 11:20:55 +0200
  • 3da04ccaef Fixed user story 5 and 7 Claudio Maggioni (maggicl) 2020-04-23 11:17:46 +0200
  • 7ebf74a4c8 WIP merge with dev Claudio Maggioni (maggicl) 2020-04-22 23:11:32 +0200
  • 37ea9591cf Code review Claudio Maggioni (maggicl) 2020-04-22 23:04:43 +0200
  • 8a1dc8674a Merge branch '56-users-can-invite-guests' into 'dev' Claudio Maggioni 2020-04-22 22:58:11 +0200
  • 3894fa14a9 Code review Claudio Maggioni (maggicl) 2020-04-22 22:54:34 +0200
  • 389af7c04d all device controllers have been updated with device service tommi27 2020-04-22 18:13:06 +0200
  • 570b1e8b29 wip, implemented very long stream in DeviceService, SceneService is missing though omenem 2020-04-22 17:30:16 +0200
  • c6d5a1acd7 controllers fixed and updated for guest or host checks tommi27 2020-04-22 17:17:07 +0200
  • 5c2f828834 wid, added implements keyword for Boolean/RangeTriggerable in all the devices omenem 2020-04-22 16:48:49 +0200
  • a428d57fe1 WIP: controllers check for owner or guest, device service needs review tommi27 2020-04-22 15:30:23 +0200
  • db21aa0a26 Code review Claudio Maggioni 2020-04-21 17:36:17 +0200
  • c4f295d7d9 refactored controllers code tommi27 2020-04-21 17:09:11 +0200
  • 4357606187 Code review Claudio Maggioni (maggicl) 2020-04-21 16:58:12 +0200
  • 618c152466 wip omenem 2020-04-21 15:21:47 +0200
  • eef0887da1 Code review Claudio Maggioni (maggicl) 2020-04-21 14:57:11 +0200
  • 0692f7e2ee wip omenem 2020-04-21 14:45:04 +0200
  • 6317ac99e4 Code review Claudio Maggioni (maggicl) 2020-04-21 14:25:42 +0200
  • cfe3848d7e Done method to get dimmable light if owner or guest Claudio Maggioni (maggicl) 2020-04-21 14:06:56 +0200
  • db102f75e4 light and room controller routes check for guest authorization tommi27 2020-04-20 16:41:11 +0200
  • 319629a681 Pseudocode for automation implemmentation Claudio Maggioni (maggicl) 2020-04-20 14:14:04 +0200
  • 5c0df55de9 wip omenem 2020-04-20 13:47:27 +0200
  • 7b80b52f9e guest controller should be finished, must be reviewed tommi27 2020-04-19 17:10:42 +0200
  • 36a7a649d5 started guest controllers (WIP) tommi27 2020-04-18 17:35:14 +0200
  • 566a2e72e3 invited model finally works tommi27 2020-04-18 15:35:04 +0200
  • 262dbf12e7 hopefully fixed invited relationship II: The Revenge tommi27 2020-04-18 14:52:11 +0200
  • d2aaa45a8b hopefully fixed invited relationship tommi27 2020-04-18 14:11:21 +0200
  • 6e36d7d306 updated onetomany relationship tommi27 2020-04-17 15:24:06 +0200
  • 3921fe1330 started invitation relationship tommi27 2020-04-17 14:58:26 +0200
  • a4213198ba Merge branch '53-users-can-create-scenes' into 'dev' Claudio Maggioni 2020-04-18 12:42:03 +0200
  • 61ff797ea1 Fixes to Scene implementation Claudio Maggioni (maggicl) 2020-04-18 12:38:52 +0200
  • e79ab46cb8 added sceneBinding method in cotrollers of output devices omenem 2020-04-18 10:54:53 +0200
  • f565a3be6e Added documentation to Device.cloneState() Claudio Maggioni (maggicl) 2020-04-17 21:12:33 +0200
  • 4aa4d68738 Fix on thermostat Claudio Maggioni (maggicl) 2020-04-17 21:05:17 +0200
  • 57a6e22e2a Corrections on Scene controllers and method cloneState on all OutputDevices Claudio Maggioni (maggicl) 2020-04-17 20:54:09 +0200
  • 2bfff689b3 Simplified Models for States Claudio Maggioni (maggicl) 2020-04-17 20:20:12 +0200
  • 7bb4cd34e1 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 53-users-can-create-scenes Claudio Maggioni (maggicl) 2020-04-17 19:19:46 +0200
  • fefd073534 Converted thermostat to dimmable state and fixed errors on generics Claudio Maggioni (maggicl) 2020-04-17 19:09:32 +0200
  • 3cedaf5f50 Fix omenem 2020-04-17 18:28:42 +0200
  • 80088c0dc3 State controller, saveRequest and Repository omenem 2020-04-17 18:13:46 +0200
  • e3aa44435e Scene Controller, saveRequest and Repository omenem 2020-04-17 17:03:21 +0200
  • 895c5015b1 Merge branch '58-allow-many-input-devices-to-connect-to-many-output-devices' into 'dev' Claudio Maggioni 2020-04-16 18:38:28 +0200
  • ff5dadd128 fixed tests Claudio Maggioni (maggicl) 2020-04-16 18:34:17 +0200
  • cde88f2ca9 Added new hierarchy for dimmable devices and removed duplications in controllers and dtos Claudio Maggioni (maggicl) 2020-04-16 18:28:33 +0200
  • 7cbacd7406 Implemented Many-to-Many behaviour for Switches and Dimmers Claudio Maggioni (maggicl) 2020-04-16 17:43:25 +0200
  • 495c317eb8 Added apply() method on State to change underlying device accordingly Claudio Maggioni (maggicl) 2020-04-15 23:08:57 +0200
  • 6be999ffcc Created models for scenes and states Claudio Maggioni 2020-04-15 16:21:39 +0200
  • 1fe31c0d46 Merge branch 'thermostat-feature' into 'dev' Claudio Maggioni 2020-04-15 18:00:03 +0200
  • 646672e3db Code review for Thermostat Claudio Maggioni 2020-04-15 17:55:04 +0200
  • 9088a765b8 Merge branch '52-security-cameras' into 'dev' Claudio Maggioni 2020-04-15 17:06:30 +0200
  • cddf718767 Code review for SecurityCamera Claudio Maggioni 2020-04-15 17:00:16 +0200
  • afea11931f Merge branch '51-users-can-add-smart-curtains-blinds' into 'dev' Claudio Maggioni 2020-04-15 16:43:06 +0200
  • d964f8846f Code review for Curtains Claudio Maggioni 2020-04-15 16:36:51 +0200
  • a8ad054a13 Merge branch 'master' into 'dev' Claudio Maggioni 2020-04-15 16:24:09 +0200
  • 0e924c088b thermostat should be finished tommi27 2020-04-15 15:10:02 +0200
  • 44321fe153 wip Claudio Maggioni (maggicl) 2020-04-15 14:10:40 +0200
  • 74b32cea83 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into thermostat-feature Claudio Maggioni (maggicl) 2020-04-15 13:54:59 +0200