hft-informatik/ubiquitous-computing-geo-timetracking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
147 Commits 7 Branches 0 Tags 45 MiB
3dd71a11eb
Commit Graph

147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Wieck
3dd71a11eb Merge branch '67-read-geo-information' into 'master' 
Resolve "Read geo-information"

Closes #67

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!42
 2020-05-17 14:27:17 +00:00
Tobias Wieck
3c42d55881 Merge branch '64-login-functionality-with-retrofit' into 'master' 
Resolve "Login functionality with Retrofit"

Closes #64

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!41
 2020-05-17 14:13:36 +00:00
wiecktobi
9326b88973 Working login function with token storage 2020-05-17 15:58:42 +02:00
Marcel Schwarz
8b2e26042c Merge branch 'backend-bugfix-persistent-data' into 'master' 
Bugfix backend data-initialization

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!49
 2020-05-15 14:40:13 +00:00
Marcel Schwarz
f8f9f12dcc Bugfix data-initialization 
Bugfix login
Bugfix sign-up
Docker-compose restart backend always
 2020-05-15 16:02:19 +02:00
Tim Zieger
8d3d820286 Merge branch '69-vuetify-login' into 'master' 
Resolve "Vuetify login"

Closes #69

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!40
 2020-05-15 10:54:31 +00:00
Tim Zieger
b0b33bfbb3 login vuetify 2020-05-15 12:40:59 +02:00
Marcel Schwarz
0e2f880755 Merge branch '19-find-way-to-store-location-data' into 'master' 
Resolve "Find way to store location data"

Closes #19

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!48
 2020-05-13 14:07:39 +00:00
Marcel Schwarz
71ee4b9bd9 Add projection userAllEmbedded to the whoami endpoint 2020-05-13 15:50:54 +02:00
Marcel Schwarz
89ba108078 Add location implementation 2020-05-13 15:50:08 +02:00
Marcel Schwarz
d47733cc6f Merge branch '49-create-accounts-rest-controller' into 'master' 
Resolve "Create accounts rest controller"

Closes #49

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!47
 2020-05-13 13:01:57 +00:00
Marcel Schwarz
0d95e5f8f6 Update whoami endpoint to return a userWithRole projection 2020-05-13 14:44:45 +02:00
Marcel Schwarz
bd89747020 Comply to spring package structure 2020-05-13 14:27:15 +02:00
Marcel Schwarz
055abd95a4 Add withUser projection to account 2020-05-13 14:18:58 +02:00
Marcel Schwarz
3a48734544 Switch from crud to paging and sorting, adjust paths and rels 2020-05-13 14:02:24 +02:00
Marcel Schwarz
96671d5350 Merge branch '52-lazy-and-eager-fetching' into 'master' 
Resolve "Lazy and eager fetching"

Closes #52

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!46
 2020-05-13 11:56:56 +00:00
Marcel Schwarz
4c05c668cb Define lazy and eager fetching explicit 2020-05-13 13:42:43 +02:00
Marcel Schwarz
8dc4604f61 Merge branch 'android-mr-build' into 'master' 
Add android build to merge request

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!45
 2020-05-12 09:43:06 +00:00
Marcel Schwarz
75e7d7f11e Fix compile break 2020-05-11 23:39:55 +02:00
Marcel Schwarz
ae796fe3ab Add android build to merge request 2020-05-11 23:33:49 +02:00
Marcel Schwarz
ad0d279b82 Merge branch '71-login-doesn-t-work-anymore-since-user-projection' into 'master' 
Resolve "Login doesn't work anymore since user projection"

Closes #71

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!44
 2020-05-11 19:22:51 +00:00
Marcel Schwarz
d4f39f27ae Add LoginUser to successfully parse the request and create a token 2020-05-11 21:15:25 +02:00
wiecktobi
b4d6b5dd0c Changed to read header 2020-05-11 20:59:32 +02:00
Marcel Schwarz
7cd4d52138 Merge branch '70-fix-duplicate-key-in-timetrackaccounts-tabe' into 'master' 
Resolve "Fix duplicate key in timetrackAccounts table"

