Commit Graph

212 Commits

Author SHA1 Message Date
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
8209bedc22 Merge branch '46-design-activities' into 'master'
Resolve "Design activities"

Closes #46

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!32
2020-05-04 17:48:42 +00:00
dc9b7ef1ef add week summary component + router link 2020-05-04 19:10:38 +02:00
wiecktobi
cdcef1fdff Added Settings 2020-05-04 18:51:00 +02:00
wiecktobi
57f5ba4b03 Merge branch '46-design-activities' of https://gitlab.com/marcel.schwarz/2020ss-qbc-geofence-timetracking into 46-design-activities 2020-05-03 20:38:46 +02:00
wiecktobi
c3b01a4639 Small changes 2020-05-03 20:35:04 +02:00
wiecktobi
67379787b3 Regiser Activity 2020-05-03 20:35:03 +02:00
wiecktobi
99313fc877 Regiser Activity 2020-05-03 20:35:03 +02:00
wiecktobi
cd4df362a8 Added Logo as icon 2020-05-03 20:35:00 +02:00
wiecktobi
ad056e6507 Converted Fragments in Activities 2020-05-03 20:35:00 +02:00
wiecktobi
65364dcf81 Library updated 2020-05-03 20:35:00 +02:00
wiecktobi
8de7890c37 Added Fragments and Styles 2020-05-03 20:34:59 +02:00
wiecktobi
56a8901905 Small changes 2020-05-03 20:33:02 +02:00
f3237419dd Merge branch '44-update-libraries-and-environment' into 'master'
Resolve "Update libraries and environment"

Closes #44

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!29
2020-05-03 17:56:46 +00:00
wiecktobi
174537cdbd Regiser Activity 2020-05-03 19:52:58 +02:00
wiecktobi
3fdc8f6075 Regiser Activity 2020-05-03 19:52:43 +02:00
51f1c2f2fe Update node from 12 to 14 2020-05-03 19:50:26 +02:00
8d9b6a0348 Update Spring dependencies 2020-05-03 19:50:25 +02:00
Tim Zieger
ba2f3c93bb Merge branch '30-create-register-view' into 'master'
Resolve "Create Register View"

Closes #30

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!27
2020-05-03 12:58:14 +00:00
Tim Zieger
f824fe3302 register view 2020-05-03 11:30:21 +02:00
1eb2892d17 Merge branch '16-setup-token-based-authentification' into 'master'
Resolve "Setup token based authentification"

Closes #16

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!31
2020-05-02 22:16:16 +00:00
wiecktobi
4f38d46ca9 Added Logo as icon 2020-05-02 20:37:44 +02:00
wiecktobi
e78258597f Converted Fragments in Activities 2020-05-02 17:05:17 +02:00
wiecktobi
3abd63cda2 Library updated 2020-05-02 15:56:21 +02:00
004d1eef67 Change password notice 2020-05-02 11:52:01 +02:00
ec702d93c5 Add sample user controller with sign-up and name of current user 2020-05-01 23:57:47 +02:00
c7ff49bc64 Update data.sql to drop all existing entries at restart 2020-05-01 23:55:23 +02:00
20eb68b44f Implement JWT Security Manager Filter
Rename User to TimetrackUser
Add default data
Add BCrypter as password encryptor
Add security constants
Enable websecurity on all endpoints except on SIGN_UP_URL
Implement UserDetailsService
Update properties files
2020-05-01 23:10:54 +02:00
db05d41d06 Add spring security and jwt, Add lombok, Reorder dependencies 2020-05-01 19:57:30 +02:00
b4cf5eb96b Activate SQL statement logging in debug 2020-05-01 19:52:17 +02:00
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
23a72fa238 Formatting 2020-04-30 20:42:22 +02:00
56a3ddad27 Create TimeRecord, Timetrackaccount and Role
Move Entities in correct packages
2020-04-30 20:40:59 +02:00
945316ae67 Add Role Repository 2020-04-30 20:40:59 +02:00
92de6cc6f4 Add Role, TimeRecord, TimetrackAccount and RecordType
Update User to have Roles and TimetrackAccounts
2020-04-30 20:40:59 +02:00
60f069b635 Activate H2 console for the dev environment 2020-04-30 20:40:59 +02:00
05cb94abf0 Generate User Constructor with lombok 2020-04-30 20:40:58 +02:00
e944d34316 Move User and UserRepository to the correct packages 2020-04-30 20:40:58 +02:00
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
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
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
b3a508b4d4 Change only to rules block
Because only is a deprecated feature
2020-04-29 00:43:56 +02:00
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