507f523991
Merge branch 'doc-for-all-fix' into 'dev'
...
Added all paths to swagger documentation
See merge request sa4-2020/the-sanmarinoes/backend!29
2020-03-09 23:13:36 +01:00
dfdf9ba361
Added all paths to swagger documentation
2020-03-09 23:12:39 +01:00
4fa55e364c
Merge branch '24-emailconfigurationservice-does-not-validate-and-or-fetch-the-correct-properties' into 'dev'
...
Resolve "EmailConfigurationService does not validate and/or fetch the correct properties"
Closes #24
See merge request sa4-2020/the-sanmarinoes/backend!28
2020-03-09 17:07:31 +01:00
0d9982fb50
Fixed email configuration
2020-03-09 17:06:59 +01:00
e3a64a6fd3
Merge branch '22-reset-password-feature' into 'dev'
...
Resolve "Reset password feature"
Closes #22
See merge request sa4-2020/the-sanmarinoes/backend!27
2020-03-06 11:16:11 +01:00
57e9a53cf1
Password reset manually tested and fixed
2020-03-06 11:10:58 +01:00
860fae779d
Added support for password reset (still needs testing)
2020-03-06 10:24:06 +01:00
6d2f7a25fb
Merge branch '20-put-post-on-room-does-not-move-room-name-in-dto' into 'dev'
...
Resolve "PUT/POST on room does not move room name in DTO"
Closes #20
See merge request sa4-2020/the-sanmarinoes/backend!24
2020-03-04 17:15:05 +01:00
Matteo Omenetti
f547851eac
Merge branch 'statusCode' into 'dev'
...
Added execpetion when a device is not found
See merge request sa4-2020/the-sanmarinoes/backend!25
2020-03-04 17:08:24 +01:00
3dfcd30f4e
Fixed POST /room (Git merge I will avenge you)
2020-03-04 17:01:09 +01:00
omenem
2c95915333
Added execpetion when a device is not found
2020-03-04 16:55:53 +01:00
Matteo Omenetti
bff433e954
Merge branch '18-username-not-enable-can-login' into 'dev'
...
Resolve "Username not enable can login"
Closes #18
See merge request sa4-2020/the-sanmarinoes/backend!23
2020-03-04 15:40:36 +01:00
omenem
6b9dcf2440
You nedd to verify your mail in onder to login
2020-03-04 15:33:58 +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
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
