Commit Graph

  • 4089e46d1a Merge branch '106-fix-record-endpoint-allbetweenanduser' into 'master' Simon Kellner 2020-05-30 16:46:44 +0000
  • 17a759ce1e bugfix for allBetweenAndUser Endpoint of records the_kellner 2020-05-30 18:46:39 +0200
  • ea4493f955 Merge branch '105-dropdown-edit-create-timetrack' into 'master' Tim Zieger 2020-05-30 09:11:06 +0000
  • bc1313bd80 Merge branch '105-dropdown-edit-create-timetrack' into 'master' Tim Zieger 2020-05-30 08:54:12 +0000
  • ea53de257e dropdown and projection for account Tim Zieger 2020-05-30 10:54:00 +0200
  • f3b9a0879b Merge branch '96-date-and-time-picker-for-timetracks' into 'master' Tim Zieger 2020-05-30 07:54:30 +0000
  • 8afdcad9e5 Merge branch '96-date-and-time-picker-for-timetracks' into 'master' Tim Zieger 2020-05-29 15:34:33 +0000
  • 3c4cbaf126 pickers Tim Zieger 2020-05-29 17:34:23 +0200
  • f509ad0d9a Merge branch '103-frontend-crashes-if-something-is-null' into 'master' Tim Zieger 2020-05-29 08:23:06 +0000
  • 26923c06d6 Merge branch '103-frontend-crashes-if-something-is-null' into 'master' Tim Zieger 2020-05-29 08:05:33 +0000
  • 04abba8c1c bug fixed chrash if null Tim Zieger 2020-05-29 10:05:18 +0200
  • d1910ea10d Merge branch '100-change-timetrack-account' into 'master' Tobias Wieck 2020-05-28 19:16:22 +0000
  • 3855b5087f Merge branch '100-change-timetrack-account' into 'master' Tobias Wieck 2020-05-28 18:50:09 +0000
  • 8521832315 Query track endpoint and show start/enddate wiecktobi 2020-05-28 20:49:58 +0200
  • 613c5cf0ac Merge branch '104-update-backend-timezone' into 'master' Marcel Schwarz 2020-05-28 18:13:08 +0000
  • 41167f4eff Merge branch '104-update-backend-timezone' into 'master' Marcel Schwarz 2020-05-28 17:57:10 +0000
  • 161f5c7054 Update timezone of jre docker image Marcel Schwarz 2020-05-28 19:57:05 +0200
  • 77c6b85eec Merge branch '102-track-endpoint-crashes-if-something-is-null' into 'master' Marcel Schwarz 2020-05-28 17:19:10 +0000
  • 29a175b461 Merge branch '102-track-endpoint-crashes-if-something-is-null' into 'master' Marcel Schwarz 2020-05-28 17:03:17 +0000
  • 75d2cb6670 Fix crash when all record fields are null Marcel Schwarz 2020-05-28 19:03:10 +0200
  • 19d01b1502 Merge branch '97-account-link-and-admin' into 'master' Tim Zieger 2020-05-28 15:41:34 +0000
  • 762763a696 Merge branch '97-account-link-and-admin' into 'master' Tim Zieger 2020-05-28 15:18:12 +0000
  • 5ace5c4317 account link and admin + remove role Tim Zieger 2020-05-28 17:18:05 +0200
  • c52daee815 Read, save and display account name, description and revenue wiecktobi 2020-05-28 16:19:55 +0200
  • dad0594854 Set geofenc according to users location values wiecktobi 2020-05-28 11:33:11 +0200
  • 2a1eb3feef Merge branch '98-fix-geofence' into 'master' Tobias Wieck 2020-05-27 22:22:54 +0000
  • bfafcf237d Merge branch '98-fix-geofence' into 'master' Tobias Wieck 2020-05-27 20:56:44 +0000
  • 1fbed97fb2 Update input fields and buttons plus fix security gap at logout wiecktobi 2020-05-27 22:55:21 +0200
  • 73187542cd Bug fix wiecktobi 2020-05-27 20:19:05 +0200
  • 08b996308f Merge branch '94-action-listener-for-butttons' into 'master' Tim Zieger 2020-05-27 13:53:33 +0000
  • 0103bbf38e Merge branch '94-action-listener-for-butttons' into 'master' Tim Zieger 2020-05-27 13:30:26 +0000
  • 95aaac09c8 event listener Tim Zieger 2020-05-27 15:30:18 +0200
  • 8e2a8208f3 Merge branch '92-time-reccord-data-from-backend' into 'master' Tim Zieger 2020-05-27 12:19:30 +0000
  • 65fa7da404 Merge branch '92-time-reccord-data-from-backend' into 'master' Tim Zieger 2020-05-27 11:01:25 +0000
  • f41a2af656 time record backend and replace selfuri Tim Zieger 2020-05-27 13:01:18 +0200
  • 5cd2defd3d Merge branch '51-logout-implementation' into 'master' Tobias Wieck 2020-05-26 09:19:17 +0000
  • ccf28aab4f Merge branch '51-logout-implementation' into 'master' Tobias Wieck 2020-05-26 08:51:49 +0000
  • 6bd11577e0 Logout functionality and small changes wiecktobi 2020-05-26 10:51:27 +0200
  • 57e8541c0e Merge branch '90-delete-user' into 'master' Tim Zieger 2020-05-26 08:33:33 +0000
  • 888fa881d6 Merge branch '90-delete-user' into 'master' Tim Zieger 2020-05-26 08:17:49 +0000
  • d5ef0004f6 delete user Tim Zieger 2020-05-26 10:17:42 +0200
  • 5908de5650 Merge branch '66-implement-functional-top-toolbar' into 'master' Tobias Wieck 2020-05-25 22:16:37 +0000
  • 6334b62e2b Override old JWT on login wiecktobi 2020-05-25 23:52:31 +0200
  • c124818fa6 Remove JWT data class * Code formatting * Static code analysis wiecktobi 2020-05-25 23:29:36 +0200
  • 6907710f51 Create private file with JWT wiecktobi 2020-05-25 23:20:23 +0200
  • 881d01535d Change app theme * Toolbar with logout on home screen * Add a Toolbar to login and register view * Embed Settings view wiecktobi 2020-05-04 20:26:29 +0200
  • 50446e0654 Merge branch '91-backend-uses-cascaded-delete-for-entities' into 'master' Marcel Schwarz 2020-05-25 19:25:42 +0000
  • 929deea7bc Merge branch '91-backend-uses-cascaded-delete-for-entities' into 'master' Marcel Schwarz 2020-05-25 19:10:59 +0000
  • 4e560b9d36 Add cascading delete for connected entities Marcel Schwarz 2020-05-25 21:10:19 +0200
  • 0d4eb694c9 Merge branch '89-remove-localhost' into 'master' Tim Zieger 2020-05-25 17:39:15 +0000
  • 8dea51c803 Merge branch '89-remove-localhost' into 'master' Tim Zieger 2020-05-25 17:22:24 +0000
  • 8992dd028b no more localhost Tim Zieger 2020-05-25 19:22:09 +0200
  • b1320fb11e Merge branch '78-update-timetrack-accounts' into 'master' Simon Kellner 2020-05-25 16:58:48 +0000
  • dcd86e9369 Merge branch '78-update-timetrack-accounts' into 'master' Simon Kellner 2020-05-25 16:38:40 +0000
  • 214d5b9218 add timetrack account managing views and implement functionality the_kellner 2020-05-25 18:38:34 +0200
  • 0047556180 Merge branch '80-query-backend-endpoint-whoami' into 'master' Tobias Wieck 2020-05-25 12:46:03 +0000
  • 52e862afbe Resolve "Query backend endpoint whoami" Tobias Wieck 2020-05-25 12:46:02 +0000
  • 4c83339321 Merge branch '80-query-backend-endpoint-whoami' into 'master' Tobias Wieck 2020-05-25 12:38:00 +0000
  • b20f2e8a61 Merge branch '88-list-all-timetrack-accounts-for-a-given-user' into 'master' Marcel Schwarz 2020-05-25 12:26:33 +0000
  • 38b9b042de Merge branch '88-list-all-timetrack-accounts-for-a-given-user' into 'master' Marcel Schwarz 2020-05-25 12:11:42 +0000
  • 781ec85851 Implement to query accounts for a given user Marcel Schwarz 2020-05-25 14:11:34 +0200
  • 637d1f8bc6 Deleted legacy code for GPS location wiecktobi 2020-05-25 14:07:03 +0200
  • f50f7ef727 Show firstname when logged in wiecktobi 2020-05-25 13:58:19 +0200
  • 83bd086792 Merge branch '85-implement-default-actions' into 'master' Tim Zieger 2020-05-25 10:30:45 +0000
  • cccdc94166 Merge branch '85-implement-default-actions' into 'master' Tim Zieger 2020-05-25 10:10:09 +0000
  • 2a68777f67 implement default actions Tim Zieger 2020-05-25 12:10:02 +0200
  • edd7317aa4 Merge branch '79-update-users-properties-from-frontend' into 'master' Tim Zieger 2020-05-24 10:02:51 +0000
  • c55d9c33b7 Merge branch '79-update-users-properties-from-frontend' into 'master' Tim Zieger 2020-05-24 08:46:11 +0000
  • 3a04ff8823 edit user Tim Zieger 2020-05-24 10:46:03 +0200
  • 70e3a60930 Merge branch '74-disable-start-button' into 'master' Tobias Wieck 2020-05-23 16:39:27 +0000
  • 841a9545e6 Resolve "Disable start button" Tobias Wieck 2020-05-23 16:39:27 +0000
  • 598000bc65 Merge branch '74-disable-start-button' into 'master' Tobias Wieck 2020-05-23 15:55:22 +0000
  • eb91111df4 Stop tracking when leaving geofence wiecktobi 2020-05-23 17:55:10 +0200
  • ad6aeddcfd Toggle clickable receiving geofenceaction wiecktobi 2020-05-23 16:51:07 +0200
  • 4b2fe41d9f Merge branch '83-user-list-add-style' into 'master' Tim Zieger 2020-05-22 12:15:27 +0000
  • e7f273c32a Merge branch '83-user-list-add-style' into 'master' Tim Zieger 2020-05-22 11:58:34 +0000
  • 736e571471 users same style as timetrack Tim Zieger 2020-05-22 13:57:47 +0200
  • 7488b5bb03 Merge branch '77-list-of-users' into 'master' Tim Zieger 2020-05-21 08:36:55 +0000
  • 9dddc8d5fb Merge branch '77-list-of-users' into 'master' Tim Zieger 2020-05-21 08:21:40 +0000
  • 030b8c47d3 list of Users Tim Zieger 2020-05-21 10:21:32 +0200
  • ed284da1ac Merge branch '81-custom-endpoints' into 'master' Marcel Schwarz 2020-05-20 22:02:04 +0000
  • b64ce72607 Merge branch '81-custom-endpoints' into 'master' Marcel Schwarz 2020-05-20 21:45:43 +0000
  • 5e161d9c9d Remove accounts references from User Marcel Schwarz 2020-05-20 23:45:36 +0200
  • 5eb6efcffe Implement /track endpoint Marcel Schwarz 2020-05-20 23:26:20 +0200
  • 9f8fd0af1e Implement custom record searches Create record overview projection Add today search with scoped principal Add sample data for records Marcel Schwarz 2020-05-20 02:03:03 +0200
  • 3310062138 Merge branch '76-rework-the-design-for-a-single-time-record' into 'master' Simon Kellner 2020-05-20 16:03:23 +0000
  • 2751105de6 Merge branch '76-rework-the-design-for-a-single-time-record' into 'master' Simon Kellner 2020-05-20 15:47:22 +0000
  • a6c4cc48d9 add new TimeRecordItem and TimeRecord list design the_kellner 2020-05-20 17:47:17 +0200
  • 3d1f2fd741 Merge branch '75-menu-depending-on-loginstate' into 'master' Tim Zieger 2020-05-19 13:40:56 +0000
  • 176c0d1729 Merge branch '75-menu-depending-on-loginstate' into 'master' Tim Zieger 2020-05-19 13:22:03 +0000
  • a1072f40b3 menu depending on loginstate Tim Zieger 2020-05-19 11:11:07 +0200
  • 04d4d9563b Merge branch '50-create-record-rest-controller' into 'master' Marcel Schwarz 2020-05-19 09:33:50 +0000
  • 5cacce02fc Merge branch '50-create-record-rest-controller' into 'master' Marcel Schwarz 2020-05-19 08:50:47 +0000
  • 24b6ff4618 Make UserController a BasePathAwareController Marcel Schwarz 2020-05-19 10:50:33 +0200
  • 0f700d87b0 Adjust records endpoint name and rels, enable paging Marcel Schwarz 2020-05-19 10:35:14 +0200
  • 0aa257dbaf Merge branch '82-update-geofence-for-api-29' into 'master' Tobias Wieck 2020-05-18 21:13:15 +0000
  • 560cfbbf0c Merge branch '82-update-geofence-for-api-29' into 'master' Tobias Wieck 2020-05-18 19:53:01 +0000
  • 65fc373f97 Added permission request wiecktobi 2020-05-18 21:52:52 +0200
  • 10a1d3a3fa Merge branch '73-implement-geofence' into 'master' Tobias Wieck 2020-05-18 15:29:41 +0000
  • e6b147356e Merge branch '73-implement-geofence' into 'master' Tobias Wieck 2020-05-18 15:06:18 +0000