|
|
f287c16bf3
|
merge: refine intake previews and product photos
Merge codex/xuxiake-mainline into main.\n\nValidated: npm run type-check; NonIntegratedDetailClient jest suite.
|
2026-04-23 15:04:13 +08:00 |
|
WuYongJie
|
8ded8bc5e1
|
Merge remote-tracking branch 'origin/main' into codex/xuxiake-mainline
|
2026-04-23 14:59:47 +08:00 |
|
WuYongJie
|
e263b24f5a
|
fix(intake): refine product photo uploads and document previews
|
2026-04-23 13:30:40 +08:00 |
|
|
|
a519345079
|
Merge pull request 'merge: intake runtime asset serving and sku directories' (#7) from codex/xuxiake-mainline into main
|
2026-04-22 19:27:05 +08:00 |
|
WuYongJie
|
cf82b30096
|
fix(intake): add sku directories and runtime asset serving
|
2026-04-22 19:24:12 +08:00 |
|
WuYongJie
|
8fc6d56183
|
fix(deploy): link shared intake assets after build
|
2026-04-22 17:10:53 +08:00 |
|
WuYongJie
|
dd1c96dddc
|
fix(deploy): preserve shared intake assets in fallback release
|
2026-04-22 17:06:23 +08:00 |
|
WuYongJie
|
b83c81d679
|
Merge remote-tracking branch 'origin/main' into codex/xuxiake-mainline
|
2026-04-22 16:43:01 +08:00 |
|
WuYongJie
|
70b4d3b2fb
|
fix(intake): route shared uploads through product endpoints
|
2026-04-22 16:42:47 +08:00 |
|
|
|
f2573f154b
|
merge: restore intake shared uploads and 3d actions
3100 ?????,???????????? 3D ???????
|
2026-04-22 15:01:53 +08:00 |
|
WuYongJie
|
9b70901324
|
fix(intake): restore shared uploads and 3d actions
|
2026-04-22 14:55:44 +08:00 |
|
|
|
1ef71a21aa
|
Merge pull request 'merge: fix prod deploy script line endings' (#5) from codex/wuyongjie-main-release into main
|
2026-04-22 12:30:43 +08:00 |
|
WuYongJie
|
86c5007c03
|
fix(deploy): write unix newlines for remote scripts
|
2026-04-22 12:30:19 +08:00 |
|
|
|
af961287d1
|
Merge pull request 'merge: restore intake shared persistence and package corner saves' (#4) from codex/xuxiake-mainline into main
|
2026-04-22 12:25:16 +08:00 |
|
WuYongJie
|
2d1d32bc29
|
Merge remote-tracking branch 'origin/main' into codex/xuxiake-mainline
|
2026-04-22 12:23:40 +08:00 |
|
WuYongJie
|
c620050809
|
fix(intake): restore shared persistence and package corner saves
|
2026-04-22 12:23:21 +08:00 |
|
|
|
140da11f82
|
merge: deploy script fix into main before prod deploy
Merge deploy script parser fix into main before production release.
|
2026-04-22 09:58:01 +08:00 |
|
WuYongJie
|
6ad7786af5
|
fix(deploy): restore mainline prod deploy script
|
2026-04-22 09:57:30 +08:00 |
|
|
|
1ad68f23bf
|
merge: xuxiake mainline into main for prod deploy
?? codex/xuxiake-mainline ? main,??????
|
2026-04-22 09:52:20 +08:00 |
|
WuYongJie
|
f44fb28934
|
fix(intake): refine bom packaging subgroup inference
|
2026-04-22 09:52:02 +08:00 |
|
Codex
|
bf9c0127a0
|
fix(intake): normalize bom package subcategory locally
|
2026-04-22 09:39:56 +08:00 |
|
Codex
|
cba797dc10
|
fix: stabilize intake mainline merge baseline
|
2026-04-21 21:09:09 +08:00 |
|
Codex
|
8b3c6570e3
|
fix: align intake compatibility after main sync
|
2026-04-21 20:29:40 +08:00 |
|
Codex
|
d7263fecd5
|
chore(intake): checkpoint mainline merge-prep state
|
2026-04-21 20:22:35 +08:00 |
|
Codex
|
ac8bcdfd63
|
Merge remote-tracking branch 'origin/main' into codex/xuxiake-non-integrated-clean-20260416
# Conflicts:
# furniture-3d-system/next.config.js
# furniture-3d-system/src/app/HomeClient.workspace.tsx
# furniture-3d-system/src/app/__tests__/assisted-assembly-page.test.tsx
# furniture-3d-system/src/app/admin/page.tsx
# furniture-3d-system/src/app/api/categories/route.test.ts
# furniture-3d-system/src/app/api/intake/non-integrated/presentation-preview/route.ts
# furniture-3d-system/src/app/api/intake/non-integrated/upload/route.ts
# furniture-3d-system/src/app/api/users/[id]/handover/route.test.ts
# furniture-3d-system/src/app/api/users/[id]/route.test.ts
# furniture-3d-system/src/app/api/users/organization-tree/route.ts
# furniture-3d-system/src/app/asset-center/material-library/MaterialLibraryClient.tsx
# furniture-3d-system/src/app/assisted-assembly/page.tsx
# furniture-3d-system/src/app/intake/IntakeClient.test.tsx
# furniture-3d-system/src/app/intake/IntakeClient.tsx
# furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx
# furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
# furniture-3d-system/src/app/intake/non-integrated/[id]/page.tsx
# furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.test.ts
# furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts
# furniture-3d-system/src/app/intake/page.tsx
# furniture-3d-system/src/app/products/[id]/skus/[skuId]/assembly/page.tsx
# furniture-3d-system/src/app/users/page.tsx
# furniture-3d-system/src/app/warehouse/WarehouseClient.tsx
# furniture-3d-system/src/components/layout/SidebarUserCenter.tsx
# furniture-3d-system/src/components/layout/__tests__/AppSideNav.test.tsx
# furniture-3d-system/src/components/platform/AssemblyWorkbenchV2.tsx
# furniture-3d-system/src/components/platform/ViewportStageShell.tsx
# furniture-3d-system/src/components/platform/__tests__/AssemblyWorkbenchV2.test.tsx
# furniture-3d-system/src/components/users/CreateUserModal.tsx
# furniture-3d-system/src/components/users/DepartmentAccessTree.tsx
# furniture-3d-system/src/components/users/EditUserModal.tsx
# furniture-3d-system/src/components/users/UserListItem.tsx
# furniture-3d-system/src/components/users/__tests__/DepartmentAccessTree.test.tsx
# furniture-3d-system/src/lib/3d/engine.ts
# furniture-3d-system/src/lib/model-preview-zip.test.ts
# furniture-3d-system/src/lib/model-preview-zip.ts
# furniture-3d-system/src/lib/non-integrated-sku-export.ts
# furniture-3d-system/src/lib/open-product/__tests__/assembly-workspace.test.ts
# furniture-3d-system/src/lib/open-product/assembly-workspace.ts
# furniture-3d-system/src/server/repositories/auth.repository.ts
# furniture-3d-system/src/server/services/__tests__/material.service.test.ts
# furniture-3d-system/src/server/services/__tests__/user-handover.service.test.ts
# furniture-3d-system/src/server/services/__tests__/user-management.organization-tree.test.ts
# furniture-3d-system/src/server/services/__tests__/user-management.service.test.ts
# furniture-3d-system/src/server/services/dingtalk-auth.service.ts
# furniture-3d-system/src/server/services/user-handover.service.ts
# furniture-3d-system/src/server/services/user-management.service.ts
# furniture-3d-system/src/server/services/user.service.ts
|
2026-04-21 20:08:40 +08:00 |
|
WuYongJie
|
d4bc44579e
|
feat: align intake workflow and git-based prod deploy
|
2026-04-21 19:33:46 +08:00 |
|
WuYongJie
|
3c1675c78e
|
feat: merge intake workflow and current workspace source updates
|
2026-04-21 17:06:48 +08:00 |
|
Codex
|
06587e828d
|
feat: refine formal intake product workflow
|
2026-04-21 14:45:57 +08:00 |
|
WuYongJie
|
a4ef213950
|
feat: tighten user activation and role assignment limits
|
2026-04-17 16:05:19 +08:00 |
|
WuYongJie
|
013b5dd3f4
|
fix: tighten identity center layout and asset auth
|
2026-04-17 15:08:50 +08:00 |
|
WuYongJie
|
7ab4fc6ff4
|
feat: add reusable mobile camera scan and upload support
|
2026-04-17 13:35:58 +08:00 |
|
WuYongJie
|
91584f21c6
|
feat: consolidate workspace release updates
|
2026-04-17 12:50:06 +08:00 |
|
WuYongJie
|
87bb0e126d
|
feat: refresh branding and material library workspace
|
2026-04-17 11:07:18 +08:00 |
|
WuYongJie
|
d7737909bb
|
feat: sync remaining workspace branding updates
|
2026-04-17 10:25:31 +08:00 |
|
WuYongJie
|
c8d3d3d9e7
|
feat: restore material library and assembly workflows
|
2026-04-16 23:13:16 +08:00 |
|
WuYongJie
|
602e2fd33f
|
fix: recover assembly context and clear typecheck baseline
|
2026-04-16 21:44:04 +08:00 |
|
WuYongJie
|
18d2a49d2e
|
feat: converge assembly entrypoints and handover roles
|
2026-04-16 21:08:41 +08:00 |
|
WuYongJie
|
56a29b8be2
|
feat: polish home assembly and material workflows
|
2026-04-16 18:42:37 +08:00 |
|
Codex
|
bb0ebc2981
|
feat: add integrated intake detail starter
|
2026-04-16 17:30:44 +08:00 |
|
Codex
|
c7baacb2db
|
feat: show integrated series rows in intake
|
2026-04-16 17:26:21 +08:00 |
|
Codex
|
0362931e95
|
test: add integrated draft group adapter
|
2026-04-16 17:01:47 +08:00 |
|
WuYongJie
|
44677da317
|
feat: improve non-integrated intake workflow
|
2026-04-16 16:45:34 +08:00 |
|
Codex
|
7dc99e3725
|
docs: add integrated intake design spec
|
2026-04-16 16:32:32 +08:00 |
|
WuYongJie
|
2a4382dcb2
|
feat: refresh admin and user management portals
|
2026-04-16 14:07:13 +08:00 |
|
Codex
|
5c752ae2cf
|
chore: sync main outside intake and warehouse
|
2026-04-16 13:55:17 +08:00 |
|
|
|
e1645a164a
|
Merge pull request 'feat: integrate selected xuxiake intake enhancements into mainline' (#1) from codex/wuyongjie-mainline into main
Reviewed-on: http://git.1080p.hk/WuYongJie/furniture-3d-system-Wu/pulls/1
|
2026-04-16 13:05:41 +08:00 |
|
WuYongJie
|
5731018bed
|
feat: integrate selected xuxiake intake enhancements
|
2026-04-16 12:38:52 +08:00 |
|
Codex
|
3c8c775c30
|
feat: update non-integrated intake workflow
|
2026-04-16 11:18:24 +08:00 |
|
WuYongJie
|
2adb1d8e98
|
feat: persist home workspace tab state
|
2026-04-15 21:45:18 +08:00 |
|
WuYongJie
|
69b1daf157
|
fix: close assisted assembly cad snap and prod deploy
|
2026-04-15 21:27:09 +08:00 |
|
