|
|
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 |
|
|
|
c66017c984
|
Added email support to login
|
2020-03-03 10:55:35 +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 |
|
|
|
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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
|
|
6ce90e61cb
|
Swagger configuration
|
2020-03-01 15:13:47 +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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
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
|
3070113ba2
|
Merge branch 'dev' into 'controllers-feature'
# Conflicts:
# .idea/misc.xml
# git-hooks/pre-commit.sh
|
2020-02-26 14:51:47 +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 |
|
|
|
a3128b7cb7
|
added controllers and fixed RoomRepository
|
2020-02-25 16:04:11 +01:00 |
|
|
|
03fed60a34
|
fixed user controller
|
2020-02-25 15:44:10 +01:00 |
|
Jacob Salvi
|
423e17ecb8
|
small changes
|
2020-02-25 15:03:41 +01:00 |
|
|
|
e26f5976c6
|
added User controller, renamed DeviceController
|
2020-02-25 14:38:14 +01:00 |
|
omenem
|
2681806091
|
First Controller
|
2020-02-25 14:25:03 +01:00 |
|
|
|
e3df659e82
|
Formatted code according to google java (aosp) format
|
2020-02-24 14:28:13 +01:00 |
|
|
|
e932c5cf58
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into data-model-feature
|
2020-02-24 14:19:06 +01:00 |
|
|
|
f8c268111c
|
Formatted code according to google java (aosp) format
|
2020-02-24 14:15:49 +01:00 |
|
Claudio Maggioni (maggicl)
|
a353007651
|
Upd. models and added repository for each entity
|
2020-02-23 00:11:09 +01:00 |
|
Claudio Maggioni (maggicl)
|
32f1412564
|
Improvements to data model
Set up connection parameters for local postgres db. Updated schema in
order not to cause clashes with reserved SQL tokens.
|
2020-02-22 23:19:34 +01:00 |
|
|
|
1359800845
|
Merge branch 'data-model-feature' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into data-model-feature
|
2020-02-22 11:33:50 +01:00 |
|
