Tim Zieger
|
5d98afb5c4
|
Merge branch '62-register-communication' into 'master'
Resolve "Register Communication"
Closes #62
See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!53
|
2020-05-18 09:17:49 +00:00 |
|
wiecktobi
|
b673c0767f
|
Fixed
|
2020-05-18 11:00:20 +02:00 |
|
Tim Zieger
|
5085cd45ce
|
register communication
|
2020-05-18 10:55:02 +02:00 |
|
|
|
af3d5686d7
|
Merge branch 'fix-backend-uri' into 'master'
Important Fix: Backend uri
See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!52
|
2020-05-17 19:36:21 +00:00 |
|
|
|
8a79d863f6
|
Important Fix: Backend uri
|
2020-05-17 21:21:40 +02:00 |
|
Tim Zieger
|
fc813f14db
|
Merge branch '61-login-communication' into 'master'
Resolve "Login Communication"
Closes #61
See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!50
|
2020-05-17 19:05:55 +00:00 |
|
Tim Zieger
|
efa7587702
|
login communication
|
2020-05-17 20:33:45 +02:00 |
|
|
|
6e4200cea6
|
Merge branch '68-statistic-overview-view' into 'master'
Resolve "Statistic Overview view"
Closes #68
See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!51
|
2020-05-17 17:57:50 +00:00 |
|
|
|
4c81923977
|
add Statistics Page - move WeekSummary into Statistics
|
2020-05-17 17:32:50 +02:00 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
71ee4b9bd9
|
Add projection userAllEmbedded to the whoami endpoint
|
2020-05-13 15:50:54 +02:00 |
|
|
|
89ba108078
|
Add location implementation
|
2020-05-13 15:50:08 +02:00 |
|
|
|
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 |
|
|
|
0d95e5f8f6
|
Update whoami endpoint to return a userWithRole projection
|
2020-05-13 14:44:45 +02:00 |
|
|
|
bd89747020
|
Comply to spring package structure
|
2020-05-13 14:27:15 +02:00 |
|
|
|
055abd95a4
|
Add withUser projection to account
|
2020-05-13 14:18:58 +02:00 |
|
|
|
3a48734544
|
Switch from crud to paging and sorting, adjust paths and rels
|
2020-05-13 14:02:24 +02:00 |
|
|
|
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 |
|
|
|
4c05c668cb
|
Define lazy and eager fetching explicit
|
2020-05-13 13:42:43 +02:00 |
|
|
|
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 |
|
|
|
75e7d7f11e
|
Fix compile break
|
2020-05-11 23:39:55 +02:00 |
|
|
|
ae796fe3ab
|
Add android build to merge request
|
2020-05-11 23:33:49 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e83bfd6e5a
|
add new navigation design (vuetify framework) - modify colors, font - delete Header.vue, Footer.vue
|
2020-05-10 19:08:38 +02:00 |
|
|
|
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 |
|
|
|
22df05010b
|
Expose user resource
Add projection withRole
Remove TimetrackUser reference from TimetrackAccount
|
2020-05-09 21:05:06 +02:00 |
|
|
|
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 |
|
|
|
f186a89bb8
|
Change sign-up url, Add whoami endpoint
|
2020-05-09 19:20:35 +02:00 |
|
|
|
6abdab2cf6
|
Formatting and little optimization
|
2020-05-09 19:19:14 +02:00 |
|
|
|
8e7f9c06d3
|
Implement Sign-up, Add id generation type identity to Entities
|
2020-05-09 19:19:13 +02:00 |
|
|
|
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 |
|
|
|
5afa5daece
|
Change backend port from 80 to 5000 everywhere
|
2020-05-09 18:25:44 +02:00 |
|
|
|
4da43de4f6
|
Add DTO / DAO description
|
2020-05-09 18:25:41 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
