김민식
|
ce7c90eb6f
|
Merge branch 'feature/yj-layoutSetup' of https://git.hanasys.jp/qcast3/qcast-front into feature/yj-layoutSetup
# Conflicts:
# src/components/floor-plan/modal/basic/BasicSetting.jsx
# src/components/floor-plan/modal/basic/step/Trestle.jsx
|
2025-04-02 17:04:29 +09:00 |
|
|
|
2e60e848c8
|
basicsetting 수정
|
2025-04-02 17:01:37 +09:00 |
|
김민식
|
51aaf342fa
|
Merge remote-tracking branch 'origin/qcast-pub' into feature/yj-layoutSetup
# Conflicts:
# src/components/floor-plan/modal/basic/BasicSetting.jsx
|
2025-04-02 16:57:48 +09:00 |
|
김민식
|
82632b962e
|
Trestle 데이터 추가
|
2025-04-02 16:55:23 +09:00 |
|
|
|
8c33611440
|
Merge branch 'dev' into feature/yj-layoutSetup
# Conflicts:
# src/components/floor-plan/modal/basic/BasicSetting.jsx
|
2025-04-02 15:21:15 +09:00 |
|
김민식
|
d8e43b0d81
|
BasicSetting 버그 수정
|
2025-04-02 15:19:00 +09:00 |
|
|
|
cb87d6cd23
|
Merge branch 'dev' into feature/yj-layoutSetup
|
2025-04-02 14:51:54 +09:00 |
|
김민식
|
8ba79d6a06
|
Merge remote-tracking branch 'origin/qcast-pub' into dev
|
2025-04-02 14:50:45 +09:00 |
|
김민식
|
ba06fde9cc
|
useModuleTrestle 추가
|
2025-04-02 14:50:20 +09:00 |
|
|
|
1588b8cda7
|
Merge branch 'dev' into feature/yj-layoutSetup
|
2025-04-02 14:48:26 +09:00 |
|
김민식
|
9c1df779e4
|
Merge remote-tracking branch 'origin/qcast-pub' into dev
|
2025-04-02 14:47:53 +09:00 |
|
김민식
|
2dbbd3a957
|
roofAtom 추가
|
2025-04-02 14:47:21 +09:00 |
|
김민식
|
d165267ec1
|
🚨chore: Sync Sass
|
2025-04-02 14:47:09 +09:00 |
|
|
|
da8e0856cb
|
Merge branch 'dev' into feature/yj-layoutSetup
# Conflicts:
# src/components/floor-plan/modal/basic/BasicSetting.jsx
# src/locales/ja.json
|
2025-04-02 14:46:08 +09:00 |
|
김민식
|
78ce43969a
|
Merge remote-tracking branch 'origin/qcast-pub' into dev
|
2025-04-02 14:23:23 +09:00 |
|
김민식
|
fe10ecf476
|
PlacementShapeSetting merge
|
2025-04-02 14:22:15 +09:00 |
|
김민식
|
b16174ec0d
|
Merge remote-tracking branch 'origin/qcast-pub' into dev
# Conflicts:
# src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
# src/locales/ja.json
|
2025-04-02 14:08:21 +09:00 |
|
김민식
|
964d9bdcc7
|
basicsetting 로직 수정
|
2025-04-02 13:56:03 +09:00 |
|
김민식
|
4b6f0b1b06
|
plan tab 좌측 objectNo 영역 추가
|
2025-04-02 13:54:44 +09:00 |
|
김민식
|
9df16cad02
|
모듈 열/단 버퍼 추가
|
2025-04-02 13:54:06 +09:00 |
|
김민식
|
8354508a2b
|
다국어 추가
|
2025-04-02 13:53:34 +09:00 |
|
김민식
|
ced0eb9fc6
|
🚨chore: Sync Sass
|
2025-04-02 13:53:24 +09:00 |
|
|
|
655fef744c
|
모듈 선택 표시
|
2025-04-02 11:12:23 +09:00 |
|
|
|
0a5b6ce132
|
test: deploy test
|
2025-04-01 17:59:57 +09:00 |
|
|
|
d6b9634a89
|
레이아웃 설치 validate 추가
|
2025-04-01 17:18:38 +09:00 |
|
|
|
66f1293b95
|
Merge pull request '955-견적서 상품검색할때 이미지명(형명)도 같이 표시' (#15) from feature/ysCha into dev
Reviewed-on: #15
|
2025-04-01 17:14:43 +09:00 |
|
|
|
167740f33d
|
955-견적서 상품검색할때 이미지명(형명)도 같이 표시
|
2025-04-01 17:12:02 +09:00 |
|
|
|
87ef010ae6
|
레이아웃 문구 추가
|
2025-04-01 15:40:20 +09:00 |
|
|
|
7d37deb048
|
모듈 설치 페이지 변경
|
2025-04-01 15:31:12 +09:00 |
|
|
|
97ca91aa29
|
Merge branch 'dev' into feature/yj-layoutSetup
# Conflicts:
# src/hooks/module/useModuleBasicSetting.js
|
2025-04-01 13:26:08 +09:00 |
|
|
|
be54df76f7
|
통합테스트(Integration Test) #956 이동 기능 수정
|
2025-04-01 13:19:12 +09:00 |
|
|
|
c2fbc83485
|
Merge branch 'dev' into feature/dev-yj
|
2025-04-01 13:07:31 +09:00 |
|
|
|
09e985e9b5
|
Merge branch 'dev' into feature/yj-layoutSetup
# Conflicts:
# src/locales/ja.json
# src/locales/ko.json
|
2025-03-31 14:57:32 +09:00 |
|
|
|
d10642d6d5
|
메뉴에서 안쓰는 내용 제거
|
2025-03-31 13:50:06 +09:00 |
|
|
|
826739fb0e
|
혼합 가능 여부 확인 validate 추가
|
2025-03-31 10:44:56 +09:00 |
|
|
|
482b6b5477
|
수동 설치 혼합일 경우 설치 여부 확인
|
2025-03-31 10:20:45 +09:00 |
|
|
|
3509e5fbb6
|
Update startscript to run development server on port 5000
|
2025-03-28 17:13:46 +09:00 |
|
|
|
a5fb44ad36
|
Merge branch 'dev' into feature/dev-yj
|
2025-03-28 15:25:20 +09:00 |
|
|
|
c88a07a227
|
모듈 남쪽설치 치조시 좌측으로 붙는 오류 수정
|
2025-03-28 15:25:03 +09:00 |
|
|
|
5982a2aa10
|
Merge pull request '그리드 테이블 경계표시 추가' (#14) from feature/ysCha into dev
Reviewed-on: #14
|
2025-03-28 15:15:40 +09:00 |
|
|
|
3fd81e771d
|
그리드 테이블 경계표시 추가
|
2025-03-28 15:13:05 +09:00 |
|
|
|
c9a53b7159
|
Merge pull request '#944 물건번호 생성시 시작번호 R->S 변경에따른 주석정리' (#13) from feature/qcast-944 into dev
Reviewed-on: #13
|
2025-03-28 13:29:13 +09:00 |
|
|
|
24ba8bfb14
|
#944 물건번호 생성시 시작번호 R->S 변경에따른 주석정리
|
2025-03-28 13:27:23 +09:00 |
|
|
|
b82901271d
|
Merge pull request 'HANASYS 개선건 #950' (#12) from feature/qcast-950 into dev
Reviewed-on: #12
|
2025-03-28 12:38:58 +09:00 |
|
|
|
25957a37e1
|
HANASYS 개선건 #950
|
2025-03-28 12:37:54 +09:00 |
|
|
|
83f0eef9eb
|
Merge pull request 'HANASYS 개선건 #947' (#11) from feature/qcast-947 into dev
Reviewed-on: #11
|
2025-03-28 12:29:13 +09:00 |
|
|
|
46f90aff1f
|
HANASYS 개선건 #947
|
2025-03-28 12:27:59 +09:00 |
|
|
|
11f69a01bb
|
번역 수정
|
2025-03-28 11:15:12 +09:00 |
|
|
|
c8f70e0746
|
번역 수정
|
2025-03-28 10:58:34 +09:00 |
|
|
|
2bb1b71a0b
|
레이아웃 설치 작업
|
2025-03-28 09:40:19 +09:00 |
|
