프로젝트

일반

사용자정보

통계
| 브랜치(Branch): | 개정판:

markus @ 902f397c

# 날짜 저자 설명
902f397c 2020/03/26 04:43 semi

DatabaseFilter 수정

Change-Id: I44d6697b18f74f21cd98d46243a56e1d3b50cc26
a9e86f7a 2020/03/26 02:34 semi

Database FIlter 추가

Change-Id: I9ff41db0744b05a8589ac74b237994ab4f019074
da77a62e 2020/03/26 02:08 semi

git test

Change-Id: I7722a00b1219912a81e5dfb870eb40766c8eb1f2
40a810fc 2020/03/25 03:28 김태성

main window 수정

Change-Id: I4ab3d66c5a5b1d06a9c9e40ca5fb972bf4d79cbb
d33ef543 2020/03/24 04:35 김태성

Main window style 변경

Change-Id: Idecdbcbe3743713536c151e5816c21fad4783f12
df00b3d0 2020/03/23 04:17 김태성

Merge "Sync Page 이동 수정"
da3feefa 2020/03/23 04:03 alzkakdixm

DataBaseViewInfo.xaml 수정

Change-Id: If309dfa1ea7f0579533ceaa71336cdcb13fe7dde
8c7d1ea1 2020/03/23 03:59 alzkakdixm

DataBaseItemsModel 수정

Change-Id: I90ab052d201b2ef824098c5ca2a08f7d703bdce2
d04e8ee9 2020/03/23 03:00 김태성

Sync Page 이동 수정

Change-Id: Ib0fbc85754ede89f83c1364ee77dc07f11ada633
344ac7ed 2020/03/22 21:32 alzkakdixm

ConvertDatabase 수정

Change-Id: I0344c54e8f7776ac577c77ec6a3e37428489d87f
b119eeaa 2020/03/20 00:42 김태성

MARKUS LINK BUTTON 수정

Change-Id: Ieef26e9aaa02baf31188d1b9f6ca0b73ebeb544d
67df8dcd 2020/03/20 00:30 alzkakdixm

DataBaseItems

Change-Id: I7d22ebd53fa40310c6c3c847c6e1c366f0f1fa06
c9f98e3b 2020/03/19 20:14 alzkakdixm

Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
Change-Id: I968b71ac1a3b8103ab734878a516c8c4549549a0
e78f0871 2020/03/19 20:13 alzkakdixm

DataBaseItemsModel 기능 추가

Change-Id: Ifffa6189b54cd183d981a569340628f5bb8a41a2
0585d5cc 2020/03/19 02:59 김태성

markus Api 오류 출력 되도록 수정

Change-Id: I7318ee5da1ec9b8dbfd4450a1ab7117b6b2713ea
0cd6d4c9 2020/03/18 03:20 김태성

json 참조 추가

Change-Id: I9e2a8dcdb8fe8777f6b248f634b24eba23c87a57
60fbc8d5 2020/03/18 03:06 alzkakdixm

Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS
Change-Id: Ibeba66d8aa1928f6541db14f09d01e58c254edb1
082cbc54 2020/03/18 03:05 alzkakdixm

markus link 추가

Change-Id: Ic3e6b96a1fe6616e51d666f1d50dcb7cdb1d2d31
05fd750b 2020/03/18 03:05 alzkakdixm

ConvertDatabase 수정

Change-Id: I02ef7e37ba84d4faafc85dea14371dc731cd79b0
508debb1 2020/03/18 03:01 김태성

ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs 오륫 수정

Change-Id: I5eba73db6332531d7a11e3327082375d95a59b72
c6bf88fd 2020/03/18 01:58 김태성

markus 호출 링크 Parameter 생성 추가

Change-Id: I516d5e1240a1dac6d80123c11ca5a7bd897de5b8
29000595 2020/03/18 01:46 alzkakdixm

Status 오류 수정

Change-Id: Ie84d975ccbec68d90a2c7a3d7b7907fcc0df0bb5
70bbad54 2020/03/18 01:39 alzkakdixm

Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS

Change-Id: I8e40d24e931ac2d4f698eea31e9bd1a511aa7b03

  1. Conflicts:
  2. ConvertService/ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs
  3. ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs
e6281033 2020/03/18 01:34 alzkakdixm

DataBaseItemsModel 코드 정리

