Compare commits

..

18 Commits

Author SHA1 Message Date
Rex e209c3891e merge(dev): Re-apply changes after conflict resolution
Dev Build / build-test (pull_request) Failing after 1m9s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 4s
2026-04-27 18:16:47 -04:00
Rex d3c1b929c5 Merge remote-tracking branch 'origin/dev' into fix-pr-22
# Conflicts:
#	backend/Domain/Interfaces/IMoonrakerClient.cs
#	backend/Infrastructure/Services/MoonrakerClient.cs
#	backend/Program.cs
#	backend/appsettings.json
2026-04-27 18:16:47 -04:00
overseer c3a0f210a1 Merge pull request 'CUB-64: Docker Runtime Setup for Development & Deployment' (#14) from agent/dex/CUB-64-docker-runtime-setup into dev
Dev Build / build-test (push) Failing after 59s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 3s
Reviewed-on: https://code.cubecraftcreations.com/CubeCraft-Creations/Extrudex/pulls/14
2026-04-27 17:34:40 -04:00
overseer 2017843dc1 Merge branch 'dev' into agent/dex/CUB-64-docker-runtime-setup
Dev Build / build-test (pull_request) Failing after 58s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 17:34:26 -04:00
overseer c150f54c64 Merge pull request 'feat(CUB-39): Create background job for filament usage sync' (#16) from agent/dex/CUB-39-filament-usage-sync into dev
Dev Build / deploy-dev (push) Has been cancelled
Dev Build / notify-success (push) Has been cancelled
Dev Build / notify-failure (push) Has been cancelled
Dev Build / build-test (push) Has been cancelled
Reviewed-on: https://code.cubecraftcreations.com/CubeCraft-Creations/Extrudex/pulls/16
2026-04-27 17:33:59 -04:00
overseer 73363206ec Merge branch 'dev' into agent/dex/CUB-39-filament-usage-sync
Dev Build / build-test (pull_request) Failing after 1m3s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 4s
2026-04-27 17:25:58 -04:00
overseer 174dd294e9 Merge pull request 'CUB-37: Implement cost-per-print calculation service' (#18) from agent/dex/CUB-37-cost-per-print into dev
Dev Build / build-test (push) Failing after 1m3s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 3s
Reviewed-on: https://code.cubecraftcreations.com/CubeCraft-Creations/Extrudex/pulls/18
2026-04-27 17:25:37 -04:00
overseer 0378aee43e Merge branch 'dev' into agent/dex/CUB-37-cost-per-print
Dev Build / build-test (pull_request) Failing after 1m0s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 5s
2026-04-27 17:25:22 -04:00
overseer 72a39ec766 Merge pull request 'CUB-34: Add filament filter bar with material type, color, and low stock filters' (#21) from agent/rex/CUB-34-filament-list-ui into dev
Dev Build / build-test (push) Failing after 51s
Dev Build / deploy-dev (push) Has been skipped
Dev Build / notify-success (push) Has been skipped
Dev Build / notify-failure (push) Successful in 3s
Reviewed-on: https://code.cubecraftcreations.com/CubeCraft-Creations/Extrudex/pulls/21
Reviewed-by: Joshua <joshua@cnjmail.com>
2026-04-27 17:14:55 -04:00
Dex c05b9dd87d merge(dev): Re-apply CUB-34 changes after merge conflict resolution
Dev Build / build-test (pull_request) Failing after 54s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 17:02:25 -04:00
Dex 5a577e1871 Merge remote-tracking branch 'origin/dev' into fix-pr-21
# Conflicts:
#	frontend/src/app/components/filament-table/filament-table.component.html
#	frontend/src/app/components/filament-table/filament-table.component.ts
2026-04-27 17:02:25 -04:00
Dex d207c49ffd CUB-34: add filament filter bar with material type, color, and low stock filters
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / build-test (pull_request) Failing after 54s
Dev Build / notify-failure (pull_request) Successful in 6s
2026-04-27 15:08:31 -04:00
Dex 5b9dde13fe Merge remote-tracking branch 'origin/dev' into fix-pr-18
Dev Build / build-test (pull_request) Failing after 54s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 4s
# Conflicts:
#	backend/API/Controllers/PrintJobsController.cs
2026-04-27 14:30:05 -04:00
Dex fd9fcd47ab Merge remote-tracking branch 'origin/dev' into fix-pr-14
Dev Build / build-test (pull_request) Failing after 58s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
# Conflicts:
#	frontend/.dockerignore
#	frontend/Dockerfile
#	frontend/nginx.conf
2026-04-27 14:30:03 -04:00
overseer d43985cad9 Merge branch 'dev' into agent/dex/CUB-39-filament-usage-sync
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
Dev Build / build-test (pull_request) Failing after 52s
2026-04-27 14:15:16 -04:00
Dex 6aa31f4be3 CUB-37: implement cost-per-print calculation service
Dev Build / build-test (pull_request) Failing after 48s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 17:57:57 +00:00
Dex 4ba98966eb feat(CUB-39): create background job for filament usage sync
Dev Build / build-test (pull_request) Failing after 48s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
2026-04-27 17:23:24 +00:00
Dex 61178ebb7b feat(CUB-64): Docker runtime setup for development & deployment
Dev Build / build-test (pull_request) Failing after 47s
Dev Build / deploy-dev (pull_request) Has been skipped
Dev Build / notify-success (pull_request) Has been skipped
Dev Build / notify-failure (pull_request) Successful in 3s
- Backend Dockerfile: added curl install for health check (not in aspnet base image)
- Frontend Dockerfile: multi-stage Angular build with nginx serving
- Frontend nginx.conf: SPA routing, API proxy, SignalR WebSocket support, health endpoint
- Frontend .dockerignore: excludes node_modules, dist, .angular, etc.
- docker-compose.dev.yml: added PostgreSQL service, fixed frontend context path,
  renamed web service from control-center-web to extrudex-web, added DB env vars,
  proper service dependencies with health checks
- deploy.sh: updated service list to include PostgreSQL port
2026-04-27 08:33:18 +00:00

Diff Content Not Available