0031fe38ea
Merge branch 'controller-tests' into 'dev'
...
Added example tests for SensorController
See merge request sa4-2020/the-sanmarinoes/backend!140
2020-05-13 12:14:20 +02:00
Claudio Maggioni (maggicl)
3ed6102b9f
Added example tests for SensorController
2020-05-13 12:10:06 +02:00
ba9001a9c8
Merge branch 'sonar-fix' into 'dev'
...
Degenerified states
See merge request sa4-2020/the-sanmarinoes/backend!139
2020-05-12 18:37:08 +02:00
acec5a0af8
Degenerified states
2020-05-12 18:32:23 +02:00
c9fbffea7a
Merge branch 'sonar-fix' into 'dev'
...
Removed @NotNull from models
See merge request sa4-2020/the-sanmarinoes/backend!138
2020-05-12 17:23:07 +02:00
6223434979
Removed duplication
2020-05-12 17:20:19 +02:00
0d10d759a6
Removed @NotNull from models
2020-05-12 17:14:25 +02:00
74270269ca
Merge branch 'sonar-fix' into 'dev'
...
More lombok-ification
See merge request sa4-2020/the-sanmarinoes/backend!137
2020-05-12 17:02:59 +02:00
582f44581b
More lombok-ification
2020-05-12 16:59:46 +02:00
328ad4e882
Merge branch 'sonar-fix' into 'dev'
...
Added lombok and converted DTOs
See merge request sa4-2020/the-sanmarinoes/backend!136
2020-05-12 15:49:54 +02:00
3bb008517a
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into sonar-fix
2020-05-12 15:46:23 +02:00
87df96760d
Added lombok and converted DTOs
2020-05-12 15:44:32 +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
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
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
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
britea
501b9219b9
resolve conflict
2020-05-08 10:03:31 +02:00
