Jacob Salvi
b4bf15583a
a couple of tests
2020-05-13 09:42:36 +02:00
Jacob Salvi
c614f96b31
Merge remote-tracking branch 'origin/dev' into dev
2020-05-10 21:54:18 +02:00
6e207a34c9
Merge branch 'sonar-fix' into 'dev'
...
Degenerified Conditions
See merge request sa4-2020/the-sanmarinoes/backend!135
2020-05-10 21:49:14 +02:00
Claudio Maggioni (maggicl)
c6041e0e0f
Degenerified Conditions
2020-05-10 21:44:10 +02:00
c003bd1e87
Merge branch '55-users-can-add-conditions-to-automations' into 'dev'
...
Resolve "Users can add conditions to automations"
Closes #55
See merge request sa4-2020/the-sanmarinoes/backend!133
2020-05-10 21:30:39 +02:00
Claudio Maggioni (maggicl)
0ba0d10cdc
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 55-users-can-add-conditions-to-automations
2020-05-10 21:26:42 +02:00
d0fa87e9c3
Merge branch 'sonar-fix' into 'dev'
...
Even another batch of sonar fixes
See merge request sa4-2020/the-sanmarinoes/backend!134
2020-05-10 20:50:22 +02:00
Claudio Maggioni (maggicl)
5e1b07d32f
Even another batch of sonar fixes
2020-05-10 20:47:18 +02:00
Jacob Salvi
1b22534f40
room and thermostat tests
2020-05-10 15:17:27 +02:00
fe7e004494
Merge branch 'sonar-fix' into 'dev'
...
Even another batch of sonar fixes
See merge request sa4-2020/the-sanmarinoes/backend!132
2020-05-10 12:51:23 +02:00
Claudio Maggioni (maggicl)
573a5c6a91
Fixing confirmationTokenRepository and deleted generic parameter on children of trigger
2020-05-10 12:48:41 +02:00
Claudio Maggioni (maggicl)
b64979500b
Even another batch of sonar fixes
2020-05-10 12:39:18 +02:00
2976212f18
Merge branch 'sonar-fix' into 'dev'
...
Even another batch of sonar fixes
See merge request sa4-2020/the-sanmarinoes/backend!131
2020-05-10 12:13:28 +02:00
Claudio Maggioni (maggicl)
9394a8439f
Even another batch of sonar fixes
2020-05-10 12:09:53 +02:00
Jacob Salvi
1d422ec420
Merge remote-tracking branch 'origin/dev' into dev
2020-05-10 10:34:46 +02:00
4b10466f1a
Merge branch 'sonar-fix' into 'dev'
...
Even another batch of sonar fixes
See merge request sa4-2020/the-sanmarinoes/backend!130
2020-05-10 00:41:06 +02:00
Claudio Maggioni (maggicl)
483a42b1e0
Even another batch of sonar fixes
2020-05-10 00:38:13 +02:00
5cbbbfed31
Merge branch 'sonar-fix' into 'dev'
...
Sonarqube fixes to tests
See merge request sa4-2020/the-sanmarinoes/backend!129
2020-05-09 19:21:31 +02:00
5d4aea2e56
Sonarqube fixes to tests
2020-05-09 19:16:23 +02:00
1e99f5a501
Merge branch 'sonar-fix' into 'dev'
...
Sonarqube fixes
See merge request sa4-2020/the-sanmarinoes/backend!128
2020-05-09 17:54:25 +02:00
bd47a571d5
Sonarqube fixes
2020-05-09 17:53:58 +02:00
d39424c623
Merge branch 'sonar-fix' into 'dev'
...
Sonarqube fixes
See merge request sa4-2020/the-sanmarinoes/backend!127
2020-05-09 17:44:59 +02:00
b4ded92695
Sonarqube fixes
2020-05-09 17:44:38 +02:00
omenem
a24b30ce19
fix in automation repo
2020-05-09 16:55:47 +02:00
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
