Merge branch 'fix' into 'dev'

fix update sensor

See merge request sa4-2020/the-sanmarinoes/backend!86

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java

@@ -38,7 +38,7 @@ public abstract class Device {
 
     @OneToMany(mappedBy = "device", orphanRemoval = true)
     @GsonExclude
-    // @SocketGsonExclude
+    @SocketGsonExclude
     private Set<Trigger<? extends Device>> triggers = new HashSet<>();
 
     /**

src/main/resources/application-dev.properties

@@ -27,7 +27,7 @@ spring.mail.properties.mail.smtp.writetimeout=5000
 email.registrationSubject=Complete your SmartHut.sm registration
 email.registration=To confirm your registration, please click here:
 email.registrationPath=http://localhost:8080/register/confirm-account?token=
-email.registrationRedirect=http://localhost:3000
+email.registrationRedirect=http://localhost:3000/login
 
 email.resetpasswordSubject=SmartHut.sm password reset
 email.resetpassword=To reset your password, please click here:

src/main/resources/application-prod.properties

@@ -32,7 +32,7 @@ spring.mail.properties.mail.smtp.writetimeout=5000
 email.registrationSubject=Complete your SmartHut.sm registration
 email.registration=To confirm your registration, please click here:
 email.registrationPath=${BACKEND_URL}/register/confirm-account?token=
-email.registrationRedirect=${FRONTEND_URL}
+email.registrationRedirect=${FRONTEND_URL}/login
 
 
 # Password reset email properties