Change-Id: Icd6fdbd71b04a0e17a7de888e41660f14f78f416
c8183702 2020/03/18 01:11 김태성

plugin Test 추가

Change-Id: I8c405b9d3e169cd7d6230e14695ef84756b32748
0b49ffb8 2020/03/17 20:07 alzkakdixm

DataExport 추가

Change-Id: I4366303f14a750556f80cc52c2f822cef2b2a514
0cb12397 2020/03/17 20:00 alzkakdixm

DataBaseItemsModel 정리

Change-Id: I2d6439710ff4c9a93263897d2c47f8f3c37f0f33
dfc86b71 2020/03/17 04:04 김태성

DataBaseItemsModel Alive Grid 수정

Change-Id: Iee3df7b70ce99c71e1aca094e632ab7253866727
2decfbdf 2020/03/17 03:46 alzkakdixm

DataBaseItemsModel 수정

Change-Id: I96830cad0b3990bb84346f438ba04e20d55ec26c
1e901a8d 2020/03/12 00:51 김태성

Export 수정

Change-Id: I36aaeeb3d6a8aa408c60e5ee386d8752849ee79a
86bff326 2020/03/11 21:06 김태성

- pdf export 수정

Change-Id: I44d70e1a8adce8d9b1dcaa92958594d1780fa02f
285635d3 2020/03/10 01:07 김태성

markus api의 Member 가져오는 Entity를 모두 쿼리로 변경

Change-Id: I028e1983be064366fdb95282874f9c2c7bc3901f
a6e5055d 2020/03/09 19:52 alzkakdixm

Markus.Service.StationController DataBaseView 추가

Change-Id: I16b9c78a690e2ae8f804bf35c8787a9c97fea157
97eba451 2020/03/09 03:09 김태성

빌드 수정

Change-Id: I74a4bf51fa235a47fcfb3e74c3922a3a346115d2
96bc6e8e 2020/03/08 21:20 김태성

PageStorage GetPageAsync에서 오류 발생시 무한 루프발생
- 방지하기 위한 IsReStart Flag 추가

Change-Id: I899961964f116524503be3fbdeefd5e9d5e7fc6c
81908c01 2020/03/06 00:49 김태성

PageStorage Null 체크 후 Clear

Change-Id: Ic2ecdf79c316531cbf15ec3b51451862427549d3
a7372e37 2020/03/06 00:06 김태성

kcom_Api 수정

Change-Id: I9dcefa2c90444f26fdc5bb68ee5c1092f172c9dc
339cabdd 2020/03/05 01:50 김태성

build.bat 수정

Change-Id: Ifd49477e88fdfcecea725be000d9795b3b281eb7
7841e9fb 2020/03/05 00:11 김태성

app.manifest

Change-Id: Id150244b2ed52e8746b626e2c8e959c0cea9c185
cc8b794d 2020/03/05 00:09 김태성

build.bat 수정

Change-Id: Ic8a3bb226882da4b19d08bb360fd2cc62facb7b7
84605c0c 2020/03/04 20:21 김태성

호셩 컴파일 옴션 추가
-btnConsolidateFinalPDF.Visibility = System.Windows.Visibility.Collapsed

Change-Id: I13e6a9ab634f41f3e3f6cfb38ae356a57a6fe3d1
366f00c2 2020/03/04 03:40 김태성

dns 체크 에러 수정

Change-Id: I9fd9b9d37c7c2529795ab14f46f58b157d911809
72424099 2020/03/04 01:19 김태성

Markus.ImageComparer/ImageComparerBase.cs Parallel.ForEach 제거

Change-Id: I2875826245d2ce1530ffb6ffe712615d17b4a36e
ac4f1e13 2020/03/04 00:20 김태성

Markup load 비동기로 변경

Change-Id: I471906b1090f7f3f0fd18e97d88a54f75fd1f673
c8b87260 2020/03/03 03:22 김태성

MARKUS_html.template 수정

Change-Id: I362d01e2e5eaf297bbc06955615d57d03c1910de
f593e724 2020/03/03 03:08 김태성

markus api 효성 Web.Release_Hyosung.config 추가

Change-Id: I556878ed17321b1db76623f8fab5b35ce1a897de
d0286794 2020/03/03 02:59 김태성

OnStartup 에러 수정

