Commit graph

39 commits

Author SHA1 Message Date
01ccf6d968 wip 2020-02-28 15:28:55 +01:00
c6a769c1b8 updated button and knob dimmers 2020-02-27 17:24:08 +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
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
d9348bb6da Merge branch 'data-model-feature' into 'dev'
Data model feature

See merge request sa4-2020/the-sanmarinoes/backend!4
2020-02-24 16:53:00 +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
e859d85451 Merge branch 'git-hook-feature' into 'dev'
Git hook feature

See merge request sa4-2020/the-sanmarinoes/backend!3
2020-02-24 14:16:37 +01:00
f8c268111c Formatted code according to google java (aosp) format 2020-02-24 14:15:49 +01:00
cbac8fc8db Added git hooks scripts for java formatting 2020-02-24 14:12:51 +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
Claudio Maggioni (maggicl)
87c17434ac Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into data-model-feature 2020-02-22 20:57:15 +01:00
ad8c408645 Merge branch 'gradle-gitignore-feature' into 'dev'
Updated .gitignore to ignore gradle files

See merge request sa4-2020/the-sanmarinoes/backend!2
2020-02-22 20:53:55 +01:00
Claudio Maggioni (maggicl)
0a51533b5c Updated .gitignore to ignore gradle files@ 2020-02-22 20:52:54 +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
0cc59e608c Updated models to implement JPA and agreed ER diagram 2020-02-22 11:31:10 +01:00
Jacob Salvi
9f5821e993 small changes to Romm 2020-02-21 16:10:58 +01:00
Jacob Salvi
7d582dbb47 small changes 2020-02-21 15:36:04 +01:00
346d305950 removed giovanni 2020-02-21 14:26:14 +01:00
0489d0221c Updated to the skeleton data model
Added the concept of rules and a few interfaces
2020-02-21 14:23:07 +01:00
6fc17052c6 Added a sketch of the data model
Added a rough hint of the class structure needed to store the
application state
2020-02-20 21:58:23 +01:00
4cf93e28db Merge branch 'skeleton-feature' into 'dev'
Create Spring Boot skeleton

See merge request sa4-2020/the-sanmarinoes/backend!1
2020-02-20 15:33:06 +01:00
62087e2b49 Imported Spring Boot starter project 2020-02-20 15:22:37 +01:00
Luca Ponzanelli
d92236af4d Initial commit 2020-02-19 14:15:05 +01:00