b3b701b612
Merge branch 'sonar-fix' into 'dev'
...
Fixed circular dependency on switch connector
See merge request sa4-2020/the-sanmarinoes/backend!126
2020-05-09 14:24:00 +02:00
Claudio Maggioni (maggicl)
15faf0a6b4
Fixed circular dependency on switch connector
2020-05-09 14:23:39 +02:00
62d2c8d027
Merge branch 'sonar-fix' into 'dev'
...
More sonarqube fixes
See merge request sa4-2020/the-sanmarinoes/backend!125
2020-05-09 14:06:01 +02:00
Claudio Maggioni (maggicl)
191870d3c6
More sonarqube fixes
2020-05-09 14:05:43 +02:00
6fce31d1bf
Merge branch 'sonar-fix' into 'dev'
...
Minor code style fixes and global formatter run
See merge request sa4-2020/the-sanmarinoes/backend!124
2020-05-09 13:42:35 +02:00
Claudio Maggioni (maggicl)
6e98972a5b
Minor code style fixes and global formatter run
2020-05-09 13:42:17 +02:00
bc82532691
Merge branch 'sonar-fix' into 'dev'
...
Even more Sonarqube fixes
See merge request sa4-2020/the-sanmarinoes/backend!123
2020-05-09 13:29:22 +02:00
Claudio Maggioni (maggicl)
204f7bf423
Even more Sonarqube fixes
2020-05-09 13:29:03 +02:00
7ab70976c9
Merge branch 'sonar-fix' into 'dev'
...
Fixed very severe security vulnerability (Use logger instead of System.out in SensorSocketEndpoint)
See merge request sa4-2020/the-sanmarinoes/backend!122
2020-05-09 13:18:50 +02:00
Claudio Maggioni (maggicl)
ba02475c83
Fixed very severe security vulnerability (Use logger instead of System.out in SensorSocketEndpoint)
2020-05-09 13:18:33 +02:00
f7927887b8
Merge branch 'sonar-fix' into 'dev'
...
more Sonarqube fixes
See merge request sa4-2020/the-sanmarinoes/backend!121
2020-05-09 13:13:53 +02:00
Claudio Maggioni (maggicl)
bd32a2aebb
more Sonarqube fixes
2020-05-09 13:13:31 +02:00
Jacob Salvi
5bfb7888c2
Merge remote-tracking branch 'origin/dev' into dev
2020-05-09 11:11:11 +02:00
774bbc5ab9
Merge branch 'sonar-fix' into 'dev'
...
Sonarqube fixes
See merge request sa4-2020/the-sanmarinoes/backend!120
2020-05-08 23:18:45 +02:00
Claudio Maggioni (maggicl)
a61e43a014
Sonarqube fixes
2020-05-08 23:18:18 +02:00
omenem
628edfd76f
edited GSONConfig
2020-05-08 17:50:59 +02:00
omenem
b72f527b0d
Added conditions in PUT automation/fast
2020-05-08 17:44:30 +02:00
b2f4805ef3
Merge branch '74-thermostat-fix' into 'dev'
...
Resolve "thermostat-fix"
Closes #74
See merge request sa4-2020/the-sanmarinoes/backend!119
2020-05-08 16:10:13 +02:00
Jacob Salvi
d4a0f195ad
Merge remote-tracking branch 'origin/dev' into dev
2020-05-08 14:58:32 +02:00
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