Change-Id: I9b2078a68a4f080dc87488c15a03430bd0a66fc0
e80bc021 2020/03/03 02:18 김태성

효성 tag 수정

Change-Id: I87a06fe967a57ecd4f80c044ccba6c8aebce7961
024efbc7 2020/03/03 01:50 김태성

효성 빌드 수정

Change-Id: Ie7fedbec1994dbe3cd5bda627c17d4289b811ccf
1cea0342 2020/03/03 00:33 김태성

MARKUS_HyoSung_x86.wxs 수정

Change-Id: Ia75c690e392119978b7c9c36e9160d469916e967
e8557bd7 2020/03/02 23:32 김태성

빌드 수정 x86추가

Change-Id: If4d98bee9f4306a3c5c82a07038017c916d03f8f
068113d5 2020/02/28 03:37 김태성

효성 빌드 수정

Change-Id: I8ffe1661e5fe6e8b1d8abdf0adb3cd93b4c614be
79a11ea2 2020/02/28 03:16 김태성

build.bat 수정

Change-Id: I3373fbd2dbadf4182daf6c60824ac1053296151f
01d5bc65 2020/02/28 03:08 김태성

build.bat 효성 32bit & 64bit 빌드 수정

Change-Id: I53e774093f7a34f5432faef85840d92a7b052fe1
f3c48db7 2020/02/28 02:47 김태성

MARKUS_HyoSung.wxs & build.bat 수정

Change-Id: Ib2bfe8ce76450b42807c310e9c6e28389ea79bc6
b0dd9d73 2020/02/27 21:10 김태성

MARKUS_HyoSung.wxs condition 수정

Change-Id: Ifc0b79f2f201d14cd237209617b16f2dab67f21c
a6791024 2020/02/27 20:47 김태성

MARKUS_HyoSung.wxs 64bit or 32bit condition 추가

Change-Id: I423b5a5f60e659799e916cc114ee328bd7fe9eae
503cb09e 2020/02/27 19:57 김태성

service controller 참조 DLL 추가

Change-Id: I71275da928adc2181aa4c8da4b377eccabe90669
c9e9f822 2020/02/26 03:39 김태성

MARKUS_HyoSung.wxs 수정 경로 오류

Change-Id: I1cc5f4990a912e879d9bff1b5914e754efc76477
51030b37 2020/02/26 03:00 김태성

효성 빌드 SmartUpdate.csproj 수정

Change-Id: I185ad6b7962092060948260e9529f8a4fb803da4
7d8e1b57 2020/02/26 02:24 김태성

빌드 코드 최적화 적용

Change-Id: I687bf280e7e979082fba2e07a3bd6886dd65fb81
a5d3dcc3 2020/02/26 01:53 김태성

MARKUS_HyoSung.wxs 참조 DLL 경로 변경

Change-Id: I90fa5b3a432c436c6afc355a422166a8238a261f
bd89069b 2020/02/26 00:45 김태성

build.bat 효성 별도의 폴더로 실행하도록 수정

Change-Id: I643732fde7546427fe124e452fcc6f4cdf576d42
b5ce63e1 2020/02/26 00:34 김태성

build.bat 효성 부분 수정

Change-Id: I6d9c019057908faf4fc904da16bee0821b47c921
4d842eed 2020/02/26 00:23 김태성

app.Release_Hyosung.config commit

Change-Id: Ib5f695a55ac2889741784f8269c374d3e04bdaab
05278c39 2020/02/25 23:55 김태성

효성 빌드 수정

Change-Id: If60b794b1999a1cfde4b4892261c7683853d8117
80856edb 2020/02/25 23:42 김태성

빋드 이벤트 효성 추가

Change-Id: Ib8e88c7e20f7ca1de5949cdbd3ecd7148c98b676
14bbabc0 2020/02/25 18:49 김태성

build.bat,MARKUS_html.template 수정
- 효성 추가

Change-Id: I96151b99662a9b47eb95b77b9a90b75e65100cdf
eeb0a39c 2020/02/25 01:40 김태성

Master 변경

Change-Id: I88bac84fa474fd4c174dc1fffa19eae5303ba2bc
1f686727 2020/02/25 01:17 김태성

mainMenu 수정

Change-Id: I5186dcbaea01d5ea5c038626a8343df3ce9e0a12
8763aa9f 2020/02/25 01:14 김태성

Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS

