Commit graph

Select branches

Hide pull requests

dev

master

M1

M2

M3

Mono Color

• 707291e637 Unauthenticated socket works Claudio Maggioni 2020-03-11 16:23:58 +0100
• 589ef8c3cc Imported code from secret source for websockets (@tommi27 you don't know anything about it, right?) Claudio Maggioni 2020-03-09 23:38:57 +0100
• 1e2bb75181 Merge branch 'web-socket-feature' into 'dev' Claudio Maggioni 2020-03-14 20:27:05 +0100
• 873ef54e13 Merge branch 'dev' into 'web-socket-feature' Claudio Maggioni 2020-03-14 20:09:58 +0100
• 73e1328d70 Branch cleaning Claudio Maggioni 2020-03-14 20:07:58 +0100
• 082c420d6c Merge branch '5-add-delete-or-modify-rooms' into 'dev' Claudio Maggioni 2020-03-14 19:56:28 +0100
• 5683bbe3e3 Added room icons in model as enum Claudio Maggioni 2020-03-14 19:51:01 +0100
• 23e3293e9c Merge branch '26-redefine-device-update-calls-in-rest-api-as-single-route-and-have-specialized-routes-for' into 'dev' Claudio Maggioni 2020-03-14 17:06:18 +0100
• f52a38082c General rewrite of device controllers. Now only output devices can be changes with a PUT call on their controller. Other devices use the generic controller. Claudio Maggioni 2020-03-14 16:59:56 +0100
• ed2900a3bc New abstraction for connections Claudio Maggioni 2020-03-14 12:40:28 +0100
• 6fef7663dd Knob dimmer now with new rest conversation scheme Claudio Maggioni 2020-03-13 18:48:19 +0100
• 3a97d40858 Button dimmer now with new rest conversation scheme Claudio Maggioni 2020-03-13 18:20:16 +0100
• 7bb05b705f Neutralized id value from client in device routes for creation. Reconfigured Springfox for authentication in device and room routes. Claudio Maggioni 2020-03-13 15:48:03 +0100
• f1fc5a83c1 Merge branch 'ci-cd' into 'dev' Claudio Maggioni 2020-03-12 17:55:50 +0100
• 5995bfcad2 Allowed failures (for now) for CPD check Claudio Maggioni 2020-03-12 17:47:40 +0100
• 90d951d2ac Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into ci-cd Jacob Salvi 2020-03-12 17:22:40 +0100
• c74865e3a3 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into ci-cd Claudio Maggioni 2020-03-12 16:24:57 +0100
• beeb5d82a9 Merge branch '27-tests-fail-since-h2-version-is-old' into 'dev' Claudio Maggioni 2020-03-12 16:23:38 +0100
• 60f81c3cc1 Fixed h2 version in tests Claudio Maggioni 2020-03-12 16:23:02 +0100
• 9daa9a8a42 Added an initial pipeline for the continous integration Jacob Salvi 2020-03-11 17:35:04 +0100
• 046010d1d8 Merge branch '25-cors-configuration-does-not-allow-authorization-header' into 'dev' Claudio Maggioni 2020-03-10 15:04:03 +0100
• 070dde4e69 Fixed CORS config Claudio Maggioni 2020-03-10 15:03:23 +0100
• 78abd0c7b0 Merge branch '21-test-endpoints' into 'dev' Claudio Maggioni 2020-03-09 23:15:50 +0100
• ca63f0d7df Merge branch 'dev' into '21-test-endpoints' Claudio Maggioni 2020-03-09 23:14:46 +0100
• 507f523991 Merge branch 'doc-for-all-fix' into 'dev' Claudio Maggioni 2020-03-09 23:13:36 +0100
• dfdf9ba361 Added all paths to swagger documentation Claudio Maggioni 2020-03-09 23:12:39 +0100
• 4fa55e364c Merge branch '24-emailconfigurationservice-does-not-validate-and-or-fetch-the-correct-properties' into 'dev' Claudio Maggioni 2020-03-09 17:07:31 +0100
• 0d9982fb50 Fixed email configuration Claudio Maggioni 2020-03-09 17:06:59 +0100
• 8838beb0e0 Removed setId methods from DTO classes omenem 2020-03-08 18:58:45 +0100
• e3a64a6fd3 Merge branch '22-reset-password-feature' into 'dev' Claudio Maggioni 2020-03-06 11:16:11 +0100
• 57e9a53cf1 Password reset manually tested and fixed Claudio Maggioni 2020-03-06 11:10:58 +0100
• 860fae779d Added support for password reset (still needs testing) Claudio Maggioni 2020-03-05 17:07:29 +0100
• a0fe5f989a Revert "Added support for password reset (still needs testing)" Claudio Maggioni 2020-03-06 10:21:36 +0100
• 7396e6f0d9 Added support for password reset (still needs testing) Claudio Maggioni 2020-03-05 17:07:29 +0100
• 748c5ba4b4 Added more tests on login/registration Claudio Maggioni 2020-03-05 15:03:02 +0100
• e8a55ae131 Started work on tests Claudio Maggioni 2020-03-05 12:42:53 +0100
• 6d2f7a25fb Merge branch '20-put-post-on-room-does-not-move-room-name-in-dto' into 'dev' Claudio Maggioni 2020-03-04 17:15:05 +0100
• f547851eac Merge branch 'statusCode' into 'dev' Matteo Omenetti 2020-03-04 17:08:24 +0100
• 3dfcd30f4e Fixed POST /room (Git merge I will avenge you) tommi27 2020-03-04 17:01:09 +0100
• 2c95915333 Added execpetion when a device is not found omenem 2020-03-04 16:55:53 +0100
• 749d79d51e added skeleton for websockets tommi27 2020-03-04 16:07:23 +0100
• bff433e954 Merge branch '18-username-not-enable-can-login' into 'dev' Matteo Omenetti 2020-03-04 15:40:36 +0100
• 6b9dcf2440 You nedd to verify your mail in onder to login omenem 2020-03-04 15:33:58 +0100
• 7cd2b44a44 added gitignore for iml files tommi27 2020-03-04 15:25:53 +0100
• 033b52af18 Merge branch '17-email-login-does-not-work' into 'dev' Claudio Maggioni 2020-03-04 15:17:04 +0100
• 8c1a0db920 fixed login britea 2020-03-04 15:11:23 +0100
• b6add2aaf6 Merge branch '16-no-validation-on-login-route-causes-nullpointer' into 'dev' Claudio Maggioni 2020-03-04 13:35:38 +0100
• d209586933 Fixed login request validation Claudio Maggioni 2020-03-04 13:28:51 +0100
• 5a5cc2e013 Merge branch 'corss-fix' into 'dev' Claudio Maggioni 2020-03-03 12:15:59 +0100
• 2dff446c23 Adjusted access-control-allow-headers Claudio Maggioni 2020-03-03 12:10:39 +0100
• e43a913ff3 Merge branch '15-enable-cors-for-frontend-interaction' into 'dev' Claudio Maggioni 2020-03-03 11:41:54 +0100
• 4ced73a53d Added CORS origin to * and changed TestController Claudio Maggioni 2020-03-03 11:41:15 +0100
• e806c18809 added uniqueness constraints tommi27 2020-03-03 11:04:58 +0100
• c6d4a7e698 Merge branch 'email-username-login-feature' into 'dev' Claudio Maggioni 2020-03-03 11:01:00 +0100
• c66017c984 Added email support to login Claudio Maggioni 2020-03-03 10:55:35 +0100
• eede89b7be Merge branch 'device-unification' into 'dev' Claudio Maggioni 2020-03-02 22:05:05 +0100
• eecee30841 Redoing all @tommi27 work on model since git merge is now sentient and trying to delete stuff from our project Claudio Maggioni 2020-03-02 21:59:49 +0100
• 5ae97da8a7 Merge branch 'dev' into 'device-unification' Claudio Maggioni 2020-03-02 21:48:02 +0100
• 4f0351cab9 Solved recursive JSON problem in RoomController.getAllDevices() Claudio Maggioni 2020-03-02 21:44:00 +0100
• e5a8eecdab Merge branch 'model-update' into 'dev' Claudio Maggioni 2020-03-02 20:49:13 +0100
• 529adb0d83 Merge branch 'dev' into 'model-update' Claudio Maggioni 2020-03-02 20:44:11 +0100
• 44d17c1cdd Merge branch 'email-feature' into 'dev' Claudio Maggioni 2020-03-02 17:19:14 +0100
• 74008b6b5e Merge branch 'dev' into 'email-feature' Claudio Maggioni 2020-03-02 17:12:08 +0100
• fcf7189e44 Updated email verification workflow to current code practices Claudio Maggioni 2020-03-02 17:11:29 +0100
• 51e6bb1f90 Merge Claudio Maggioni 2020-03-02 16:56:43 +0100
• 572134bba2 fixed request annotations tommi27 2020-03-02 16:15:52 +0100
• 8bbcc0304f Merge branch 'device-unification' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into device-unification Jacob Salvi 2020-03-02 15:42:45 +0100
• 2a670630c3 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into device-unification Jacob Salvi 2020-03-02 15:41:45 +0100
• d8bea0015b small cahnges Jacob Salvi 2020-03-02 15:41:37 +0100
• 8940489e2e Removed idea files omenem 2020-03-02 15:39:25 +0100
• eb6e935892 all controllers updated with DTOs (needs review) tommi27 2020-03-02 14:44:01 +0100
• 624c857734 updated controllers tommi27 2020-03-02 12:11:50 +0100
• 3bbc4bcff0 updated buttondimmer controller with dto tommi27 2020-03-02 11:02:30 +0100
• 4995c88688 Merge branch 'swagger-feature' into 'dev' Claudio Maggioni 2020-03-01 15:18:51 +0100
• 6ce90e61cb Swagger configuration Claudio Maggioni 2020-03-01 15:13:37 +0100
• 54168a4261 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into swagger-feature Claudio Maggioni 2020-03-01 13:56:06 +0100
• 1cf3b1088e Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into model-update Claudio Maggioni 2020-03-01 13:53:53 +0100
• d68b7b214d Merge branch 'idea-patch' into 'dev' Claudio Maggioni 2020-03-01 13:52:49 +0100
• c42861fa1c Merge branch 'idea-patch' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into email-feature Claudio Maggioni 2020-03-01 13:50:07 +0100
• b294144a22 Idea configuration removed so not to cause complaining for the SDK different installations between team members Claudio Maggioni 2020-03-01 13:46:15 +0100
• 466108f471 Merge branch 'idea-patch' into 'dev' Claudio Maggioni 2020-03-01 13:44:20 +0100
• 0257a9a89c Idea misc.xml removed Claudio Maggioni 2020-03-01 13:38:51 +0100
• 970949f635 Merge branch 'model-update' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into swagger-feature Claudio Maggioni 2020-03-01 13:37:27 +0100
• 6be9c80c6e Work on Swagger integration Claudio Maggioni 2020-03-01 12:15:43 +0100
• 5d1549cfa2 room controller updated tommi27 2020-02-28 17:06:42 +0100
• 6a244b27f1 Merge branch 'email-fix' into 'dev' Claudio Maggioni 2020-02-28 17:02:46 +0100
• 11d3679fdb Fix to email constraint Claudio Maggioni 2020-02-28 16:57:32 +0100
• c853c4cd4e Added a class DeviceRepository that is needed to mirror in the database the class inheritances that are present among the various Devices. Also the method getDevices, that returns a List of the Devices present in a given room, has been added to RoomController.java Jacob Salvi 2020-02-28 16:51:31 +0100
• 2ae0ab5b15 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into model-update tommi27 2020-02-28 15:29:01 +0100
• 01ccf6d968 wip tommi27 2020-02-28 15:28:55 +0100
• ce939cb7ea Merge branch 'pipeline-feature' into 'dev' Claudio Maggioni 2020-02-28 09:45:47 +0100
• 147480605d Trying Gitlab CI Claudio Maggioni 2020-02-28 09:30:20 +0100
• 2271f4a5b9 Email Verifcation Works omenem 2020-02-27 21:39:38 +0100
• 990f1bd6d4 Initial Setup for email verification omenem 2020-02-27 17:31:28 +0100
• c6a769c1b8 updated button and knob dimmers tommi27 2020-02-27 17:24:08 +0100
• 88cb2bcf87 Merge branch 'documentation' into 'dev' Matteo Omenetti 2020-02-27 16:01:15 +0100
• 3c7749b271 polished er diagram for current db model tommi27 2020-02-27 15:48:53 +0100
• e4236fa780 Merge branch 'cose' into 'dev' Claudio Maggioni 2020-02-27 10:46:25 +0100
• f70084dd40 Added minimum length of password omenem 2020-02-27 09:40:44 +0100
• 40785d0cf1 Better email validation for user and partial update for /auth/update Claudio Maggioni 2020-02-27 09:33:03 +0100