britea
501b9219b9
resolve conflict
2020-05-08 10:03:31 +02:00
britea
c9f53f0c97
fix thermostat
2020-05-08 09:59:42 +02:00
omenem
09c08580ca
Everything should be implemented
2020-05-07 19:01:35 +02:00
omenem
1bde4344be
Added controllers repos and dtos
2020-05-07 18:12:55 +02:00
omenem
1f5f948e23
wip
2020-05-07 16:38:45 +02:00
Luca Ponzanelli
7c1d010805
Merge branch '73-setup-sonarqube-pipeline-for-development-branch' into 'dev'
...
Resolve "Setup SonarQube pipeline for development branch"
Closes #73
See merge request sa4-2020/the-sanmarinoes/backend!117
2020-05-07 13:52:34 +02:00
Luca Ponzanelli
317ddb5445
Issue #73 : fix CI_PROJECT_PATH_SLUG env variable name
2020-05-07 13:49:32 +02:00
Luca Ponzanelli
b5def1b50d
Merge branch '73-setup-sonarqube-pipeline-for-development-branch' into 'dev'
...
Resolve "Setup SonarQube pipeline for development branch"
Closes #73
See merge request sa4-2020/the-sanmarinoes/backend!116
2020-05-07 13:39:09 +02:00
Luca Ponzanelli
028983072d
Resolve "Setup SonarQube pipeline for development branch"
...
- Remove de.aaschmid.cpd, and sonarqube v2.7 gradle plugins
- Add sonarqube and jacopo gradle plugins
- Remove code_quality job and add sonarqube job in code_quality stage
- Limit sonarqube analysis to dev branch only
2020-05-07 13:39:08 +02:00
5a31f4cf98
Merge branch 'sonar-test' into 'dev'
...
on error fixing for sonarqube code smells and vulnerabilities check
See merge request sa4-2020/the-sanmarinoes/backend!115
2020-05-07 10:39:18 +02:00
Claudio Maggioni (maggicl)
c8ebd8f917
WIP on error fixing for sonarqube code smells and vulnerabilities check
2020-05-07 10:33:20 +02:00
omenem
74364effe6
wip
2020-05-07 10:04:05 +02:00
omenem
6060e627dd
wip
2020-05-07 10:01:51 +02:00
3f6dd4c02c
Merge branch 'mailmap-fix' into 'dev'
...
Added updated mailmap for everyone in the repo
See merge request sa4-2020/the-sanmarinoes/backend!114
2020-05-06 12:11:11 +02:00
Claudio Maggioni (maggicl)
29d1022700
Added updated mailmap for everyone in the repo
2020-05-06 12:10:45 +02:00
5649ca9c29
Merge branch 'scene-guest-fix' into 'dev'
...
Scene guest fix
See merge request sa4-2020/the-sanmarinoes/backend!113
2020-05-05 16:36:16 +02:00
ddcdaccbe0
Check Scene.guestAccessEnabled flag on guest application of scene
2020-05-05 16:31:54 +02:00
Jacob Salvi
912d81e84f
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
2020-05-05 14:24:03 +02:00
38c703e521
Merge branch '69-7-fixes-to-guest-user-story' into 'dev'
...
Resolve "7: fixes to guest user story"
Closes #69
See merge request sa4-2020/the-sanmarinoes/backend!112
2020-05-04 17:15:29 +02:00
Claudio Maggioni (maggicl)
a278a9f7b3
Reviewed GET /scene?hostId= and GET /scene/{sceneId}/apply?hostId=
2020-05-04 17:11:59 +02:00
Claudio Maggioni (maggicl)
c24598cc6a
Done security camera filtering if required by host
2020-05-04 16:35:46 +02:00
1ddc8f5ba6
Merge branch '71-when-creating-a-scene-users-can-t-copy-the-configuration-from-another-scene' into 'dev'
...
Resolve "When creating a scene, users can't copy the configuration from another scene."
Closes #71
See merge request sa4-2020/the-sanmarinoes/backend!111
2020-05-04 16:14:22 +02:00
Claudio Maggioni (maggicl)
16d1af2b36
Scene copy implemented
2020-05-04 16:10:17 +02:00
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
