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

76 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel Schwarz
b90b018196 Merge branch '28-create-all-entities' into 'master' 
Resolve "Create all Entities"

Closes #28

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!24
 2020-04-30 18:47:54 +00:00
Marcel Schwarz
23a72fa238 Formatting 2020-04-30 20:42:22 +02:00
Marcel Schwarz
56a3ddad27 Create TimeRecord, Timetrackaccount and Role 
Move Entities in correct packages
 2020-04-30 20:40:59 +02:00
Marcel Schwarz
945316ae67 Add Role Repository 2020-04-30 20:40:59 +02:00
Marcel Schwarz
92de6cc6f4 Add Role, TimeRecord, TimetrackAccount and RecordType 
Update User to have Roles and TimetrackAccounts
 2020-04-30 20:40:59 +02:00
Marcel Schwarz
60f069b635 Activate H2 console for the dev environment 2020-04-30 20:40:59 +02:00
Marcel Schwarz
05cb94abf0 Generate User Constructor with lombok 2020-04-30 20:40:58 +02:00
Marcel Schwarz
e944d34316 Move User and UserRepository to the correct packages 2020-04-30 20:40:58 +02:00
Simon Kellner
f67ab2aac6 Merge branch '43-implement-click-on-logo' into 'master' 
Resolve "Implement click on logo"

Closes #43

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!28
 2020-04-30 11:44:02 +00:00
the_kellner
da7aaf68ec implement click on logo as link to homepage 2020-04-30 13:36:35 +02:00
Tim Zieger
1f90144c48 Merge branch '27-create-login-view' into 'master' 
Resolve "Create Login view"

Closes #27

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!23
 2020-04-29 10:02:04 +00:00
Tim Zieger
8b728b180e login view 2020-04-29 11:57:58 +02:00
Marcel Schwarz
703bd5f51b Merge branch '42-create-auto-deployment-pipeline' into 'master' 
Bugfix of ci pipeline

Closes #42

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!26
 2020-04-28 22:47:55 +00:00
Marcel Schwarz
b3a508b4d4 Change only to rules block 
Because only is a deprecated feature
 2020-04-29 00:43:56 +02:00
Marcel Schwarz
87ef3fe09e Merge branch '42-create-auto-deployment-pipeline' into 'master' 
Resolve "Create auto deployment pipeline"

Closes #42

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!25
 2020-04-28 22:41:42 +00:00
Marcel Schwarz
a2b55ca1c0 Add gitlab ci 2020-04-29 00:11:48 +02:00
Marcel Schwarz
4da629ce2d Merge branch '45-switch-jpa-to-backed-by-postgres' into 'master' 
Resolve "Switch JPA to backed by Postgres"

Closes #45

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!22
 2020-04-26 13:55:05 +00:00
Marcel Schwarz
144305a6c0 Lower max lifetime value for mysql connection 2020-04-26 15:52:50 +02:00
Simon Kellner
37afc78824 Merge branch '29-view-for-a-single-time-track-entry' into 'master' 
Resolve "View for a single time track entry"

Closes #29

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!21
 2020-04-25 16:58:13 +00:00
the_kellner
7c61910cb6 Add Time Records view with multiple TimeRecordItems 2020-04-25 18:33:24 +02:00
Marcel Schwarz
fb75531beb Merge branch '14-connect-backend-to-mysql-database' into 'master' 
Resolve "Connect Backend to MySQL database"

Closes #14

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!17
 2020-04-22 18:54:32 +00:00
Marcel Schwarz
52b5065558 Add fail timeout for mariadb spring boot connection, Add spring actuator 2020-04-22 20:36:34 +02:00
Marcel Schwarz
2c7418529b Add dev and prod profile, Add MariaDB connector 
Prod is default
Add IDEA Run Configs for DEV (IDEA) and PROD (Docker-Compose)
 2020-04-22 19:13:46 +02:00
