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
omenem
83c2554f29
2 attempt to fix pipeline
2020-04-09 15:12:25 +02:00
Jacob Salvi
7f34e2b391
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 51-users-can-add-smart-curtains-blinds
...
# Conflicts:
# .gitlab-ci.yml
2020-04-09 14:27:12 +02:00
Jacob Salvi
290927ff1f
Added curtains
2020-04-09 14:07:41 +02:00
Jacob Salvi
e5d3c95f3e
Added curtains
2020-04-09 14:01:40 +02:00
Jacob Salvi
bdf0f87d77
Added curtains
2020-04-09 13:41:58 +02:00
omenem
9e49da0d00
first fix to try making the pipeline pass
2020-04-09 12:27:04 +02:00
omenem
66bcecdbe0
added security camera device
2020-04-09 12:13:32 +02:00
7cfb2ffc73
Added thermostat, not complete
2020-04-09 11:30:05 +02:00
fc4fcf0552
Merge branch 'fix-properties' into 'master'
...
fix
See merge request sa4-2020/the-sanmarinoes/backend!68
2020-03-26 11:21:01 +01:00
13db88b810
fix
2020-03-26 11:17:42 +01:00
1724589135
Merge branch 'dev' into 'master'
...
Milestone 1 deployment (attempt 1)
See merge request sa4-2020/the-sanmarinoes/backend!67
2020-03-26 10:37:00 +01:00
d979050306
Merge branch 'cose' into 'dev'
...
fixed cors on password reset
See merge request sa4-2020/the-sanmarinoes/backend!66
2020-03-26 01:05:24 +01:00
802cee52f8
fixed cors on password reset
2020-03-26 01:01:49 +01:00
3ccdad8202
Merge branch 'cose' into 'dev'
...
Fixed ConcurrentModificationException on socket broadcast
See merge request sa4-2020/the-sanmarinoes/backend!65
2020-03-25 23:16:14 +01:00
6c9e2a7d7d
Fixed ConcurrentModificationException on socket broadcast
2020-03-25 23:13:17 +01:00
1d18d9ae85
Merge branch 'cose' into 'dev'
...
Added /auth/profile
See merge request sa4-2020/the-sanmarinoes/backend!64
2020-03-25 22:45:27 +01:00
27cb73292c
Added /auth/profile
2020-03-25 22:41:59 +01:00
b732d70ffd
Merge branch 'cose' into 'dev'
...
fixed dimmable light
See merge request sa4-2020/the-sanmarinoes/backend!63
2020-03-25 22:38:47 +01:00
c5996608a4
fixed dimmable light
2020-03-25 22:34:15 +01:00
3518647eeb
Merge branch '48-redirection-to-frontend-after-email-confirmation-operations-password-reset-and-email' into 'dev'
...
Resolve "Redirection to frontend after email confirmation operations (password reset and email)"
Closes #48
See merge request sa4-2020/the-sanmarinoes/backend!62
2020-03-25 20:29:48 +01:00
b9221cecc6
fixed application.properties for tests
2020-03-25 20:21:54 +01:00
b283a62d0d
fixed redirects
2020-03-25 17:31:24 +01:00
334d35a4cc
Merge branch '49-fix-bug' into 'dev'
...
Fixed @tommi27 synchronization frenzy for sensors
Closes #49
See merge request sa4-2020/the-sanmarinoes/backend!61
2020-03-25 17:28:11 +01:00
britea
60c17b3dd8
Fixed @tommi27 synchronization frenzy for sensors
...
I have now discovered the Schadenfreude in using git-blame. To quote an
old commit message from high school:
[Trascrizione domande fisica e correzione di GRAVISSIMI bug presenti nel
codici di Maggioni](dd0933def0
2020-03-25 17:10:27 +01:00
Matteo Omenetti
03bbf6b824
Merge branch '47-fix-cascade-deletion-when-room-is-deleted' into 'dev'
...
Resolve "Fix cascade deletion when room is deleted"
Closes #47
See merge request sa4-2020/the-sanmarinoes/backend!59
2020-03-25 15:08:39 +01:00
5f26a94052
Merge branch '41-docker-how-to-for-app-usage' into 'dev'
...
Resolve "Docker how-to for app usage"
Closes #41
See merge request sa4-2020/the-sanmarinoes/backend!58
2020-03-25 15:06:44 +01:00
omenem
6ce44e73ff
fix min intensity of dimmabke light of 1 in Dimmable Save Request
2020-03-25 14:58:56 +01:00
4281cbaf29
Added installation instructions and tweaked Dockerfile
2020-03-25 14:57:46 +01:00
Matteo Omenetti
c8121d8473
Merge branch '45-solve-concurrency-issues-with-socket-updates-from-sensorsocket' into 'dev'
...
Resolve "Solve concurrency issues with socket updates from SensorSocket"
Closes #45
See merge request sa4-2020/the-sanmarinoes/backend!57
2020-03-25 14:53:44 +01:00
e776b9c2e5
socket is now sequential and not concurrent
2020-03-25 14:50:05 +01:00
omenem
9fc0224b1d
fix room deletion
2020-03-25 14:14:12 +01:00
Jacob Salvi
8179e0ff19
testing junit viewer 3
2020-03-24 17:09:45 +01:00
Jacob Salvi
9c471294ba
testing junit viewer 2
2020-03-24 17:04:11 +01:00
Matteo Omenetti
bcade19f52
Merge branch '44-delete-cascade-when-room-is-deleted' into 'dev'
...
delete cascade in room
Closes #44
See merge request sa4-2020/the-sanmarinoes/backend!56
2020-03-24 16:03:33 +01:00
omenem
08c4ef49a7
delete cascade in room
2020-03-24 15:58:01 +01:00
Jacob Salvi
1d491dc32e
testing junit viewer
2020-03-24 15:51:33 +01:00
Matteo Omenetti
bbfb9f8fcb
Merge branch '43-delete-cascade-in-switch' into 'dev'
...
delete cascade no more in switch
Closes #43
See merge request sa4-2020/the-sanmarinoes/backend!55
2020-03-23 18:35:11 +01:00
omenem
f368084464
delete cascade no more in switch
2020-03-23 18:31:46 +01:00
Matteo Omenetti
9ed2c66b54
Merge branch '40-on-delete-set-null-must-be-set-in-sql-schema' into 'dev'
...
delete cascade no more
Closes #40
See merge request sa4-2020/the-sanmarinoes/backend!54
2020-03-23 17:57:23 +01:00
omenem
c17b6df3b5
delete cascade no more
2020-03-23 17:53:22 +01:00
b9320ea078
Merge branch 'room-update-fix' into 'dev'
...
RoomController PUT fixed
See merge request sa4-2020/the-sanmarinoes/backend!53
2020-03-23 16:46:22 +01:00
f4d6a3f3c7
RoomController PUT fixed
2020-03-23 16:42:33 +01:00
Matteo Omenetti
1204451e47
Merge branch '42-fix-missing-id-in-roomsaverequest' into 'dev'
...
fix of missing id
Closes #42
See merge request sa4-2020/the-sanmarinoes/backend!52
2020-03-22 18:24:45 +01:00
omenem
8813942cc5
fixxed
2020-03-22 18:19:41 +01:00
1c8c4b61d9
Merge branch '39-kind-name-on-device-does-not-match-route-name' into 'dev'
...
fixed route names
Closes #39
See merge request sa4-2020/the-sanmarinoes/backend!51
2020-03-21 15:12:35 +01:00
600529af41
fixed route names
2020-03-21 15:08:36 +01:00
1fe0d674a2
Merge branch '38-get-room-id-devices-does-not-return-device-specific-data' into 'dev'
...
Resolve "Get /room/{id}/devices does not return device specific data"
Closes #38
See merge request sa4-2020/the-sanmarinoes/backend!49
2020-03-21 00:43:04 +01:00
