Compare commits

base: CubeCraft-Creations:a3297726bd5932b0b23768d9139073b50c2ec600

Branches Tags

CubeCraft-Creations:dev CubeCraft-Creations:agent/dex/CUB-117-moonraker-mqtt-go CubeCraft-Creations:agent/Rex/CUB-130-add-edit-filament-form CubeCraft-Creations:agent/Rex/CUB-128-build-settings-page CubeCraft-Creations:agent/rex/CUB-129-print-jobs-list-page CubeCraft-Creations:agent/rex/CUB-134-printers-list-page CubeCraft-Creations:agent/Dex/CUB-117-moonraker-mqtt-integration CubeCraft-Creations:agent/rex/CUB-135-sse-react-ui CubeCraft-Creations:agent/rex/CUB-131-filament-detail CubeCraft-Creations:agent/hex/CUB-111-extrudex-schema CubeCraft-Creations:agent/rex/CUB-116-scaffold-react-frontend CubeCraft-Creations:agent/sketch/CUB-71-mobile-ui-design CubeCraft-Creations:agent/dex/CUB-33-moonraker-usage-polling CubeCraft-Creations:agent/rex/CUB-57-dashboard-summary CubeCraft-Creations:agent/rex/CUB-36-delete-confirmation CubeCraft-Creations:agent/rex/CUB-64-frontend-dockerfile CubeCraft-Creations:agent/hex/CUB-31-filament-usage-tracking-model CubeCraft-Creations:agent/dex/CUB-65-backend-dockerfile CubeCraft-Creations:agent/rex/CUB-58-signalr-service CubeCraft-Creations:main

...

compare: CubeCraft-Creations:73d8c7b45acbf6dc1f8eae0d9f434ff45e40f4c5

Branches Tags

CubeCraft-Creations:agent/dex/CUB-117-moonraker-mqtt-go CubeCraft-Creations:agent/Rex/CUB-130-add-edit-filament-form CubeCraft-Creations:dev CubeCraft-Creations:agent/Rex/CUB-128-build-settings-page CubeCraft-Creations:agent/rex/CUB-129-print-jobs-list-page CubeCraft-Creations:agent/rex/CUB-134-printers-list-page CubeCraft-Creations:agent/Dex/CUB-117-moonraker-mqtt-integration CubeCraft-Creations:agent/rex/CUB-135-sse-react-ui CubeCraft-Creations:agent/rex/CUB-131-filament-detail CubeCraft-Creations:agent/hex/CUB-111-extrudex-schema CubeCraft-Creations:agent/rex/CUB-116-scaffold-react-frontend CubeCraft-Creations:agent/sketch/CUB-71-mobile-ui-design CubeCraft-Creations:agent/dex/CUB-33-moonraker-usage-polling CubeCraft-Creations:agent/rex/CUB-57-dashboard-summary CubeCraft-Creations:agent/rex/CUB-36-delete-confirmation CubeCraft-Creations:agent/rex/CUB-64-frontend-dockerfile CubeCraft-Creations:agent/hex/CUB-31-filament-usage-tracking-model CubeCraft-Creations:agent/dex/CUB-65-backend-dockerfile CubeCraft-Creations:agent/rex/CUB-58-signalr-service CubeCraft-Creations:main

18 Commits

a3297726bd ... 73d8c7b45a

Author	SHA1	Message	Date
rex-bot	73d8c7b45a	merge(dev): Re-apply changes after conflict resolution	2026-04-27 18:16:49 -04:00
rex-bot	4a739cebe1	Merge remote-tracking branch 'origin/dev' into fix-pr-20 ... # Conflicts: # frontend/src/app/app.config.ts # frontend/src/app/components/filament-table/filament-table.component.html # frontend/src/app/components/filament-table/filament-table.component.ts # frontend/src/app/services/filament.service.ts	2026-04-27 18:16:49 -04:00
Joshua	c3a0f210a1	Merge pull request 'CUB-64: Docker Runtime Setup for Development & Deployment' (#14) from agent/dex/CUB-64-docker-runtime-setup into dev ... Reviewed-on: #14	2026-04-27 17:34:40 -04:00
Joshua	2017843dc1	Merge branch 'dev' into agent/dex/CUB-64-docker-runtime-setup	2026-04-27 17:34:26 -04:00
Joshua	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 ... Reviewed-on: #16	2026-04-27 17:33:59 -04:00
Joshua	73363206ec	Merge branch 'dev' into agent/dex/CUB-39-filament-usage-sync	2026-04-27 17:25:58 -04:00
Joshua	174dd294e9	Merge pull request 'CUB-37: Implement cost-per-print calculation service' (#18) from agent/dex/CUB-37-cost-per-print into dev ... Reviewed-on: #18	2026-04-27 17:25:37 -04:00
Joshua	0378aee43e	Merge branch 'dev' into agent/dex/CUB-37-cost-per-print	2026-04-27 17:25:22 -04:00
Joshua	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 ... Reviewed-on: #21 Reviewed-by: Joshua <joshua@cnjmail.com>	2026-04-27 17:14:55 -04:00
dex-bot	c05b9dd87d	merge(dev): Re-apply CUB-34 changes after merge conflict resolution	2026-04-27 17:02:25 -04:00
dex-bot	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-bot	d207c49ffd	CUB-34: add filament filter bar with material type, color, and low stock filters	2026-04-27 15:08:31 -04:00
dex-bot	5b9dde13fe	Merge remote-tracking branch 'origin/dev' into fix-pr-18 ... # Conflicts: # backend/API/Controllers/PrintJobsController.cs	2026-04-27 14:30:05 -04:00
dex-bot	fd9fcd47ab	Merge remote-tracking branch 'origin/dev' into fix-pr-14 ... # Conflicts: # frontend/.dockerignore # frontend/Dockerfile # frontend/nginx.conf	2026-04-27 14:30:03 -04:00
Joshua	d43985cad9	Merge branch 'dev' into agent/dex/CUB-39-filament-usage-sync	2026-04-27 14:15:16 -04:00
dex-bot	6aa31f4be3	CUB-37: implement cost-per-print calculation service	2026-04-27 17:57:57 +00:00
dex-bot	4ba98966eb	feat(CUB-39): create background job for filament usage sync	2026-04-27 17:23:24 +00:00
dex-bot	61178ebb7b	feat(CUB-64): Docker runtime setup for development & deployment ... - 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

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

Expand all files Collapse all files

Diff Content Not Available