Seonjae
|
ae9ab217db
|
Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main
|
2024-04-19 10:32:47 +09:00 |
|
Seonjae
|
8f068bf1e0
|
수정
|
2024-04-19 10:32:39 +09:00 |
DESKTOP-999R8N3\CJY
|
5eaf16a954
|
이미지 변경(크기조정)
|
2024-04-17 15:39:45 +09:00 |
|
Seonjae
|
80208944e2
|
수정
|
2024-04-17 14:54:48 +09:00 |
|
Seonjae
|
0576820f46
|
Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main
|
2024-04-17 10:30:37 +09:00 |
|
Seonjae
|
1216cc6429
|
SystemStatus 테스트화면 수정
|
2024-04-17 10:30:33 +09:00 |
|
DESKTOP-999R8N3\CJY
|
e0fe0b955e
|
Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002
# Conflicts:
# INT_PT002/Forms/FormMainDisplay3.cs
|
2024-04-17 10:10:14 +09:00 |
|
DESKTOP-999R8N3\CJY
|
e42f200827
|
메인화면 이미지
|
2024-04-17 10:09:18 +09:00 |
|
Seonjae
|
47a45a1f36
|
수정중
|
2024-04-16 17:03:40 +09:00 |
|
Seonjae
|
ef4f95e96d
|
수정중
|
2024-04-16 14:04:38 +09:00 |
|
Seonjae
|
0da4591a1a
|
no message
|
2024-04-09 17:19:05 +09:00 |
|
Seonjae
|
fc24c045a8
|
수정
|
2024-04-09 17:08:32 +09:00 |
|
Seonjae
|
168f0f71d6
|
Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main
|
2024-04-09 17:02:33 +09:00 |
|
Seonjae
|
8e6dfbce7b
|
모터셋팅 수정
|
2024-04-09 17:02:30 +09:00 |
|
DESKTOP-999R8N3\CJY
|
471f0e81cc
|
추가수정
|
2024-04-09 14:50:04 +09:00 |
|
DESKTOP-999R8N3\CJY
|
ee2012b82e
|
- 충돌 병합
|
2024-04-09 13:27:30 +09:00 |
|
Seonjae
|
1b43c25b62
|
Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main
|
2024-04-09 09:05:57 +09:00 |
|
Seonjae
|
507788470e
|
수정중
|
2024-04-09 09:05:52 +09:00 |
|
DESKTOP-999R8N3\CJY
|
975e2bd713
|
병합
|
2024-04-05 10:10:48 +09:00 |
|
Seonjae
|
46d909ad5f
|
Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main
# Conflicts:
# INT_PT002/Forms/FormMainDisplay3.Designer.cs
# INT_PT002/Forms/FormMainDisplay4.cs
|
2024-04-05 09:57:05 +09:00 |
|
Seonjae
|
27279ea8d9
|
수정
|
2024-04-05 09:19:24 +09:00 |
|
DESKTOP-999R8N3\CJY
|
02ea9e2c99
|
Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002
# Conflicts:
# INT_PT002/Forms/FormMain.cs
# INT_PT002/Forms/FormMainDisplay3.Designer.cs
# INT_PT002/Forms/FormMainDisplay3.resx
|
2024-04-04 16:29:54 +09:00 |
|
DESKTOP-999R8N3\CJY
|
9802511676
|
- Part11 기능 추가
- Ethernet 화면 추가
|
2024-04-04 16:02:14 +09:00 |
|
Seonjae
|
3334a21f6d
|
수정중
|
2024-04-02 17:15:01 +09:00 |
|
Seonjae
|
6c7dbee190
|
no message
|
2024-04-01 10:17:00 +09:00 |
|
DESKTOP-999R8N3\CJY
|
ea6ae58aa7
|
Merge branch 'main' into HEAD
# Conflicts:
# INT_PT002/Forms/FormMain.cs
|
2024-04-01 10:14:09 +09:00 |
|
DESKTOP-999R8N3\CJY
|
0ad52fb084
|
충돌 해결
|
2024-04-01 10:12:40 +09:00 |
|
DESKTOP-999R8N3\CJY
|
539aefa5e3
|
시간 변경
|
2024-04-01 10:09:05 +09:00 |
|
DESKTOP-999R8N3\CJY
|
32aa554dec
|
- MainDisplay4 추가
|
2024-04-01 10:08:47 +09:00 |
|
Seonjae
|
420f04fbb2
|
수정중..
|
2024-04-01 10:05:17 +09:00 |
|
DESKTOP-999R8N3\CJY
|
f63614c69e
|
시간 변경
|
2024-03-27 10:55:53 +09:00 |
|
Seonjae
|
f521eb3b1d
|
MainDisplay3 추가
|
2024-03-27 10:53:00 +09:00 |
|
Seonjae
|
e37288262c
|
메인화면 수정
|
2023-04-17 10:59:29 +09:00 |
|
DESKTOP-999R8N3\CJY
|
d9b19e2021
|
- 메뉴 상단 Alarm 라벨 안보이는 버그
|
2023-04-14 14:48:07 +09:00 |
|
DESKTOP-999R8N3\CJY
|
342918bd89
|
- Log 줄 수 버그 수정
- Measurement 오타수정
- Equipment 화면에서 Start 시 우측/하단 버튼 Disable
|
2023-04-14 11:03:30 +09:00 |
|
DESKTOP-999R8N3\CJY
|
12d9ad9e59
|
버그 등 수정
|
2023-04-14 09:40:45 +09:00 |
|
DESKTOP-999R8N3\CJY
|
c7091e80fa
|
버그 수정
|
2023-04-11 18:01:18 +09:00 |
|
DESKTOP-999R8N3\CJY
|
e4ec44441f
|
Main 업데이트부분 완료
|
2023-04-10 15:48:48 +09:00 |
|
DESKTOP-999R8N3\CJY
|
e0db61600d
|
Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002
# Conflicts:
# INT_PT002/DialogForms/DialogFormYesNo.cs
|
2023-04-07 18:00:55 +09:00 |
|
DESKTOP-999R8N3\CJY
|
133bdf9e46
|
메인보드 다운로드 부분 수정 중
|
2023-04-07 18:00:00 +09:00 |
|
Seonjae
|
b8fc4fee66
|
유저설정 수정
|
2023-04-07 15:00:57 +09:00 |
|
Seonjae
|
6f347ea714
|
Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main
|
2023-04-07 11:21:51 +09:00 |
|
Seonjae
|
5696c77332
|
유저관련 수정
|
2023-04-07 11:21:45 +09:00 |
|
DESKTOP-999R8N3\CJY
|
c6570ddc99
|
Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002
|
2023-04-06 17:21:23 +09:00 |
|
DESKTOP-999R8N3\CJY
|
acc5c72ca0
|
Status 화면 영문화, 코드 추가 수정 - 테스트 필요
|
2023-04-06 17:21:15 +09:00 |
|
Seonjae
|
19b19d5271
|
업데이트 수정
업데이트 완료 3초후 자동 재부팅
|
2023-04-06 17:08:14 +09:00 |
|
DESKTOP-999R8N3\CJY
|
c05d578772
|
Progressbar 버그수정
|
2023-04-06 15:55:52 +09:00 |
|
DESKTOP-999R8N3\CJY
|
efa0c45a86
|
Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002
# Conflicts:
# INT_PT002/Forms/FormMainDisplay2.Designer.cs
# INT_PT002/Forms/FormMainDisplay2.cs
|
2023-04-06 15:16:52 +09:00 |
|
DESKTOP-999R8N3\CJY
|
08444d2be0
|
ProgressBar 조정, 메인화면 결과라벨 위치 조정
|
2023-04-06 15:11:05 +09:00 |
|
Seonjae
|
39721809d6
|
버튼 색상 변경
|
2023-04-06 13:40:05 +09:00 |