Jaeyoung Lee
|
57ee521410
|
Merge branch 'dev' into feature/test-jy
# Conflicts:
# src/hooks/roofcover/usePropertiesSetting.js
# src/hooks/roofcover/useRoofAllocationSetting.js
|
2024-11-05 14:47:04 +09:00 |
|
Jaeyoung Lee
|
3a94703a8f
|
git clear cache
|
2024-11-05 14:45:08 +09:00 |
|
minsik
|
13f9577e62
|
Merge branch 'qcast-pub' into dev
|
2024-11-05 13:17:20 +09:00 |
|
minsik
|
34e3872123
|
다국어 추가
|
2024-11-05 13:13:22 +09:00 |
|
|
|
70ebb63fa7
|
api 호출 제거
|
2024-11-05 10:17:40 +09:00 |
|
|
|
187f11df19
|
견적서 상세 화면 작업중
|
2024-11-04 17:54:34 +09:00 |
|
minsik
|
62ef25c048
|
회로 및 가대 설정 다국어 추가
|
2024-11-04 17:36:18 +09:00 |
|
minsik
|
45c9abd86a
|
modal 버그 수정
|
2024-11-04 16:19:20 +09:00 |
|
minsik
|
40fa42b19b
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into qcast-pub
|
2024-11-04 16:15:51 +09:00 |
|
minsik
|
1838320606
|
modal 버그 수정
|
2024-11-04 16:11:58 +09:00 |
|
|
|
c476709850
|
견적서 상세화면 메세지 & 견적서 상세화면 상단 CanvasMenu 저장 버튼 관련
|
2024-11-04 14:11:27 +09:00 |
|
Jaeyoung Lee
|
da26628f69
|
Merge branch 'dev' into feature/test-jy
# Conflicts:
# src/app/roof2/page.jsx
# src/util/canvas-util.js
|
2024-11-04 09:48:46 +09:00 |
|
minsik
|
44e5041b4d
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into qcast-pub
# Conflicts:
# src/hooks/useContextMenu.js
|
2024-11-04 09:23:48 +09:00 |
|
yjnoh
|
df63fb2218
|
Merge branch 'dev' into dev-yj
|
2024-11-04 09:12:38 +09:00 |
|
|
|
88ffb2c4ee
|
견적서 링크 수정, canvasMenu에 견적서 인경우 버튼명 변경
|
2024-11-01 18:11:05 +09:00 |
|
minsik
|
ea8b4a3e36
|
contextmenu modal 추가
|
2024-11-01 18:10:42 +09:00 |
|
minsik
|
51c4fcfe14
|
canvas menu 삭제 버튼 삭제 및 zoom 버튼기능 수정
|
2024-11-01 18:10:27 +09:00 |
|
yjnoh
|
223bf2dddf
|
오각형 도머 크기변경, 이동 기능 추가
|
2024-11-01 17:46:58 +09:00 |
|
yjnoh
|
e0cf50beec
|
삼각형 도머 크기 변경
|
2024-11-01 15:37:05 +09:00 |
|
|
|
6099faab3f
|
물건목록화면 수정
|
2024-11-01 14:02:39 +09:00 |
|
|
|
775884542d
|
Merge Q-CAST-III-MR-206: feature/qcast-100
|
2024-11-01 01:51:09 +00:00 |
|
|
|
1b399160d3
|
물건정보 화면
|
2024-11-01 10:50:20 +09:00 |
|
|
|
a63edd0249
|
물건현황
|
2024-11-01 10:47:55 +09:00 |
|
minsik
|
6a1416a7c6
|
Merge branch 'qcast-pub' into dev
|
2024-11-01 10:02:42 +09:00 |
|
minsik
|
a2a3ba121f
|
contextmenu list recoil default 수정
|
2024-11-01 10:02:17 +09:00 |
|
|
|
7e598bcc13
|
임시
|
2024-11-01 09:53:45 +09:00 |
|
|
|
ba23e3b55c
|
물건상세화면
|
2024-10-31 23:25:25 +09:00 |
|
minsik
|
6da947f6da
|
Merge branch 'qcast-pub' into dev
|
2024-10-31 18:09:14 +09:00 |
|
minsik
|
a7c21830f8
|
modal class 추가
|
2024-10-31 18:07:51 +09:00 |
|
|
|
d7316560b3
|
물건현황 목록화면 수정
|
2024-10-31 17:57:06 +09:00 |
|
yoosangwook
|
d077b6b50d
|
fix: Add custom dropzone event
|
2024-10-31 15:17:03 +09:00 |
|
yoosangwook
|
12f2e50232
|
feat: Add EstimateFileUploader
|
2024-10-31 14:46:53 +09:00 |
|
minsik
|
8bd3834b72
|
Merge branch 'qcast-pub' into dev
|
2024-10-31 14:31:59 +09:00 |
|
minsik
|
db18459347
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
|
2024-10-31 14:31:49 +09:00 |
|
minsik
|
dbb3a3fce0
|
modal hidden 기능 추가
|
2024-10-31 14:31:03 +09:00 |
|
minsik
|
545b704e8a
|
다국어 적용
|
2024-10-31 14:30:12 +09:00 |
|
|
|
53a67b9be0
|
Merge Q-CAST-III-MR-202: 물건목록 화면 판매점 분리
|
2024-10-31 02:28:53 +00:00 |
|
|
|
220b5ff8d7
|
물건목록 화면 판매점 분리
|
2024-10-31 11:27:53 +09:00 |
|
|
|
08e1828530
|
동선이동 - 형 올림내림
|
2024-10-31 11:16:41 +09:00 |
|
minsik
|
2a7f81b467
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into qcast-pub
|
2024-10-31 10:11:31 +09:00 |
|
minsik
|
5595a2c374
|
Merge branch 'qcast-pub' into dev
|
2024-10-31 10:10:46 +09:00 |
|
minsik
|
1dbf277cf5
|
보조선 이동, 복사
그리드 이동
도머 오프셋 UI 수정 및 다국어 적용
|
2024-10-31 10:09:45 +09:00 |
|
yjnoh
|
4c23de12b4
|
Merge branch 'dev' into dev-yj
|
2024-10-31 09:19:43 +09:00 |
|
yjnoh
|
fd7d6ad63b
|
key event 함수추가
|
2024-10-31 09:19:18 +09:00 |
|
Daseul Kim
|
a024d84e49
|
refactor: test objectNo 수정
|
2024-10-30 18:19:31 +09:00 |
|
Daseul Kim
|
f3a2f4f5e7
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
|
2024-10-30 18:15:44 +09:00 |
|
Daseul Kim
|
be3580c7b9
|
feat: canvas plan을 저장하지 않고 페이지를 벗어났을 경우 확인하는 로직 추가
|
2024-10-30 18:15:15 +09:00 |
|
minsik
|
76ac604b43
|
Merge branch 'qcast-pub' into dev
|
2024-10-30 18:08:46 +09:00 |
|
minsik
|
1c99204a55
|
보조선 이동 다국어 적용
|
2024-10-30 18:08:04 +09:00 |
|
minsik
|
de9b53fff3
|
면형상 배치 디자인 수정
|
2024-10-30 18:07:14 +09:00 |
|