Merge remote-tracking branch 'htwk-org/development'

Browse Source

# Conflicts:
#	backend/go.mod
#	frontend/index.html
#	frontend/package-lock.json
#	frontend/package.json
#	frontend/public/themes/lara-dark-blue/theme.css
#	frontend/public/themes/lara-dark-blue/theme.css.map
#	frontend/public/themes/lara-light-blue/theme.css
#	frontend/public/themes/lara-light-blue/theme.css.map
#	frontend/src/App.vue
#	frontend/src/components/DarkModeSwitcher.vue
#	frontend/src/i18n/index.ts
#	frontend/src/main.ts
#	frontend/src/router/index.ts
#	frontend/src/view/CalendarLink.vue
#	frontend/src/view/edit/EditCalendar.vue
#	frontend/vite.config.ts
#	reverseproxy.conf
#	reverseproxy.local.conf
#	services/data-manager/main.go
#	services/data-manager/model/roomOccupancyModel.go
#	services/data-manager/service/addRoute.go
#	services/data-manager/service/addSchedule.go
#	services/data-manager/service/db/dbGroups.go
#	services/data-manager/service/feed/feedFunctions.go
#	services/data-manager/service/fetch/sport/sportFetcher.go
#	services/data-manager/service/fetch/v1/fetchSeminarEventService.go
#	services/data-manager/service/fetch/v1/fetchSeminarGroupService.go
#	services/data-manager/service/fetch/v2/fetcher.go
#	services/data-manager/service/functions/filter.go
#	services/data-manager/service/functions/filter_test.go
#	services/data-manager/service/functions/time/parse.go
#	services/data-manager/service/room/roomService.go
#	services/data-manager/service/room/roomService_test.go
#	services/go.sum
#	services/ical/service/connector/grpc/client.go

...

This commit is contained in:

Elmar Kresse

2024-07-24 12:16:51 +02:00

parent cb17920cb8 695d814de6

commit b7b996ffdf

188 changed files with 9639 additions and 26900 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

frontend/public/img/banner-image.png Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 MiB

BIN

frontend/public/promo/htwkarte.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.1 KiB

BIN

frontend/public/promo/mensa.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.0 KiB

10614

frontend/public/themes/lara-dark-blue/theme.css

File diff suppressed because one or more lines are too long

2

frontend/public/themes/lara-dark-blue/theme.css.map

File diff suppressed because one or more lines are too long

10612

frontend/public/themes/lara-light-blue/theme.css

File diff suppressed because one or more lines are too long

2

frontend/public/themes/lara-light-blue/theme.css.map

File diff suppressed because one or more lines are too long