smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix' into 'dev'

Browse source 
fix update sensor

See merge request sa4-2020/the-sanmarinoes/backend!86
This commit is contained in:
Claudio Maggioni 2020-04-25 16:34:16 +02:00
commit dbf9ef885b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

2
src/main/resources/application-dev.properties
View file

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

2
src/main/resources/application-prod.properties
View file

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