Marcel Schwarz
496394dac1 Add Compose run config for IDEA 2020-04-22 19:13:45 +02:00
Tim Zieger
75a7db8610 Merge branch '32-stick-footer-to-bottom-of-the-page' into 'master' 
Resolve "Stick footer to bottom of the page"

Closes #32

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!20
 2020-04-21 14:12:02 +00:00
Tim Zieger
4f3f01e686 footer at bottom 2020-04-21 16:10:53 +02:00
Tim Zieger
a077adb591 Merge branch '41-frontend-design-adjustments' into 'master' 
Resolve "Frontend design adjustments"

Closes #41

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!18
 2020-04-21 12:47:30 +00:00
Tim Zieger
910abe4b57 dark theme desing 2020-04-21 14:41:48 +02:00
Simon Kellner
b4137cfc58 Merge branch '39-refine-logo-quality' into 'master' 
Resolve "Refine logo quality"

Closes #39

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!19
 2020-04-21 10:42:37 +00:00
the_kellner
ff677f1ecf add high quality dark logo 2020-04-21 12:36:48 +02:00
Tim Zieger
b81d491437 Merge branch '40-replace-link-to-the-logo' into 'master' 
Resolve "Replace link to the logo"

Closes #40

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!16
 2020-04-21 07:25:35 +00:00
Tim Zieger
b2beafa5df new logo link 2020-04-21 09:24:00 +02:00
Simon Kellner
1640f9d47d Merge branch '26-create-logo' into 'master' 
Resolve "Create Logo"

Closes #26

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!14
 2020-04-20 17:36:18 +00:00
the_kellner
35fbc7fc0f Add logo to assets 2020-04-20 19:31:51 +02:00
Marcel Schwarz
c19e16fbdc Merge branch '33-routing-only-works-only-on-spa' into 'master' 
Resolve "Routing only works only on SPA"

Closes #33

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!15
 2020-04-20 17:05:42 +00:00
Marcel Schwarz
386f338ec6 update nginx conf to use vue redirect 2020-04-20 19:04:34 +02:00
Tim Zieger
56bac021e6 Merge branch '24-create-the-header' into 'master' 
Resolve "Create the Header"

Closes #24

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!13
 2020-04-19 16:59:39 +00:00
wiecktobi
7fa241069c Merge branch 'android-lib-updates' into 'master' 
Update Kotlin and JUnit

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!7
 2020-04-19 12:03:12 +00:00
Tim Zieger
210861d343 header created 2020-04-19 11:35:25 +02:00
Marcel Schwarz
d1f153cb71 Update CODEOWNERS 2020-04-17 21:41:29 +00:00
Marcel Schwarz
eda39567d1 Add CODEOWNERS 2020-04-17 21:39:23 +00:00
Marcel Schwarz
7c052b4179 Merge branch '25-create-the-footer' into 'master' 
Resolve "Create the Footer"

Closes #25

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!10
 2020-04-17 20:44:10 +00:00
Marcel Schwarz
e87bdc8e79 Merge branch '12-implement-user-service' into 'master' 
Resolve "Implement User Service"

Closes #12

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!8
 2020-04-17 16:56:34 +00:00
Marcel Schwarz
916524eed5 Remove UserService because it's not needed for a data entity 2020-04-17 18:45:22 +02:00
Marcel Schwarz
dd94b40110 Update base endpoint to "/api" 2020-04-17 18:44:31 +02:00
Marcel Schwarz
b40d87375a Make UserRepository from type PagingAndSorting 2020-04-17 18:44:06 +02:00
Marcel Schwarz
ce81ff07ba Remove UserController, Add UserRepository 2020-04-17 18:03:36 +02:00
Marcel Schwarz
9ef00cc092 Create User entity 2020-04-17 18:02:57 +02:00
Tim Zieger
f4b7173066 created footer 2020-04-17 10:15:09 +02:00
Marcel Schwarz
41338738b0 Add lombok dependencies 2020-04-15 23:51:07 +02:00