Commit Graph

237 Commits

Author SHA1 Message Date
918cf67b1f Implement diagrams with backend data 2020-05-31 20:48:51 +02:00
9a8faa3f0d Fix bug in documentation build script 2020-05-30 22:25:26 +02:00
8f2b697f05 Merge branch 'documentation-pipeline' into 'master'
Add documentation build step to CI

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!89
2020-05-30 19:59:25 +00:00
179af69564 Add documentation build step to CI 2020-05-30 21:57:05 +02:00
ca4da8c993 Merge branch 'improve-mr-build-times' into 'master'
Change builds to only build the specific module

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!87
2020-05-30 19:29:17 +00:00
5060da28ca Change builds to only build the specific module 2020-05-30 21:23:24 +02:00
61fccccd33 Merge branch '93-table-of-contents' into 'master'
Resolve "Table of contents"

Closes #93

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!86
2020-05-30 19:15:12 +00:00
0c1550c7a7 Extract large sections into separate files 2020-05-30 20:50:22 +02:00
b602db1bd9 Split project into main sections 2020-05-30 20:39:33 +02:00
cf00b314d3 Remove old structure 2020-05-30 19:49:35 +02:00
bd1795fb7e Add samples for the documentation 2020-05-30 19:44:45 +02:00
f3952c1ea8 Merge branch '106-fix-record-endpoint-allbetweenanduser' into 'master'
Resolve "Fix Record Endpoint allBetweenAndUser"

Closes #106

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!85
2020-05-30 17:05:16 +00:00
17a759ce1e bugfix for allBetweenAndUser Endpoint of records 2020-05-30 18:46:39 +02:00
Tim Zieger
ea4493f955 Merge branch '105-dropdown-edit-create-timetrack' into 'master'
Resolve "Dropdown edit create timetrack"

Closes #105

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!83
2020-05-30 09:11:06 +00:00
Tim Zieger
ea53de257e dropdown and projection for account 2020-05-30 10:54:00 +02:00
Tim Zieger
f3b9a0879b Merge branch '96-date-and-time-picker-for-timetracks' into 'master'
Resolve "date and time picker for timetracks"

Closes #96

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!81
2020-05-30 07:54:30 +00:00
Tim Zieger
3c4cbaf126 pickers 2020-05-29 17:34:23 +02:00
Tim Zieger
f509ad0d9a Merge branch '103-frontend-crashes-if-something-is-null' into 'master'
Resolve "Frontend crashes if something is null"

Closes #103

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!80
2020-05-29 08:23:06 +00:00
Tim Zieger
04abba8c1c bug fixed chrash if null 2020-05-29 10:05:18 +02:00
Tobias Wieck
d1910ea10d Merge branch '100-change-timetrack-account' into 'master'
Resolve "Change timetrack account"

Closes #100

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!76
2020-05-28 19:16:22 +00:00
wiecktobi
8521832315 Query track endpoint and show start/enddate 2020-05-28 20:49:58 +02:00
613c5cf0ac Merge branch '104-update-backend-timezone' into 'master'
Resolve "Update backend timezone"

Closes #104

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!79
2020-05-28 18:13:08 +00:00
161f5c7054 Update timezone of jre docker image 2020-05-28 19:57:05 +02:00
77c6b85eec Merge branch '102-track-endpoint-crashes-if-something-is-null' into 'master'
Resolve "Track endpoint crashes if something is null"

Closes #102

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!78
2020-05-28 17:19:10 +00:00
75d2cb6670 Fix crash when all record fields are null 2020-05-28 19:03:10 +02:00
Tim Zieger
19d01b1502 Merge branch '97-account-link-and-admin' into 'master'
Resolve "Account link and admin"

Closes #97

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!77
2020-05-28 15:41:34 +00:00
Tim Zieger
5ace5c4317 account link and admin + remove role 2020-05-28 17:18:05 +02:00
wiecktobi
c52daee815 Read, save and display account name, description and revenue 2020-05-28 16:19:55 +02:00
wiecktobi
dad0594854 Set geofenc according to users location values 2020-05-28 11:33:11 +02:00
Tobias Wieck
2a1eb3feef Merge branch '98-fix-geofence' into 'master'
Resolve "Fix geofence"

Closes #98

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!75
2020-05-27 22:22:54 +00:00
wiecktobi
1fbed97fb2 Update input fields and buttons plus fix security gap at logout 2020-05-27 22:55:21 +02:00
wiecktobi
73187542cd Bug fix 2020-05-27 20:19:05 +02:00
Tim Zieger
08b996308f Merge branch '94-action-listener-for-butttons' into 'master'
Resolve "Action listener for Butttons"

Closes #94

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!74
2020-05-27 13:53:33 +00:00
Tim Zieger
95aaac09c8 event listener 2020-05-27 15:30:18 +02:00
Tim Zieger
8e2a8208f3 Merge branch '92-time-reccord-data-from-backend' into 'master'
Resolve "Time Reccord data from Backend"

Closes #92

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!73
2020-05-27 12:19:30 +00:00
Tim Zieger
f41a2af656 time record backend and replace selfuri 2020-05-27 13:01:18 +02:00
Tobias Wieck
5cd2defd3d Merge branch '51-logout-implementation' into 'master'
Resolve "Logout implementation"

Closes #51

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!72
2020-05-26 09:19:17 +00:00
wiecktobi
6bd11577e0 Logout functionality and small changes 2020-05-26 10:51:27 +02:00
Tim Zieger
57e8541c0e Merge branch '90-delete-user' into 'master'
Resolve "Delete User"

Closes #90

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!71
2020-05-26 08:33:33 +00:00
Tim Zieger
d5ef0004f6 delete user 2020-05-26 10:17:42 +02:00
Tobias Wieck
5908de5650 Merge branch '66-implement-functional-top-toolbar' into 'master'
Resolve "Implement functional Top Toolbar"

Closes #66

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!34
2020-05-25 22:16:37 +00:00
wiecktobi
6334b62e2b Override old JWT on login 2020-05-25 23:52:31 +02:00
wiecktobi
c124818fa6 Remove JWT data class
* Code formatting
* Static code analysis
2020-05-25 23:29:36 +02:00
wiecktobi
6907710f51 Create private file with JWT 2020-05-25 23:20:23 +02:00
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
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
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
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