yjnoh
|
1903834314
|
Merge branch 'dev' into dev-yj
# Conflicts:
# src/components/floor-plan/CanvasMenu.jsx
|
2024-10-21 18:14:25 +09:00 |
|
yjnoh
|
51096a150d
|
메뉴 공통기능(텍스트, 치수선, 거리측정) 작업
|
2024-10-21 18:12:53 +09:00 |
|
|
|
f42ef08b09
|
점선 그리드 조건 수정
|
2024-10-21 17:32:35 +09:00 |
|
yoosangwook
|
3ea6eb2eaf
|
fix: Delete Old code
|
2024-10-21 17:10:54 +09:00 |
|
yoosangwook
|
5a043c0570
|
Auto stash before merge of "dev" and "origin/dev"
|
2024-10-21 17:09:23 +09:00 |
|
|
|
5be1561373
|
Merge Q-CAST-III-MR-139: 물건현황 화면 작업
|
2024-10-21 07:59:59 +00:00 |
|
|
|
aa486480f4
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
|
2024-10-21 16:59:12 +09:00 |
|
|
|
220e6fe8c2
|
물건현황 화면 작업
|
2024-10-21 16:59:02 +09:00 |
|
|
|
5c8db48ac0
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
# Conflicts:
# src/components/floor-plan/modal/setting01/GridOption.jsx
|
2024-10-21 16:59:00 +09:00 |
|
yoosangwook
|
fc0a1fd00d
|
chore: check 3rd lib
- 안쓰는 라이브러리 제거
- 안쓰늩 컴포넌트 제거
- 코드 정리
|
2024-10-21 16:54:15 +09:00 |
|
|
|
cc70bf1db5
|
캔버스 세팅 수정, arrow usePolygon으로 변경
|
2024-10-21 16:53:00 +09:00 |
|
yoosangwook
|
77bcc0b935
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-21 16:30:43 +09:00 |
|
yoosangwook
|
68aba5094d
|
fix: Modify commonCode hook
|
2024-10-21 16:30:22 +09:00 |
|
minsik
|
46ac162c26
|
Merge branch 'qcast-pub' into dev
|
2024-10-21 16:27:49 +09:00 |
|
minsik
|
82009ef281
|
모달 위치 수정
|
2024-10-21 16:27:19 +09:00 |
|
yoosangwook
|
f8bdce6177
|
feat: Add getCommonCode hook
|
2024-10-21 16:23:15 +09:00 |
|
yjnoh
|
fd0fc1ed6e
|
Merge branch 'dev' into dev-yj
|
2024-10-21 15:42:59 +09:00 |
|
minsik
|
f26429ef99
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into qcast-pub
# Conflicts:
# src/app/layout.js
# src/components/floor-plan/CanvasFrame.jsx
# src/components/floor-plan/CanvasMenu.jsx
# src/components/floor-plan/FloorPlan.jsx
# src/locales/ja.json
# src/locales/ko.json
# src/styles/_modal.scss
|
2024-10-21 15:37:42 +09:00 |
|
minsik
|
e3ad0fc9cb
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
|
2024-10-21 15:31:29 +09:00 |
|
minsik
|
fa2231d5b0
|
마크업 수정
|
2024-10-21 15:31:01 +09:00 |
|
minsik
|
faf733da92
|
🚨chore: Sync Sass
|
2024-10-21 15:30:43 +09:00 |
|
yoosangwook
|
4f47eae1a4
|
fix: add key prop map syntax
|
2024-10-21 14:47:38 +09:00 |
|
yjnoh
|
f50e1675d0
|
Merge branch 'dev' into dev-yj
|
2024-10-21 14:32:26 +09:00 |
|
minsik
|
2e7b1c941a
|
🚨chore: Sync Sass
|
2024-10-21 14:21:47 +09:00 |
|
minsik
|
a4fb74df91
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/styles/_contents.scss
# src/styles/_main.scss
# src/styles/_modal.scss
# src/styles/_reset.scss
|
2024-10-21 14:20:55 +09:00 |
|
minsik
|
d864ccb792
|
🚨chore: Sync Sass
|
2024-10-21 14:15:41 +09:00 |
|
minsik
|
676a0bdc91
|
🚨chore: Sync Sass
|
2024-10-21 14:13:54 +09:00 |
|
minsik
|
93ee8c14d9
|
글꼴 및 도면 크기 작업중
|
2024-10-21 14:13:43 +09:00 |
|
Daseul Kim
|
2b18ad2303
|
Merge branch 'dev-ds' into dev
|
2024-10-21 13:45:55 +09:00 |
|
Daseul Kim
|
05441f6a53
|
Merge branch 'dev' into dev-ds
|
2024-10-21 13:11:20 +09:00 |
|
|
|
49218ddc61
|
자동로그인 페이지 추가
|
2024-10-21 13:10:13 +09:00 |
|
yoosangwook
|
1788b7f9a0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-21 11:29:25 +09:00 |
|
yoosangwook
|
788c4b7eb5
|
chore: Delete unused files
|
2024-10-21 11:29:18 +09:00 |
|
|
|
909adc63fc
|
물건목록 리스트화면 수정
|
2024-10-21 11:23:29 +09:00 |
|
yoosangwook
|
1b44edbac3
|
feat: Add locale switch
|
2024-10-21 10:56:15 +09:00 |
|
Daseul Kim
|
8c0c7dc272
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev-ds
|
2024-10-21 09:46:35 +09:00 |
|
|
|
223690a7cf
|
Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
|
2024-10-18 18:26:02 +09:00 |
|
|
|
0262e47dd3
|
그리드표시 임의 그리드 및 흡착점 추가
|
2024-10-18 18:20:04 +09:00 |
|
yoosangwook
|
6987268a97
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-18 18:10:46 +09:00 |
|
yoosangwook
|
5085134c68
|
refactor: Modify getMessage function
|
2024-10-18 18:10:37 +09:00 |
|
|
|
7e6b8ffff3
|
그리드 표시, 외벽선 표시, 지붕선 표시 추가
|
2024-10-18 18:09:48 +09:00 |
|
|
|
ee897ede4d
|
_main.scss, _contents.scss 적용
|
2024-10-18 17:45:59 +09:00 |
|
|
|
7d2d32f198
|
물건정보
|
2024-10-18 17:42:03 +09:00 |
|
|
|
e1a4ccaa08
|
캔버스 설정 hooks 추가
|
2024-10-18 17:28:42 +09:00 |
|
|
|
7f56e632ce
|
자료다운로드 수정
|
2024-10-18 16:39:58 +09:00 |
|
minsik
|
128c564b43
|
Merge remote-tracking branch 'origin/qcast-pub' into qcast-pub
|
2024-10-18 15:29:44 +09:00 |
|
minsik
|
d6fbea705f
|
popupManager canvasSetting 적용
|
2024-10-18 15:28:59 +09:00 |
|
|
|
b6e6bdb005
|
_main.scss 적용
|
2024-10-18 15:21:36 +09:00 |
|
yjnoh
|
e8d5883317
|
Merge branch 'dev' into dev-yj
|
2024-10-18 14:57:45 +09:00 |
|
yjnoh
|
e186ca1774
|
object 배치 수정
|
2024-10-18 14:57:25 +09:00 |
|
