작업내역
2020/02/23부터 2020/03/23까지
2020/03/23
- 04:17 개정판 df00b3d0 (markus): Merge "Sync Page 이동 수정"
- 04:03 개정판 da3feefa (markus): DataBaseViewInfo.xaml 수정
- Change-Id: If309dfa1ea7f0579533ceaa71336cdcb13fe7dde
- 03:59 개정판 8c7d1ea1 (markus): DataBaseItemsModel 수정
- Change-Id: I90ab052d201b2ef824098c5ca2a08f7d703bdce2
- 03:00 개정판 d04e8ee9 (markus): Sync Page 이동 수정
- Change-Id: Ib0fbc85754ede89f83c1364ee77dc07f11ada633
- 21:32 개정판 344ac7ed (markus): ConvertDatabase 수정
- Change-Id: I0344c54e8f7776ac577c77ec6a3e37428489d87f
2020/03/20
- 00:42 개정판 b119eeaa (markus): MARKUS LINK BUTTON 수정
- Change-Id: Ieef26e9aaa02baf31188d1b9f6ca0b73ebeb544d
- 00:30 개정판 67df8dcd (markus): DataBaseItems
- Change-Id: I7d22ebd53fa40310c6c3c847c6e1c366f0f1fa06
- 20:14 개정판 c9f98e3b (markus): Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
- Change-Id: I968b71ac1a3b8103ab734878a516c8c4549549a0
- 20:13 개정판 e78f0871 (markus): DataBaseItemsModel 기능 추가
- Change-Id: Ifffa6189b54cd183d981a569340628f5bb8a41a2
2020/03/19
- 02:59 개정판 0585d5cc (markus): markus Api 오류 출력 되도록 수정
- Change-Id: I7318ee5da1ec9b8dbfd4450a1ab7117b6b2713ea
2020/03/18
- 03:20 개정판 0cd6d4c9 (markus): json 참조 추가
- Change-Id: I9e2a8dcdb8fe8777f6b248f634b24eba23c87a57
- 03:06 개정판 60fbc8d5 (markus): Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
- Change-Id: Ibeba66d8aa1928f6541db14f09d01e58c254edb1
- 03:05 개정판 082cbc54 (markus): markus link 추가
- Change-Id: Ic3e6b96a1fe6616e51d666f1d50dcb7cdb1d2d31
- 03:05 개정판 05fd750b (markus): ConvertDatabase 수정
- Change-Id: I02ef7e37ba84d4faafc85dea14371dc731cd79b0
- 03:01 개정판 508debb1 (markus): ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs 오륫 수정
- Change-Id: I5eba73db6332531d7a11e3327082375d95a59b72
- 01:58 개정판 c6bf88fd (markus): markus 호출 링크 Parameter 생성 추가
- Change-Id: I516d5e1240a1dac6d80123c11ca5a7bd897de5b8
- 01:46 개정판 29000595 (markus): Status 오류 수정
- Change-Id: Ie84d975ccbec68d90a2c7a3d7b7907fcc0df0bb5
- 01:39 개정판 70bbad54 (markus): Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
- Change-Id: I8e40d24e931ac2d4f698eea31e9bd1a511aa7b03
# Conflicts:
# ConvertService/ServiceBase/Markus.Service.DataBa... - 01:34 개정판 e6281033 (markus): DataBaseItemsModel 코드 정리
- Change-Id: Icd6fdbd71b04a0e17a7de888e41660f14f78f416
- 01:11 개정판 c8183702 (markus): plugin Test 추가
- Change-Id: I8c405b9d3e169cd7d6230e14695ef84756b32748
- 20:07 개정판 0b49ffb8 (markus): DataExport 추가
- Change-Id: I4366303f14a750556f80cc52c2f822cef2b2a514
- 20:00 개정판 0cb12397 (markus): DataBaseItemsModel 정리
- Change-Id: I2d6439710ff4c9a93263897d2c47f8f3c37f0f33
2020/03/17
- 04:04 개정판 dfc86b71 (markus): DataBaseItemsModel Alive Grid 수정
- Change-Id: Iee3df7b70ce99c71e1aca094e632ab7253866727
- 03:46 개정판 2decfbdf (markus): DataBaseItemsModel 수정
- Change-Id: I96830cad0b3990bb84346f438ba04e20d55ec26c
2020/03/13
- 19:53 목록 #1186 (완료): PEMSS
2020/03/12
- 00:51 개정판 1e901a8d (markus): Export 수정
- Change-Id: I36aaeeb3d6a8aa408c60e5ee386d8752849ee79a
- 21:06 개정판 86bff326 (markus): - pdf export 수정
- Change-Id: I44d70e1a8adce8d9b1dcaa92958594d1780fa02f
2020/03/10
- 01:07 개정판 285635d3 (markus): markus api의 Member 가져오는 Entity를 모두 쿼리로 변경
- Change-Id: I028e1983be064366fdb95282874f9c2c7bc3901f
2020/03/09
- 19:52 개정판 a6e5055d (markus): Markus.Service.StationController DataBaseView 추가
- Change-Id: I16b9c78a690e2ae8f804bf35c8787a9c97fea157
- 03:09 개정판 97eba451 (markus): 빌드 수정
- Change-Id: I74a4bf51fa235a47fcfb3e74c3922a3a346115d2
- 21:20 개정판 96bc6e8e (markus): PageStorage GetPageAsync에서 오류 발생시 무한 루프발생
- - 방지하기 위한 IsReStart Flag 추가
Change-Id: I899961964f116524503be3fbdeefd5e9d5e7fc6c
2020/03/06
- 00:49 개정판 81908c01 (markus): PageStorage Null 체크 후 Clear
- Change-Id: Ic2ecdf79c316531cbf15ec3b51451862427549d3
- 00:06 개정판 a7372e37 (markus): kcom_Api 수정
- Change-Id: I9dcefa2c90444f26fdc5bb68ee5c1092f172c9dc
2020/03/05
- 01:50 개정판 339cabdd (markus): build.bat 수정
- Change-Id: Ifd49477e88fdfcecea725be000d9795b3b281eb7
- 00:11 개정판 7841e9fb (markus): app.manifest
- Change-Id: Id150244b2ed52e8746b626e2c8e959c0cea9c185
- 00:09 개정판 cc8b794d (markus): build.bat 수정
- Change-Id: Ic8a3bb226882da4b19d08bb360fd2cc62facb7b7
- 20:21 개정판 84605c0c (markus): 호셩 컴파일 옴션 추가
- -btnConsolidateFinalPDF.Visibility = System.Windows.Visibility.Collapsed
Change-Id: I13e6a9ab634f41f3e3f6cfb38ae356a...
2020/03/04
- 03:40 개정판 366f00c2 (markus): dns 체크 에러 수정
- Change-Id: I9fd9b9d37c7c2529795ab14f46f58b157d911809
- 01:19 개정판 72424099 (markus): Markus.ImageComparer/ImageComparerBase.cs Parallel.ForEach 제거
- Change-Id: I2875826245d2ce1530ffb6ffe712615d17b4a36e
- 00:20 개정판 ac4f1e13 (markus): Markup load 비동기로 변경
- Change-Id: I471906b1090f7f3f0fd18e97d88a54f75fd1f673
2020/03/03
- 03:22 개정판 c8b87260 (markus): MARKUS_html.template 수정
- Change-Id: I362d01e2e5eaf297bbc06955615d57d03c1910de
- 03:08 개정판 f593e724 (markus): markus api 효성 Web.Release_Hyosung.config 추가
- Change-Id: I556878ed17321b1db76623f8fab5b35ce1a897de
- 02:59 개정판 d0286794 (markus): OnStartup 에러 수정
- Change-Id: I9b2078a68a4f080dc87488c15a03430bd0a66fc0
- 02:18 개정판 e80bc021 (markus): 효성 tag 수정
- Change-Id: I87a06fe967a57ecd4f80c044ccba6c8aebce7961
- 01:50 개정판 024efbc7 (markus): 효성 빌드 수정
- Change-Id: Ie7fedbec1994dbe3cd5bda627c17d4289b811ccf
- 00:33 개정판 1cea0342 (markus): MARKUS_HyoSung_x86.wxs 수정
- Change-Id: Ia75c690e392119978b7c9c36e9160d469916e967
- 23:32 개정판 e8557bd7 (markus): 빌드 수정 x86추가
- Change-Id: If4d98bee9f4306a3c5c82a07038017c916d03f8f
2020/02/28
- 03:37 개정판 068113d5 (markus): 효성 빌드 수정
- Change-Id: I8ffe1661e5fe6e8b1d8abdf0adb3cd93b4c614be
- 03:16 개정판 79a11ea2 (markus): build.bat 수정
- Change-Id: I3373fbd2dbadf4182daf6c60824ac1053296151f
- 03:08 개정판 01d5bc65 (markus): build.bat 효성 32bit & 64bit 빌드 수정
- Change-Id: I53e774093f7a34f5432faef85840d92a7b052fe1
- 02:47 개정판 f3c48db7 (markus): MARKUS_HyoSung.wxs & build.bat 수정
- Change-Id: Ib2bfe8ce76450b42807c310e9c6e28389ea79bc6
- 21:10 개정판 b0dd9d73 (markus): MARKUS_HyoSung.wxs condition 수정
- Change-Id: Ifc0b79f2f201d14cd237209617b16f2dab67f21c
- 20:47 개정판 a6791024 (markus): MARKUS_HyoSung.wxs 64bit or 32bit condition 추가
- Change-Id: I423b5a5f60e659799e916cc114ee328bd7fe9eae
- 19:57 개정판 503cb09e (markus): service controller 참조 DLL 추가
- Change-Id: I71275da928adc2181aa4c8da4b377eccabe90669
2020/02/26
- 03:39 개정판 c9e9f822 (markus): MARKUS_HyoSung.wxs 수정 경로 오류
- Change-Id: I1cc5f4990a912e879d9bff1b5914e754efc76477
- 03:00 개정판 51030b37 (markus): 효성 빌드 SmartUpdate.csproj 수정
- Change-Id: I185ad6b7962092060948260e9529f8a4fb803da4
- 02:24 개정판 7d8e1b57 (markus): 빌드 코드 최적화 적용
- Change-Id: I687bf280e7e979082fba2e07a3bd6886dd65fb81
- 01:53 개정판 a5d3dcc3 (markus): MARKUS_HyoSung.wxs 참조 DLL 경로 변경
- Change-Id: I90fa5b3a432c436c6afc355a422166a8238a261f
- 00:45 개정판 bd89069b (markus): build.bat 효성 별도의 폴더로 실행하도록 수정
- Change-Id: I643732fde7546427fe124e452fcc6f4cdf576d42
- 00:34 개정판 b5ce63e1 (markus): build.bat 효성 부분 수정
- Change-Id: I6d9c019057908faf4fc904da16bee0821b47c921
- 00:23 개정판 4d842eed (markus): app.Release_Hyosung.config commit
- Change-Id: Ib5f695a55ac2889741784f8269c374d3e04bdaab
- 23:55 개정판 05278c39 (markus): 효성 빌드 수정
- Change-Id: If60b794b1999a1cfde4b4892261c7683853d8117
- 23:42 개정판 80856edb (markus): 빋드 이벤트 효성 추가
- Change-Id: Ib8e88c7e20f7ca1de5949cdbd3ecd7148c98b676
2020/02/25
- 18:49 개정판 14bbabc0 (markus): build.bat,MARKUS_html.template 수정
- - 효성 추가
Change-Id: I96151b99662a9b47eb95b77b9a90b75e65100cdf - 01:40 개정판 eeb0a39c (markus): Master 변경
- Change-Id: I88bac84fa474fd4c174dc1fffa19eae5303ba2bc
- 01:17 개정판 1f686727 (markus): mainMenu 수정
- Change-Id: I5186dcbaea01d5ea5c038626a8343df3ce9e0a12
- 01:14 개정판 8763aa9f (markus): Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
- Change-Id: I388440f50ec376e00bdc955b3d5e0d3a349c3556
# Conflicts:
# KCOM/PageManager/PageStorage.cs
# KCOM/Views/Mai... - 01:10 개정판 c69a5361 (markus): Merge "Revert "markus 성능개선""
- 01:10 개정판 6b24246c (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 01:05 개정판 d26860e2 (markus): Merge "Revert "markus 성능개선""
- 01:05 개정판 77190232 (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:58 개정판 07e91bac (markus): Merge "Revert "markus 성능개선""
- 00:58 개정판 2c3eae15 (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:55 개정판 6f1a424d (markus): Merge "Revert "markus 성능개선""
- 00:55 개정판 47e03d3b (markus): Merge "Revert "markus 성능개선""
- 00:55 개정판 158b0488 (markus): Merge "Revert "markus 성능개선""
- 00:55 개정판 b339f98b (markus): Merge "Revert "markus 성능개선""
- 00:55 개정판 361f31ff (markus): Merge "Revert "markus 성능개선""
- 00:55 개정판 0c1b98f7 (markus): Merge "Revert "markus 성능개선""
- 00:54 개정판 6ef25971 (markus): Merge "Revert "markus 성능개선""
- 00:54 개정판 b2c6901f (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:51 개정판 6d3d7aff (markus): Merge "Revert "issue #20022001: 텍스트 검색 / 마크업 리스트 필터 오류 수정""
- 00:51 개정판 65768148 (markus): Revert "issue #20022001: 텍스트 검색 / 마크업 리스트 필터 오류 수정"
- This reverts commit 2c629eec51a77c480dea3a490ecbceeb10587964.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:50 개정판 20ef6ffe (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:43 개정판 7f8a2ff4 (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:42 개정판 eefebdb7 (markus): test
- Change-Id: I3b054f5538543dfe147f62f672c758aafae9b738
- 00:30 개정판 64374bd8 (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:30 개정판 606884bf (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:28 개정판 71208c63 (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:28 개정판 4cb62752 (markus): Revert "markus 성능개선"
- This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id:... - 00:18 개정판 8578883b (markus): 4301:Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS Error Merge
- Change-Id: Iba3b7366695bdff68c1800199bab0de67bf83180
- 00:07 개정판 0c825789 (markus): test merge
- Change-Id: I81199b0678777ee2cae02a2275be907f94195afb
- 23:29 개정판 a083a7a0 (markus): Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
- Change-Id: I76352f85485c5a22ef7318adb2e170eb815c17aa
- 23:26 개정판 623a85ce (markus): test summit
- Change-Id: I1cd288c137dc14e38fe40260dc70f95c337e5cd2
- 20:54 개정판 2b9b3656 (markus): 효성 Ini 추가
- Change-Id: I685e15c2125448dc85109749bc853abee3452f19
- 19:52 개정판 8fb54282 (markus): 페이지 로딩 로직 최적화
- Change-Id: I8b876d54aefe3705ddf698d8e8e5ec4d183a4ea4
- 19:52 개정판 13ba2ed8 (markus): Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
- Change-Id: I29385e579cc1d1e75ef9707023e071de6c70f6f2
내보내기 Atom