Closes #70

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!43
 2020-05-11 18:33:19 +00:00
Marcel Schwarz
3ca73361f0 Introduce proper many to one relation 2020-05-11 20:21:05 +02:00
wiecktobi
859fd1d5ec Get the actual location and update it 2020-05-11 18:00:33 +02:00
wiecktobi
e6834a18e6 Created Login with Retrofit and store Token (with exceptions) 2020-05-11 14:24:01 +02:00
Simon Kellner
d66ecc43b7 Merge branch '59-navigation-to-header' into 'master' 
Resolve "Navigation to Header"

Closes #60 and #59

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!36
 2020-05-10 17:18:51 +00:00
the_kellner
e83bfd6e5a add new navigation design (vuetify framework) - modify colors, font - delete Header.vue, Footer.vue 2020-05-10 19:08:38 +02:00
Marcel Schwarz
48fd0cfdc0 Merge branch '47-create-users-rest-controller' into 'master' 
Resolve "Create users rest controller"

Closes #47

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!39
 2020-05-09 19:22:12 +00:00
Marcel Schwarz
22df05010b Expose user resource 
Add projection withRole
Remove TimetrackUser reference from TimetrackAccount
 2020-05-09 21:05:06 +02:00
Marcel Schwarz
798ca8b168 Merge branch '48-create-login-rest-controller' into 'master' 
Resolve "Create login rest controller"

Closes #48

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!30
 2020-05-09 17:26:51 +00:00
Marcel Schwarz
f186a89bb8 Change sign-up url, Add whoami endpoint 2020-05-09 19:20:35 +02:00
Marcel Schwarz
6abdab2cf6 Formatting and little optimization 2020-05-09 19:19:14 +02:00
Marcel Schwarz
8e7f9c06d3 Implement Sign-up, Add id generation type identity to Entities 2020-05-09 19:19:13 +02:00
Marcel Schwarz
46262af668 Merge branch 'backend-preparations' into 'master' 
Backend preparations

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!37
 2020-05-09 16:34:07 +00:00
Marcel Schwarz
5afa5daece Change backend port from 80 to 5000 everywhere 2020-05-09 18:25:44 +02:00
Marcel Schwarz
4da43de4f6 Add DTO / DAO description 2020-05-09 18:25:41 +02:00
Simon Kellner
45248ccb4b Merge branch '56-change-login-style' into 'master' 
Resolve "Change login style"

Closes #56

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!35
 2020-05-07 11:40:22 +00:00
Tim Zieger
1631156ef4 Resolve "Change login style" 2020-05-07 11:40:22 +00:00
Simon Kellner
ce3a45efda Merge branch '57-week-summary-component' into 'master' 
Resolve "Week Summary Component"

Closes #57

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!33
 2020-05-07 09:11:40 +00:00
Simon Kellner
8209bedc22 Merge branch '46-design-activities' into 'master' 
Resolve "Design activities"

Closes #46

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!32
 2020-05-04 17:48:42 +00:00
the_kellner
dc9b7ef1ef add week summary component + router link 2020-05-04 19:10:38 +02:00
wiecktobi
cdcef1fdff Added Settings 2020-05-04 18:51:00 +02:00
wiecktobi
57f5ba4b03 Merge branch '46-design-activities' of https://gitlab.com/marcel.schwarz/2020ss-qbc-geofence-timetracking into 46-design-activities 2020-05-03 20:38:46 +02:00
wiecktobi
c3b01a4639 Small changes 2020-05-03 20:35:04 +02:00
wiecktobi
67379787b3 Regiser Activity 2020-05-03 20:35:03 +02:00
wiecktobi
99313fc877 Regiser Activity 2020-05-03 20:35:03 +02:00
wiecktobi
cd4df362a8 Added Logo as icon 2020-05-03 20:35:00 +02:00
wiecktobi
ad056e6507 Converted Fragments in Activities 2020-05-03 20:35:00 +02:00