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

243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wiecktobi
881d01535d Change app theme 
* Toolbar with logout on home screen
* Add a Toolbar to login and register view
* Embed Settings view
 2020-05-25 22:55:56 +02:00
Marcel Schwarz
50446e0654 Merge branch '91-backend-uses-cascaded-delete-for-entities' into 'master' 
Resolve "Backend uses cascaded delete for entities"

Closes #91

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!70
 2020-05-25 19:25:42 +00:00
Marcel Schwarz
4e560b9d36 Add cascading delete for connected entities 2020-05-25 21:10:25 +02:00
Tim Zieger
0d4eb694c9 Merge branch '89-remove-localhost' into 'master' 
Resolve "Remove localhost"

Closes #89

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!69
 2020-05-25 17:39:15 +00:00
Tim Zieger
8992dd028b no more localhost 2020-05-25 19:22:09 +02:00
Simon Kellner
b1320fb11e Merge branch '78-update-timetrack-accounts' into 'master' 
Resolve "Update Timetrack Accounts"

Closes #86 and #78

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!65
 2020-05-25 16:58:48 +00:00
the_kellner
214d5b9218 add timetrack account managing views and implement functionality 2020-05-25 18:38:34 +02:00
Tobias Wieck
0047556180 Merge branch '80-query-backend-endpoint-whoami' into 'master' 
Resolve "Query backend endpoint whoami"

Closes #80

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!67
 2020-05-25 12:46:03 +00:00
Tobias Wieck
52e862afbe Resolve "Query backend endpoint whoami" 2020-05-25 12:46:02 +00:00
Marcel Schwarz
b20f2e8a61 Merge branch '88-list-all-timetrack-accounts-for-a-given-user' into 'master' 
Resolve "List all Timetrack accounts for a given user"

Closes #88

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!68
 2020-05-25 12:26:33 +00:00
Marcel Schwarz
781ec85851 Implement to query accounts for a given user 2020-05-25 14:11:34 +02:00
Tim Zieger
83bd086792 Merge branch '85-implement-default-actions' into 'master' 
Resolve "Implement default actions"

Closes #85

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!66
 2020-05-25 10:30:45 +00:00
Tim Zieger
2a68777f67 implement default actions 2020-05-25 12:10:02 +02:00
Tim Zieger
edd7317aa4 Merge branch '79-update-users-properties-from-frontend' into 'master' 
Resolve "Update users properties from frontend"

Closes #79

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!63
 2020-05-24 10:02:51 +00:00
Tim Zieger
3a04ff8823 edit user 2020-05-24 10:46:03 +02:00
Tobias Wieck
70e3a60930 Merge branch '74-disable-start-button' into 'master' 
Resolve "Disable start button"

Closes #74

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!64
 2020-05-23 16:39:27 +00:00
Tobias Wieck
841a9545e6 Resolve "Disable start button" 2020-05-23 16:39:27 +00:00
Tim Zieger
4b2fe41d9f Merge branch '83-user-list-add-style' into 'master' 
Resolve "User list add style"

Closes #83

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!62
 2020-05-22 12:15:27 +00:00
Tim Zieger
736e571471 users same style as timetrack 2020-05-22 13:57:47 +02:00
Tim Zieger
7488b5bb03 Merge branch '77-list-of-users' into 'master' 
Resolve "List of users"

Closes #77

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!60
 2020-05-21 08:36:55 +00:00
Tim Zieger
030b8c47d3 list of Users 2020-05-21 10:21:32 +02:00
Marcel Schwarz
ed284da1ac Merge branch '81-custom-endpoints' into 'master' 
Resolve "Custom endpoints"

Closes #81

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!59
 2020-05-20 22:02:04 +00:00
Marcel Schwarz
5e161d9c9d Remove accounts references from User 2020-05-20 23:45:36 +02:00
Marcel Schwarz
5eb6efcffe Implement /track endpoint 2020-05-20 23:26:35 +02:00
Marcel Schwarz
9f8fd0af1e Implement custom record searches 
Create record overview projection
Add today search with scoped principal
Add sample data for records
 2020-05-20 23:26:35 +02:00
Simon Kellner
3310062138 Merge branch '76-rework-the-design-for-a-single-time-record' into 'master' 
Resolve "Rework the design for a single time record"

Closes #76

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!61
 2020-05-20 16:03:23 +00:00
the_kellner
a6c4cc48d9 add new TimeRecordItem and TimeRecord list design 2020-05-20 17:47:17 +02:00
Tim Zieger
3d1f2fd741 Merge branch '75-menu-depending-on-loginstate' into 'master' 
Resolve "Menu depending on loginstate"

Closes #75

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!56
 2020-05-19 13:40:56 +00:00
Tim Zieger
a1072f40b3 menu depending on loginstate 2020-05-19 15:16:09 +02:00
Marcel Schwarz
04d4d9563b Merge branch '50-create-record-rest-controller' into 'master' 
Resolve "Create record rest controller"

Closes #50

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!58
 2020-05-19 09:33:50 +00:00
Marcel Schwarz
24b6ff4618 Make UserController a BasePathAwareController 2020-05-19 10:50:33 +02:00
Marcel Schwarz
0f700d87b0 Adjust records endpoint name and rels, enable paging 2020-05-19 10:35:14 +02:00
Tobias Wieck
0aa257dbaf Merge branch '82-update-geofence-for-api-29' into 'master' 
Resolve "Update geofence for API 29"

Closes #82

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!57
 2020-05-18 21:13:15 +00:00
wiecktobi
65fc373f97 Added permission request 2020-05-18 21:52:52 +02:00
Tobias Wieck
10a1d3a3fa Merge branch '73-implement-geofence' into 'master' 
Resolve "Implement geofence"

Closes #73

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!55
 2020-05-18 15:29:41 +00:00
wiecktobi
5d366e3c8b Implemented Geofence and updated package structure 2020-05-18 17:06:01 +02:00
Tobias Wieck
4c34ac3497 Merge branch '72-bug-new-retrofit-verion' into 'master' 
Resolve "Bug: New retrofit verion"

Closes #72

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!54
 2020-05-18 09:18:25 +00:00
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
Marcel Schwarz
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
Marcel Schwarz
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
Simon Kellner
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
the_kellner
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
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