|
|
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 |
|
Claudio Maggioni (maggicl)
|
61ff797ea1
|
Fixes to Scene implementation
|
2020-04-18 12:38:52 +02:00 |
|
omenem
|
e79ab46cb8
|
added sceneBinding method in cotrollers of output devices
|
2020-04-18 10:54:53 +02:00 |
|
Claudio Maggioni (maggicl)
|
f565a3be6e
|
Added documentation to Device.cloneState()
|
2020-04-17 21:12:33 +02:00 |
|
Claudio Maggioni (maggicl)
|
4aa4d68738
|
Fix on thermostat
|
2020-04-17 21:05:17 +02:00 |
|
Claudio Maggioni (maggicl)
|
57a6e22e2a
|
Corrections on Scene controllers and method cloneState on all OutputDevices
|
2020-04-17 20:54:09 +02:00 |
|
Claudio Maggioni (maggicl)
|
2bfff689b3
|
Simplified Models for States
|
2020-04-17 20:22:28 +02:00 |
|
Claudio Maggioni (maggicl)
|
7bb4cd34e1
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 53-users-can-create-scenes
|
2020-04-17 19:19:46 +02:00 |
|
Claudio Maggioni (maggicl)
|
fefd073534
|
Converted thermostat to dimmable state and fixed errors on generics
|
2020-04-17 19:09:32 +02:00 |
|
omenem
|
3cedaf5f50
|
Fix
|
2020-04-17 18:28:42 +02:00 |
|
omenem
|
80088c0dc3
|
State controller, saveRequest and Repository
|
2020-04-17 18:13:46 +02:00 |
|
omenem
|
e3aa44435e
|
Scene Controller, saveRequest and Repository
|
2020-04-17 17:03:21 +02:00 |
|
|
|
895c5015b1
|
Merge branch '58-allow-many-input-devices-to-connect-to-many-output-devices' into 'dev'
Resolve "Allow many input devices to connect to many output devices"
Closes #58
See merge request sa4-2020/the-sanmarinoes/backend!78
|
2020-04-16 18:38:28 +02:00 |
|
Claudio Maggioni (maggicl)
|
ff5dadd128
|
fixed tests
|
2020-04-16 18:34:17 +02:00 |
|
Claudio Maggioni (maggicl)
|
cde88f2ca9
|
Added new hierarchy for dimmable devices and removed duplications in controllers and dtos
|
2020-04-16 18:28:33 +02:00 |
|
Claudio Maggioni (maggicl)
|
7cbacd7406
|
Implemented Many-to-Many behaviour for Switches and Dimmers
|
2020-04-16 17:43:25 +02:00 |
|
Claudio Maggioni (maggicl)
|
495c317eb8
|
Added apply() method on State to change underlying device accordingly
|
2020-04-15 23:10:05 +02:00 |
|
|
|
6be999ffcc
|
Created models for scenes and states
|
2020-04-15 18:02:24 +02:00 |
|
|
|
1fe31c0d46
|
Merge branch 'thermostat-feature' into 'dev'
Thermostat feature
See merge request sa4-2020/the-sanmarinoes/backend!77
|
2020-04-15 18:00:03 +02:00 |
|
|
|
646672e3db
|
Code review for Thermostat
|
2020-04-15 17:55:04 +02:00 |
|
|
|
9088a765b8
|
Merge branch '52-security-cameras' into 'dev'
Resolve "Users can add security camera in a room"
Closes #52
See merge request sa4-2020/the-sanmarinoes/backend!76
|
2020-04-15 17:06:30 +02:00 |
|
|
|
cddf718767
|
Code review for SecurityCamera
|
2020-04-15 17:00:16 +02:00 |
|
|
|
afea11931f
|
Merge branch '51-users-can-add-smart-curtains-blinds' into 'dev'
Resolve "Users can add smart curtains/blinds"
Closes #51
See merge request sa4-2020/the-sanmarinoes/backend!70
|
2020-04-15 16:43:06 +02:00 |
|
|
|
d964f8846f
|
Code review for Curtains
|
2020-04-15 16:38:02 +02:00 |
|
|
|
a8ad054a13
|
Merge branch 'master' into 'dev'
Master
See merge request sa4-2020/the-sanmarinoes/backend!75
|
2020-04-15 16:24:09 +02:00 |
|
|
|
0e924c088b
|
thermostat should be finished
|
2020-04-15 15:10:02 +02:00 |
|
Claudio Maggioni (maggicl)
|
44321fe153
|
wip
|
2020-04-15 14:10:40 +02:00 |
|
Claudio Maggioni (maggicl)
|
74b32cea83
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into thermostat-feature
|
2020-04-15 13:54:59 +02:00 |
|
Claudio Maggioni (maggicl)
|
8d53bee294
|
WIP on average temperature computation
|
2020-04-14 13:24:36 +02:00 |
|
|
|
4c4297dfdf
|
wip, to fix
|
2020-04-13 16:42:48 +02:00 |
|
omenem
|
2b93ffa07b
|
Minor Changes
|
2020-04-13 15:44:47 +02:00 |
|
|
|
0b1170404d
|
almost finished thermostat
|
2020-04-13 15:36:29 +02:00 |
|
omenem
|
8d0ec2ea63
|
Minor Changes
|
2020-04-13 15:10:05 +02:00 |
|
omenem
|
b3b7afea2a
|
Minor Changes
|
2020-04-12 18:45:32 +02:00 |
|
omenem
|
e5011110e7
|
Added fields tags (@NotNull etc...) also so CurtainSaveRequest
|
2020-04-12 18:35:22 +02:00 |
|
|
|
9947abee4b
|
Merge branch 'socket-fix' into 'dev'
Adapted websocket code to new redux specification
See merge request sa4-2020/the-sanmarinoes/backend!73
|
2020-04-12 17:52:33 +02:00 |
|
Claudio Maggioni (maggicl)
|
68f9b352cd
|
Updaed websocket to perform batch updates
|
2020-04-12 17:47:03 +02:00 |
|
Claudio Maggioni (maggicl)
|
8629c1f6b4
|
Adapted websocket code to new redux specification
|
2020-04-12 15:58:40 +02:00 |
|
|
|
82419d3368
|
Merge branch 'knob-dimmer-fix' into 'dev'
Added intensity to knob-dimmer
See merge request sa4-2020/the-sanmarinoes/backend!72
|
2020-04-11 18:35:40 +02:00 |
|
britea
|
ad4a5a9c17
|
Added intensity to knob-dimmer
|
2020-04-11 18:30:47 +02:00 |
|
|
|
9575018b2e
|
Merge branch '57-change-input-output-connection-routes' into 'dev'
Resolve "Change input/output connection routes"
Closes #57
See merge request sa4-2020/the-sanmarinoes/backend!71
|
2020-04-11 17:28:39 +02:00 |
|
|
|
e46ac02da5
|
Input output connection routes now accept array of outputs
|
2020-04-11 17:24:23 +02:00 |
|
omenem
|
0872d7654f
|
4 attempt to pass pipeline
|
2020-04-09 15:38:03 +02:00 |
|
|
|
7bda571a27
|
thermostat in an entity now
|
2020-04-09 15:25:34 +02:00 |
|
omenem
|
79b39de6bb
|
3 attempt to pass pipeline
|
2020-04-09 15:25:17 +02:00 |
|
Jacob Salvi
|
831a2d07c6
|
removed id from Curtains.java
|
2020-04-09 15:17:20 +02:00 |
|
