Commit Graph

5 Commits

Author SHA1 Message Date
Alexandre Vryghem
e1f3cc09cb 117616: Auto-fixed new linting rules 2025-05-16 18:21:05 +02:00
Alexandre Vryghem
1fb2b01af9 Merge remote-tracking branch 'upstream/main' into minor-themed-component-fixes_contribute-main
# Conflicts:
#	src/app/item-page/media-viewer/media-viewer.component.html
#	src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
2024-04-30 22:56:40 +02:00
Alexandre Vryghem
147b9f2efb Merge branch 'main' into minor-themed-component-fixes_contribute-main 2024-03-24 23:56:23 +01:00
Alexandre Vryghem
bb490f827b Merge remote-tracking branch 'contributions/w2p-107950_themed-metadata-import-page-component' into minor-themed-component-fixes_contribute-main
# Conflicts:
#	src/app/admin/admin-routing.module.ts
#	src/app/admin/admin.module.ts
#	src/themes/custom/lazy-theme.module.ts
2024-03-09 14:19:47 +01:00
Nona Luypaert
22b596b3aa 107950: Theme MetadataImportPageComponent 2024-01-22 15:19:49 +01:00