Commit graph

Select branches

Hide pull requests

dev

master

M1

M2

M3

Mono Color

• 8d53bee294 WIP on average temperature computation Claudio Maggioni (maggicl) 2020-04-14 13:24:36 +0200
• 4c4297dfdf wip, to fix tommi27 2020-04-13 16:42:48 +0200
• 2b93ffa07b Minor Changes omenem 2020-04-13 15:44:47 +0200
• 0b1170404d almost finished thermostat tommi27 2020-04-13 15:36:29 +0200
• 8d0ec2ea63 Minor Changes omenem 2020-04-13 15:10:05 +0200
• b3b7afea2a Minor Changes omenem 2020-04-12 18:45:32 +0200
• e5011110e7 Added fields tags (@NotNull etc...) also so CurtainSaveRequest omenem 2020-04-12 18:35:22 +0200
• 9947abee4b Merge branch 'socket-fix' into 'dev' Claudio Maggioni 2020-04-12 17:52:33 +0200
• 68f9b352cd Updaed websocket to perform batch updates Claudio Maggioni (maggicl) 2020-04-12 17:47:03 +0200
• 8629c1f6b4 Adapted websocket code to new redux specification Claudio Maggioni (maggicl) 2020-04-12 15:58:40 +0200
• 82419d3368 Merge branch 'knob-dimmer-fix' into 'dev' Claudio Maggioni 2020-04-11 18:35:40 +0200
• ad4a5a9c17 Added intensity to knob-dimmer britea 2020-04-11 18:30:47 +0200
• 9575018b2e Merge branch '57-change-input-output-connection-routes' into 'dev' Claudio Maggioni 2020-04-11 17:28:39 +0200
• e46ac02da5 Input output connection routes now accept array of outputs Claudio Maggioni 2020-04-11 17:24:23 +0200
• 0872d7654f 4 attempt to pass pipeline omenem 2020-04-09 15:38:03 +0200
• 7bda571a27 thermostat in an entity now tommi27 2020-04-09 15:25:34 +0200
• 79b39de6bb 3 attempt to pass pipeline omenem 2020-04-09 15:25:17 +0200
• 831a2d07c6 removed id from Curtains.java Jacob Salvi 2020-04-09 15:17:20 +0200
• 83c2554f29 2 attempt to fix pipeline omenem 2020-04-09 15:12:25 +0200
• 7f34e2b391 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 51-users-can-add-smart-curtains-blinds Jacob Salvi 2020-04-09 14:27:12 +0200
• 290927ff1f Added curtains Jacob Salvi 2020-04-09 14:07:41 +0200
• e5d3c95f3e Added curtains Jacob Salvi 2020-04-09 14:01:40 +0200
• bdf0f87d77 Added curtains Jacob Salvi 2020-04-09 13:41:58 +0200
• 9e49da0d00 first fix to try making the pipeline pass omenem 2020-04-09 12:27:04 +0200
• 66bcecdbe0 added security camera device omenem 2020-04-09 12:13:32 +0200
• 7cfb2ffc73 Added thermostat, not complete tommi27 2020-04-09 11:30:05 +0200
• fc4fcf0552 Merge branch 'fix-properties' into 'master' M1 Claudio Maggioni 2020-03-26 11:21:01 +0100
• 13db88b810 fix Claudio Maggioni 2020-03-26 11:17:42 +0100
• 1724589135 Merge branch 'dev' into 'master' Claudio Maggioni 2020-03-26 10:37:00 +0100
• d979050306 Merge branch 'cose' into 'dev' Claudio Maggioni 2020-03-26 01:05:24 +0100
• 802cee52f8 fixed cors on password reset Claudio Maggioni 2020-03-26 01:01:49 +0100
• 3ccdad8202 Merge branch 'cose' into 'dev' Claudio Maggioni 2020-03-25 23:16:14 +0100
• 6c9e2a7d7d Fixed ConcurrentModificationException on socket broadcast Claudio Maggioni 2020-03-25 23:13:17 +0100
• 1d18d9ae85 Merge branch 'cose' into 'dev' Claudio Maggioni 2020-03-25 22:45:27 +0100
• 27cb73292c Added /auth/profile Claudio Maggioni 2020-03-25 22:41:59 +0100
• b732d70ffd Merge branch 'cose' into 'dev' Claudio Maggioni 2020-03-25 22:38:47 +0100
• c5996608a4 fixed dimmable light Claudio Maggioni 2020-03-25 22:34:15 +0100
• 3518647eeb Merge branch '48-redirection-to-frontend-after-email-confirmation-operations-password-reset-and-email' into 'dev' Claudio Maggioni 2020-03-25 20:29:48 +0100
• b9221cecc6 fixed application.properties for tests Claudio Maggioni 2020-03-25 20:21:54 +0100
• b283a62d0d fixed redirects Claudio Maggioni 2020-03-25 17:31:24 +0100
• 334d35a4cc Merge branch '49-fix-bug' into 'dev' Claudio Maggioni 2020-03-25 17:28:11 +0100
• 60c17b3dd8 Fixed @tommi27 synchronization frenzy for sensors britea 2020-03-25 17:10:27 +0100
• 03bbf6b824 Merge branch '47-fix-cascade-deletion-when-room-is-deleted' into 'dev' Matteo Omenetti 2020-03-25 15:08:39 +0100
• 5f26a94052 Merge branch '41-docker-how-to-for-app-usage' into 'dev' Claudio Maggioni 2020-03-25 15:06:44 +0100
• 6ce44e73ff fix min intensity of dimmabke light of 1 in Dimmable Save Request omenem 2020-03-25 14:58:56 +0100
• 4281cbaf29 Added installation instructions and tweaked Dockerfile Claudio Maggioni 2020-03-25 14:57:46 +0100
• c8121d8473 Merge branch '45-solve-concurrency-issues-with-socket-updates-from-sensorsocket' into 'dev' Matteo Omenetti 2020-03-25 14:53:44 +0100
• e776b9c2e5 socket is now sequential and not concurrent tommi27 2020-03-25 14:50:05 +0100
• 9fc0224b1d fix room deletion omenem 2020-03-25 14:14:12 +0100
• 8179e0ff19 testing junit viewer 3 Jacob Salvi 2020-03-24 17:09:45 +0100
• 9c471294ba testing junit viewer 2 Jacob Salvi 2020-03-24 17:04:11 +0100
• bcade19f52 Merge branch '44-delete-cascade-when-room-is-deleted' into 'dev' Matteo Omenetti 2020-03-24 16:03:33 +0100
• 08c4ef49a7 delete cascade in room omenem 2020-03-24 15:58:01 +0100
• 1d491dc32e testing junit viewer Jacob Salvi 2020-03-24 15:51:33 +0100
• bbfb9f8fcb Merge branch '43-delete-cascade-in-switch' into 'dev' Matteo Omenetti 2020-03-23 18:35:11 +0100
• f368084464 delete cascade no more in switch omenem 2020-03-23 18:31:46 +0100
• 9ed2c66b54 Merge branch '40-on-delete-set-null-must-be-set-in-sql-schema' into 'dev' Matteo Omenetti 2020-03-23 17:57:23 +0100
• c17b6df3b5 delete cascade no more omenem 2020-03-23 17:53:22 +0100
• b9320ea078 Merge branch 'room-update-fix' into 'dev' Claudio Maggioni 2020-03-23 16:46:22 +0100
• f4d6a3f3c7 RoomController PUT fixed Claudio Maggioni 2020-03-23 16:42:33 +0100
• 1204451e47 Merge branch '42-fix-missing-id-in-roomsaverequest' into 'dev' Matteo Omenetti 2020-03-22 18:24:45 +0100
• 8813942cc5 fixxed omenem 2020-03-22 18:19:41 +0100
• 1c8c4b61d9 Merge branch '39-kind-name-on-device-does-not-match-route-name' into 'dev' Claudio Maggioni 2020-03-21 15:12:35 +0100
• 600529af41 fixed route names tommi27 2020-03-21 15:08:36 +0100
• 1fe0d674a2 Merge branch '38-get-room-id-devices-does-not-return-device-specific-data' into 'dev' Claudio Maggioni 2020-03-21 00:43:04 +0100
• c3bcfd7e6d Fixed RoomCont... to return specific device data Claudio Maggioni 2020-03-21 00:38:01 +0100
• cbfbb81c10 Merge branch '29-check-if-device-is-currently-user-s-own-device-when-updating' into 'dev' Claudio Maggioni 2020-03-18 17:02:12 +0100
• 4f9d8534ae Merge branch '37-docker-container-image-name-is-the-same-as-frontend-and-thus-overwrites-their-image' into 'dev' Claudio Maggioni 2020-03-18 16:13:05 +0100
• f367d9ac59 Changed docker image name on CI deploy stage Claudio Maggioni 2020-03-18 16:08:49 +0100
• 3205dcf617 Merge branch '36-problems-when-executing-queries-on-rooms-due-to-lob-array' into 'dev' Claudio Maggioni 2020-03-18 13:38:03 +0100
• e777f29585 Fix lob errors britea 2020-03-18 13:29:21 +0100
• 300f749144 Merge branch '35-test-models' into 'dev' Matteo Omenetti 2020-03-18 12:15:14 +0100
• ce0edd7287 KnobDimmer Tests omenem 2020-03-17 17:45:50 +0100
• 5e7bd298de Added some tests for Regular Light and for Switch Jacob Salvi 2020-03-17 17:44:57 +0100
• 35540fac80 controllers now check if devices belong to the correct user tommi27 2020-03-17 17:38:26 +0100
• 7095de71a6 Merge branch '30-add-wattage-data-to-smart-plugs' into 'dev' Claudio Maggioni 2020-03-17 17:01:26 +0100
• 835c9e0471 Fixed smaal errors @tommi27 implementation. Fixed precision and scale values or total precision. Optimized update by using JPQL Claudio Maggioni 2020-03-17 16:54:35 +0100
• 313e6ed88e small changes omenem 2020-03-17 15:20:49 +0100
• fe911d492f small changes omenem 2020-03-17 15:10:49 +0100
• 207e80c5f9 Tests for DimmableLight omenem 2020-03-17 14:34:17 +0100
• 60927fff3b Merge branch '33-one-line-correction' into 'dev' Claudio Maggioni 2020-03-17 14:22:01 +0100
• 21bf76027f idk Jacob Salvi 2020-03-17 14:13:34 +0100
• 25c077dd04 Tests for ButtonDimmer omenem 2020-03-17 14:09:20 +0100
• 92b799e61c Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into ci-cd Jacob Salvi 2020-03-17 14:06:49 +0100
• 3096c7862c Merge branch '22-test-controllers' into 'dev' Claudio Maggioni 2020-03-17 14:02:26 +0100
• e8f90c832d added tags: dind, also I am an idiot Jacob Salvi 2020-03-17 13:52:30 +0100
• 2b65198df7 updated smartplug tommi27 2020-03-16 17:01:21 +0100
• 9b9dac533d Merge branch '34-drop-uniquess-constraint-on-user-fk-in-room-entity' into 'dev' Claudio Maggioni 2020-03-16 15:12:13 +0100
• 23edc90b81 Fixed @tommi27 uniqueness frenzy for rooms Claudio Maggioni 2020-03-16 14:53:07 +0100
• ac92344b53 added tags: dind Jacob Salvi 2020-03-16 14:28:35 +0100
• a79c5d8671 Merge branch '32-add-get-device-call-to-get-all-devices-of-a-user' into 'dev' Claudio Maggioni 2020-03-15 17:13:52 +0100
• 9c60475e92 Added GET /device route Claudio Maggioni 2020-03-15 17:05:52 +0100
• 24fa574c63 Added email confirmation test Claudio Maggioni 2020-03-12 16:57:50 +0100
• 7e53ccd608 Merge branch '28-implement-websockets-for-sensors-and-motion-sensors' into 'dev' Claudio Maggioni 2020-03-15 14:56:15 +0100
• 620c196393 Implemented fake updates Claudio Maggioni 2020-03-15 14:49:51 +0100
• cf940df6b2 Socket now sends motion sensor updates Claudio Maggioni 2020-03-15 13:51:14 +0100
• 5a441a6992 Socket now sends sensor updates Claudio Maggioni 2020-03-15 13:41:57 +0100
• fd6103b6da Merge branch 'websockets-feature' into 'dev' Claudio Maggioni 2020-03-15 11:08:41 +0100
• 3c034f56d1 Socket authentication works Claudio Maggioni 2020-03-15 10:44:10 +0100
• 34dce54575 wip tommi27 2020-03-14 20:17:47 +0100