|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
omenem
|
990f1bd6d4
|
Initial Setup for email verification
|
2020-02-27 17:31:28 +01:00 |
|
|
|
c6a769c1b8
|
updated button and knob dimmers
|
2020-02-27 17:24:08 +01:00 |
|
Matteo Omenetti
|
88cb2bcf87
|
Merge branch 'documentation' into 'dev'
polished er diagram for current db model
See merge request sa4-2020/the-sanmarinoes/backend!9
|
2020-02-27 16:01:15 +01:00 |
|
|
|
3c7749b271
|
polished er diagram for current db model
|
2020-02-27 15:48:53 +01:00 |
|
|
|
e4236fa780
|
Merge branch 'cose' into 'dev'
Partial work on input validation and stronger definition of models
See merge request sa4-2020/the-sanmarinoes/backend!8
|
2020-02-27 10:46:25 +01:00 |
|
omenem
|
f70084dd40
|
Added minimum length of password
|
2020-02-27 09:40:44 +01:00 |
|
|
|
40785d0cf1
|
Better email validation for user and partial update for /auth/update
|
2020-02-27 09:33:03 +01:00 |
|
|
|
48441dfe07
|
Started work on input validation
|
2020-02-26 21:41:54 +01:00 |
|
omenem
|
b2353e9834
|
Small Changes
|
2020-02-26 18:58:01 +01:00 |
|
omenem
|
1ab4fee6ff
|
Little changes to Room and dimmableLight classes
|
2020-02-26 18:56:47 +01:00 |
|
Matteo Omenetti
|
3e57e047a5
|
Merge branch 'documents' into 'dev'
Document folder
See merge request sa4-2020/the-sanmarinoes/backend!7
|
2020-02-26 15:31:00 +01:00 |
|
|
|
4a141b7cb8
|
added entity relationship diagram
|
2020-02-26 15:13:43 +01:00 |
|
Matteo Omenetti
|
4b9944ab0d
|
Merge branch 'controllers-feature' into 'dev'
Controllers feature
See merge request sa4-2020/the-sanmarinoes/backend!6
|
2020-02-26 14:52:24 +01:00 |
|
Matteo Omenetti
|
3070113ba2
|
Merge branch 'dev' into 'controllers-feature'
# Conflicts:
# .idea/misc.xml
# git-hooks/pre-commit.sh
|
2020-02-26 14:51:47 +01:00 |
|
|
|
df3f4de271
|
Merge branch 'login-feature' into 'dev'
Login feature
See merge request sa4-2020/the-sanmarinoes/backend!5
|
2020-02-26 14:43:39 +01:00 |
|
|
|
0cb1f1606a
|
Updated hibernate DDL policy and solved LazyInitializationException bug on User.toString()
|
2020-02-26 14:41:11 +01:00 |
|
omenem
|
ae993b0bab
|
New Controllers
|
2020-02-26 13:25:38 +01:00 |
|
|
|
4818929dad
|
fixed redundant id in update methods
|
2020-02-26 11:40:33 +01:00 |
|
|
|
ad3e5271ac
|
Working auth with JWT
|
2020-02-25 17:51:45 +01:00 |
|
|
|
3c0c09c375
|
added image and icon fields to Room
|
2020-02-25 16:23:12 +01:00 |
|
Jacob Salvi
|
7195e999ea
|
UserController
|
2020-02-25 16:07:48 +01:00 |
|