Change-Id: I388440f50ec376e00bdc955b3d5e0d3a349c3556

  1. Conflicts:
  2. KCOM/PageManager/PageStorage.cs
  3. KCOM/Views/MainMenu.xaml.cs
c69a5361 2020/02/25 01:10 임예철

Merge "Revert "markus 성능개선""
6b24246c 2020/02/25 01:10 임예철

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I53ed02d7e0d56d72a65af37fc109141cfa61bb8a
d26860e2 2020/02/25 01:05 임예철

Merge "Revert "markus 성능개선""
77190232 2020/02/25 01:05 임예철

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I419ac1ce03b0b93086040c69dfc85b13697720c0
07e91bac 2020/02/25 00:58 임예철

Merge "Revert "markus 성능개선""
2c3eae15 2020/02/25 00:58 임예철

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I2978dc7ed08980980dabf724d9249b73c5dba72d
6f1a424d 2020/02/25 00:55 임예철

Merge "Revert "markus 성능개선""
47e03d3b 2020/02/25 00:55 임예철

Merge "Revert "markus 성능개선""
158b0488 2020/02/25 00:55 임예철

Merge "Revert "markus 성능개선""
b339f98b 2020/02/25 00:55 임예철

Merge "Revert "markus 성능개선""
361f31ff 2020/02/25 00:55 임예철

Merge "Revert "markus 성능개선""
0c1b98f7 2020/02/25 00:55 임예철

Merge "Revert "markus 성능개선""
6ef25971 2020/02/25 00:54 임예철

Merge "Revert "markus 성능개선""
b2c6901f 2020/02/25 00:54 임예철

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I5840bb32d1074d593b86c75b9e9ece59add82525
6d3d7aff 2020/02/25 00:51 임예철

Merge "Revert "issue #20022001: 텍스트 검색 / 마크업 리스트 필터 오류 수정""
65768148 2020/02/25 00:51 임예철

Revert "issue #20022001: 텍스트 검색 / 마크업 리스트 필터 오류 수정"

This reverts commit 2c629eec51a77c480dea3a490ecbceeb10587964.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I019121c484b36a8f55d859b86a3a7b3a7123ca0c
20ef6ffe 2020/02/25 00:50 임예철

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Ibefadea6bec24a0b94e5f61f95f9e8d838ae369d
7f8a2ff4 2020/02/25 00:43 김태성

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I837f890fec6a85da9553dd6c0dad5a887b9956ed
eefebdb7 2020/02/25 00:42 김태성

test

Change-Id: I3b054f5538543dfe147f62f672c758aafae9b738
64374bd8 2020/02/25 00:30 김태성

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I98dd349d529f53f5e0f5d353157490fc34f4e187
606884bf 2020/02/25 00:30 김태성

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I082527ea0df983223cb4d7ac9c38f0c3d3bfc8d6
71208c63 2020/02/25 00:28 김태성

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I62fa4a232ee9a418ffceccffe432e7fdda93396d
4cb62752 2020/02/25 00:28 김태성

Revert "markus 성능개선"

This reverts commit 0cda2a885008c0503d20d124631932685c72d462.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Idf219ace4fcd6122b2557f5022c8457e5ef61d68
8578883b 2020/02/25 00:18 김태성

4301:Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS Error Merge

Change-Id: Iba3b7366695bdff68c1800199bab0de67bf83180
0c825789 2020/02/25 00:07 김태성

test merge

Change-Id: I81199b0678777ee2cae02a2275be907f94195afb
a083a7a0 2020/02/24 23:29 김태성

Merge branch 'master' of ssh://devdoftech.co.kr:29418/MARKUS

Change-Id: I76352f85485c5a22ef7318adb2e170eb815c17aa
623a85ce 2020/02/24 23:26 백흠경

test summit

Change-Id: I1cd288c137dc14e38fe40260dc70f95c337e5cd2
2b9b3656 2020/02/24 20:54 김태성

효성 Ini 추가

Change-Id: I685e15c2125448dc85109749bc853abee3452f19
8fb54282 2020/02/24 19:52 김태성

페이지 로딩 로직 최적화

Change-Id: I8b876d54aefe3705ddf698d8e8e5ec4d183a4ea4
클립보드 이미지 추가 (최대 크기: 500 MB)