|
|
7cd2b44a44
|
added gitignore for iml files
|
2020-03-04 15:25:53 +01:00 |
|
|
|
033b52af18
|
Merge branch '17-email-login-does-not-work' into 'dev'
Resolve "Email login does not work"
Closes #17
See merge request sa4-2020/the-sanmarinoes/backend!22
|
2020-03-04 15:17:04 +01:00 |
|
britea
|
8c1a0db920
|
fixed login
|
2020-03-04 15:11:23 +01:00 |
|
|
|
b6add2aaf6
|
Merge branch '16-no-validation-on-login-route-causes-nullpointer' into 'dev'
Resolve "No validation on login route causes NullPointer"
Closes #16
See merge request sa4-2020/the-sanmarinoes/backend!21
|
2020-03-04 13:35:38 +01:00 |
|
|
|
d209586933
|
Fixed login request validation
|
2020-03-04 13:28:51 +01:00 |
|
|
|
5a5cc2e013
|
Merge branch 'corss-fix' into 'dev'
Adjusted access-control-allow-headers
See merge request sa4-2020/the-sanmarinoes/backend!20
|
2020-03-03 12:15:59 +01:00 |
|
|
|
2dff446c23
|
Adjusted access-control-allow-headers
|
2020-03-03 12:10:39 +01:00 |
|
|
|
e43a913ff3
|
Merge branch '15-enable-cors-for-frontend-interaction' into 'dev'
Resolve "Enable CORS for frontend interaction"
Closes #15
See merge request sa4-2020/the-sanmarinoes/backend!18
|
2020-03-03 11:41:54 +01:00 |
|
|
|
4ced73a53d
|
Added CORS origin to * and changed TestController
|
2020-03-03 11:41:15 +01:00 |
|
|
|
e806c18809
|
added uniqueness constraints
|
2020-03-03 11:04:58 +01:00 |
|
|
|
c6d4a7e698
|
Merge branch 'email-username-login-feature' into 'dev'
Added email support to login
See merge request sa4-2020/the-sanmarinoes/backend!19
|
2020-03-03 11:01:00 +01:00 |
|
|
|
c66017c984
|
Added email support to login
|
2020-03-03 10:55:35 +01:00 |
|
|
|
eede89b7be
|
Merge branch 'device-unification' into 'dev'
Device unification
See merge request sa4-2020/the-sanmarinoes/backend!17
|
2020-03-02 22:05:05 +01:00 |
|
|
|
eecee30841
|
Redoing all @tommi27 work on model since git merge is now sentient and trying to delete stuff from our project
|
2020-03-02 21:59:49 +01:00 |
|
|
|
5ae97da8a7
|
Merge branch 'dev' into 'device-unification'
# Conflicts:
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SpringFoxConfig.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorController.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
|
2020-03-02 21:48:02 +01:00 |
|
|
|
4f0351cab9
|
Solved recursive JSON problem in RoomController.getAllDevices()
|
2020-03-02 21:44:00 +01:00 |
|
|
|
e5a8eecdab
|
Merge branch 'model-update' into 'dev'
Model update
See merge request sa4-2020/the-sanmarinoes/backend!16
|
2020-03-02 20:49:13 +01:00 |
|
|
|
529adb0d83
|
Merge branch 'dev' into 'model-update'
# Conflicts:
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java
|
2020-03-02 20:44:11 +01:00 |
|
|
|
44d17c1cdd
|
Merge branch 'email-feature' into 'dev'
Email feature
See merge request sa4-2020/the-sanmarinoes/backend!15
|
2020-03-02 17:19:14 +01:00 |
|
|
|
74008b6b5e
|
Merge branch 'dev' into 'email-feature'
# Conflicts:
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SpringFoxConfig.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/WebSecurityConfig.java
# src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java
|
2020-03-02 17:12:08 +01:00 |
|
|
|
fcf7189e44
|
Updated email verification workflow to current code practices
|
2020-03-02 17:11:29 +01:00 |
|
|
|
51e6bb1f90
|
Merge
|
2020-03-02 16:56:43 +01:00 |
|
|
|
572134bba2
|
fixed request annotations
|
2020-03-02 16:15:52 +01:00 |
|
Jacob Salvi
|
8bbcc0304f
|
Merge branch 'device-unification' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into device-unification
|
2020-03-02 15:42:45 +01:00 |
|
Jacob Salvi
|
2a670630c3
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into device-unification
|
2020-03-02 15:41:45 +01:00 |
|
Jacob Salvi
|
d8bea0015b
|
small cahnges
|
2020-03-02 15:41:37 +01:00 |
|
omenem
|
8940489e2e
|
Removed idea files
|
2020-03-02 15:39:25 +01:00 |
|
|
|
eb6e935892
|
all controllers updated with DTOs (needs review)
|
2020-03-02 14:44:01 +01:00 |
|
|
|
624c857734
|
updated controllers
|
2020-03-02 12:11:50 +01:00 |
|
|
|
3bbc4bcff0
|
updated buttondimmer controller with dto
|
2020-03-02 11:02:30 +01:00 |
|
|
|
4995c88688
|
Merge branch 'swagger-feature' into 'dev'
Swagger feature
See merge request sa4-2020/the-sanmarinoes/backend!14
|
2020-03-01 15:18:51 +01:00 |
|
|
|
6ce90e61cb
|
Swagger configuration
|
2020-03-01 15:13:47 +01:00 |
|
|
|
54168a4261
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into swagger-feature
|
2020-03-01 13:56:06 +01:00 |
|
|
|
1cf3b1088e
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into model-update
|
2020-03-01 13:53:53 +01:00 |
|
|
|
d68b7b214d
|
Merge branch 'idea-patch' into 'dev'
Idea configuration removed so not to cause complaining for the SDK different...
See merge request sa4-2020/the-sanmarinoes/backend!13
|
2020-03-01 13:52:49 +01:00 |
|
|
|
c42861fa1c
|
Merge branch 'idea-patch' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into email-feature
|
2020-03-01 13:50:39 +01:00 |
|
|
|
b294144a22
|
Idea configuration removed so not to cause complaining for the SDK different installations between team members
|
2020-03-01 13:46:15 +01:00 |
|
|
|
466108f471
|
Merge branch 'idea-patch' into 'dev'
Idea misc.xml removed
See merge request sa4-2020/the-sanmarinoes/backend!12
|
2020-03-01 13:44:20 +01:00 |
|
|
|
0257a9a89c
|
Idea misc.xml removed
|
2020-03-01 13:38:51 +01:00 |
|
|
|
970949f635
|
Merge branch 'model-update' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into swagger-feature
|
2020-03-01 13:37:27 +01:00 |
|
|
|
6be9c80c6e
|
Work on Swagger integration
|
2020-03-01 12:15:43 +01:00 |
|
|
|
5d1549cfa2
|
room controller updated
|
2020-02-28 17:06:42 +01:00 |
|
|
|
6a244b27f1
|
Merge branch 'email-fix' into 'dev'
Fix to email constraint
See merge request sa4-2020/the-sanmarinoes/backend!11
|
2020-02-28 17:02:46 +01:00 |
|
|
|
11d3679fdb
|
Fix to email constraint
|
2020-02-28 16:57:32 +01:00 |
|
Jacob Salvi
|
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
|
2020-02-28 16:51:31 +01:00 |
|
|
|
2ae0ab5b15
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into model-update
|
2020-02-28 15:29:01 +01:00 |
|
|
|
01ccf6d968
|
wip
|
2020-02-28 15:28:55 +01:00 |
|
|
|
ce939cb7ea
|
Merge branch 'pipeline-feature' into 'dev'
Setting of code quality check in Gitlab pipeline
See merge request sa4-2020/the-sanmarinoes/backend!10
|
2020-02-28 09:45:47 +01:00 |
|
|
|
147480605d
|
Trying Gitlab CI
|
2020-02-28 09:30:20 +01:00 |
|
omenem
|
2271f4a5b9
|
Email Verifcation Works
|
2020-02-27 21:39:38 +01:00 |
|
