778 Commits

Author SHA1 Message Date
ba58e95216 Merge branch 'fix-typo' into 'development'
fix: typo

See merge request htwk-software/htwkalender!100
2025-03-06 14:50:05 +00:00
3d433ee900 fix typo 2025-02-23 15:08:48 +01:00
1b780e41fe fix: make package job more robust to single charts changes 2025-02-11 01:18:11 +01:00
2536a47de7 fix: adjust ports of services in helm chart 2025-02-11 00:33:22 +01:00
242e14edb4 Merge branch '62-k8s-deployment-fsr-server' into 'development'
add k8s deployment, improved Dockerfiles and docker-compose.yaml files

See merge request htwk-software/htwkalender!90
2025-02-09 22:36:17 +00:00
c3be6dd63a add k8s deployment, improved Dockerfiles and docker-compose.yaml files 2025-02-09 22:36:17 +00:00
f4a84f9c9e fix: typo 2025-02-09 14:42:48 +01:00
f6a7dd78ae Merge branch '65-update-backend-deps' into 'development'
Resolve "update backend deps"

See merge request htwk-software/htwkalender!98
2025-01-17 18:17:32 +00:00
f96a87616f dep:#65 updated frontend deps 2025-01-17 19:11:29 +01:00
68e7bd8996 dep:#65 updated all backend deps 2025-01-17 19:08:47 +01:00
ee544094bc Merge branch 'development' into 'main'
Development

See merge request htwk-software/htwkalender!97
2025-01-17 17:33:28 +00:00
d9690d99e9 Merge branch '65-update-backend-deps' into 'development'
Resolve "update backend deps"

See merge request htwk-software/htwkalender!96
2025-01-06 19:00:00 +00:00
3001f21997 dep:#64 fixed version changes 2025-01-06 19:55:27 +01:00
7a2277194a Merge branch 'development' into 'main'
Development

See merge request htwk-software/htwkalender!95
2025-01-06 15:42:25 +00:00
8e040cade6 Merge branch '64-update-frontend-deps' into 'development'
fix:#64 remove unused Docker variables from CI configuration

See merge request htwk-software/htwkalender!94
2025-01-06 15:11:35 +00:00
02f5505671 fix:#64 remove unused Docker variables from CI configuration 2025-01-06 16:04:05 +01:00
093ecbd04f Merge branch '64-update-frontend-deps' into 'development'
Resolve "update frontend deps"

See merge request htwk-software/htwkalender!93
2025-01-06 14:36:26 +00:00
d6e57a0494 dep:#64 updated frontend packages and fixed changes 2025-01-06 12:22:09 +01:00
897ba2e7a4 Merge branch 'development' into 'main'
Update 01-12-2024

See merge request htwk-software/htwkalender!92
2024-12-08 21:19:18 +00:00
3869fbe307 Merge branch '61-adding-r-in-modulbeschreibung-to-include-room' into 'development'
Resolve "adding %r in "Modulbeschreibung" to include room"

See merge request htwk-software/htwkalender!91
2024-12-03 10:45:16 +00:00
0d0f34e0a1 fix:#61 added i18n update and pinned typescript version against vue-tsc problem with 2024-12-03 11:34:44 +01:00
8718a968b8 feat:#61 backend room template string 2024-12-03 10:58:13 +01:00
9f92c4f0eb feat:#61 added frontend description for room templating 2024-12-03 10:58:01 +01:00
f94e24b3ec fix:#61 updated frontend deps 2024-12-03 10:57:42 +01:00
55f32ca977 Merge branch 'development' into 'main'
Development

See merge request htwk-software/htwkalender!88
2024-11-19 14:27:38 +00:00
99fa353e4c Merge branch '16-room-calendar' into 'development'
Resolve "room calendar"

See merge request htwk-software/htwkalender!87
2024-11-18 20:38:11 +00:00
4809192570 fix:#16 added userAgent and fixed logging for room ical 2024-11-18 21:20:45 +01:00
86a6820038 fix:#16 fixed toast for room ical 2024-11-18 21:20:21 +01:00
23389eacc8 fix:#16 fixed frontend deps 2024-11-18 21:20:11 +01:00
d305644b61 Merge branch '16-room-calendar' into 'development'
Resolve "room calendar"

See merge request htwk-software/htwkalender!86
2024-11-08 20:03:45 +00:00
9f963ee75f fix:#16 refactored code duplication 2024-11-07 12:07:40 +01:00
087c9550d9 feat:#16 added translation for button and toast 2024-11-06 14:11:50 +01:00
fd7f296a3a fix:#16 removed unused import 2024-11-04 16:02:23 +01:00
3265c5515f feat:#16 added frontend button 2024-11-04 15:59:28 +01:00
42172fb0a5 feat:#16 added room ics api route 2024-10-25 00:16:02 +02:00
3d41d9d6a4 Merge branch 'development' into 'main'
Development

See merge request htwk-software/htwkalender!85
2024-10-20 12:02:38 +00:00
1b811dfb46 Merge branch '49-add-htwkarte-linkout-at-ics-event-info' into 'development'
fix:#49 new line fix google calendar description

See merge request htwk-software/htwkalender!84
2024-10-19 16:28:51 +00:00
b9bd7f52c0 fix:#49 test rewrite 2024-10-19 16:41:25 +02:00
84bc504734 fix:#49 new line fix google calendar description 2024-10-19 16:36:43 +02:00
9c85dfa42e Merge branch 'set-dependency-scanning-config-1' into 'development'
Set dependency scanning config 1

See merge request htwk-software/htwkalender!83
2024-10-19 14:12:03 +00:00
84d2524413 Merge branch '49-add-htwkarte-linkout-at-ics-event-info' into 'development'
Resolve "add htwkarte linkout at ics event info"

See merge request htwk-software/htwkalender!82
2024-10-19 14:05:49 +00:00
0cd8670724 feat:#00 edited ci file after auto Dependency security added 2024-10-19 16:02:32 +02:00
da17b24ec5 Configure Dependency Scanning in .gitlab-ci.yml, creating this file if it does not already exist 2024-10-19 13:56:31 +00:00
20020e1e49 feat:#49 refactoring and tests 2024-10-19 15:46:49 +02:00
d5b2eb4485 Merge branch '49-add-htwkarte-linkout-at-ics-event-info' into 'development'
Stale: Resolve "add htwkarte linkout at ics event info"

See merge request htwk-software/htwkalender!66
2024-10-17 09:12:10 +00:00
06b0fc9c5f Merge branch 'refs/heads/development' into 49-add-htwkarte-linkout-at-ics-event-info
# Conflicts:
#	services/ical/main.go
#	services/ical/service/ical/ical.go
#	services/ical/service/routes.go
2024-10-17 10:54:29 +02:00
adcd5deda1 fix:#49 removed old tests for old lib 2024-10-17 10:40:25 +02:00
f971a97378 feat:#49 added multiple room linkout and mapping for map 2024-10-17 10:39:17 +02:00
b8dd4338b3 feat:#49 switch to new branch for ical altrep 2024-10-15 14:59:33 +02:00
d49fcf2ffe Merge branch 'development' into 'main'
Development

See merge request htwk-software/htwkalender!81
2024-10-15 10:10:51 +00:00