Commit Graph

1489 Commits

Author SHA1 Message Date
richard-loafle
c0bfae71e2 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-17 14:39:44 +09:00
richard-loafle
f6727a61c8 refactoring 2020-02-17 14:39:38 +09:00
leejinho
d6b518f29b fake image 쪽지쪽 처리. 2020-02-17 13:12:42 +09:00
leejinho
f113e66377 # 이슈처리 236 2020-02-17 11:36:06 +09:00
leejinho
10744cfb60 # 이슈처리 246 2020-02-17 10:49:54 +09:00
leejinho
1e76418569 웹링크 정리 2020-02-17 10:49:21 +09:00
leejinho
5b84d02f7b bugfix :: wlndowstateChanged 의 옵저버블이 dispatch 되지 않아 noti 쪽이 움직이지 않는 문제 수정. 2020-02-17 10:49:09 +09:00
leejinho
4287216dd0 # 이슈처리 257 2020-02-17 09:18:18 +09:00
leejinho
f14dd52877 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 17:52:13 +09:00
leejinho
910911c78a bugfix 2020-02-14 17:52:03 +09:00
khk
23507a52aa 세로형 mat-tab 라인 수정 2020-02-14 17:33:37 +09:00
leejinho
3f43eb802a Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 17:28:47 +09:00
leejinho
14dcd34688 weblink 관련 팝업 오픈로직 수정. 2020-02-14 17:28:38 +09:00
richard-loafle
4debdf1ec9 bug fixed 2020-02-14 16:12:38 +09:00
richard-loafle
55170ae702 bug fixed 2020-02-14 16:05:27 +09:00
richard-loafle
ff0ebc7b5d Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 15:58:06 +09:00
richard-loafle
106ba524fb bug fixed 2020-02-14 15:57:59 +09:00
khk
65711ffda0 ng-deep(7차) 수정 2020-02-14 15:56:08 +09:00
leejinho
43db6efe6b 로그인 관련 문구 수정. 2020-02-14 15:46:13 +09:00
leejinho
4531d5d0bc Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 15:34:20 +09:00
leejinho
27654303a0 bugfix :: 쪽지 전송시 연속클릭 방지 2020-02-14 15:33:44 +09:00
richard-loafle
64ea49ae09 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 15:30:53 +09:00
richard-loafle
7d02dfca15 bug fixed 2020-02-14 15:30:47 +09:00
leejinho
0686c1d512 bugfix :: 현재 열려 있는 대화방이어도, windowState 가 minimal, hidden 일 경우에는 noti 팝업을 보여주도록 수정. 2020-02-14 14:59:40 +09:00
leejinho
c07d13eae8 # 이슈처리 247, 253 2020-02-14 14:27:54 +09:00
leejinho
30debd93b7 bugfix 엽데이트가 있습니다. 표시 부분 제거. 2020-02-14 13:27:15 +09:00
leejinho
831bdde860 bugfix :: 그룹, 팝업내 그룹, 조직도 검색시 sorting 2020-02-14 12:37:05 +09:00
leejinho
b9ec6d7425 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 12:31:27 +09:00
leejinho
dd06e72b51 bugfix 2020-02-14 12:31:07 +09:00
khk
c27eff8475 no message 2020-02-14 12:05:42 +09:00
leejinho
09a6001dd5 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 11:46:13 +09:00
leejinho
715850bfed # 이슈처리 255, 258, 259, 260 2020-02-14 11:46:03 +09:00
khk
2bc68e7865 ng-deep (6차) - bug수정 2020-02-14 11:23:46 +09:00
leejinho
ff9f06d648 bugfix 2020-02-14 10:04:45 +09:00
leejinho
2d6323274b Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 09:44:58 +09:00
leejinho
51ac5facfe bugfix :: 동영상 파일 업로드 시 썸네일 만들어지지 않아도 업로드 될 수 있도록 수정. 2020-02-14 09:42:19 +09:00
richard-loafle
da22b6d282 message is added 2020-02-14 09:35:01 +09:00
richard-loafle
2b894672e5 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-14 09:30:36 +09:00
richard-loafle
7ffe9d4561 check mime is added 2020-02-14 09:30:31 +09:00
leejinho
52c70097fb bugfix 2020-02-13 20:10:52 +09:00
khk
771b88b1b3 ng-deep 정리중(6차) 2020-02-13 20:03:24 +09:00
leejinho
2a385a7b7b version update to 0.0.21 2020-02-13 19:44:11 +09:00
leejinho
215a4dd662 fake 이미지, 동영상 파일 검증하는 로직 (중간단계 개발중) 2020-02-13 17:24:00 +09:00
leejinho
fc5f91d380 # 이슈처리 245 2020-02-13 15:12:28 +09:00
leejinho
fe4d7c26fb # 이슈처리 240 2020-02-13 15:04:29 +09:00
leejinho
573aa97ac7 # 이슈처리 241 2020-02-13 14:58:38 +09:00
richard-loafle
ed12c57984 bug fixed 2020-02-13 14:35:21 +09:00
leejinho
221974b273 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-13 14:00:19 +09:00
leejinho
684dab8ec0 앨범함, 파일함 오픈시 정보 새로 갱신하도록 수정. 2020-02-13 13:59:53 +09:00
leejinho
e825097971 defaultBrowser 팝업오픈 로직 원복 2020-02-13 13:59:29 +09:00
leejinho
ed210cc6f9 sms 보내기 수정.
1. 팝업 형식 수정,
2. 개인사번 파라미터 처리.
2020-02-13 13:58:27 +09:00
khk
ab22873885 rightDrawer 스크롤 발생 수정 , 프로필 ng-deep 삭제 2020-02-13 13:55:19 +09:00
leejinho
099927d441 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-13 12:22:29 +09:00
leejinho
fb35b84a65 bugfix 웹소켓 연결시 verinfo 에서 수집된 serverIP 정보로 접속하도록 수정. 2020-02-13 12:22:18 +09:00
khk
e64eb6c4a0 ng-deep 정리중(6차)- 통합검색, 뷰어 플레이어 2020-02-13 11:51:20 +09:00
leejinho
f47ebc11d6 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-13 11:03:11 +09:00
leejinho
edc9e8c78a 웹링크 팝업 오픈 형식 수정. 2020-02-13 11:02:51 +09:00
leejinho
7cb1f44562 bugfix ::
1. 파일다운로드 문제 수정.
2. 다운로드폴더 열기 문제 수정.
2020-02-13 11:02:12 +09:00
leejinho
2bd3e42cc7 bugfix 2020-02-13 11:01:31 +09:00
khk
6807b5d78f Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-12 18:45:59 +09:00
khk
6c0917f169 ng-deep 정리중(5차) 2020-02-12 18:45:43 +09:00
richard-loafle
d3f67d587b Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-12 17:37:05 +09:00
leejinho
cb9f0dde1f Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-12 17:32:41 +09:00
khk
b684566469 대화방 -다른이름으로 저장 짤림 수정 2020-02-12 17:28:58 +09:00
richard-loafle
6f4c450b33 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-12 17:25:11 +09:00
richard-loafle
43601951a4 open browser 2020-02-12 17:25:06 +09:00
leejinho
8f5152a60a # 이슈처리 251 2020-02-12 17:08:46 +09:00
leejinho
f68c96a390 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-12 16:54:50 +09:00
leejinho
b4eaa336e2 # 이슈처리 242 2020-02-12 16:54:24 +09:00
khk
0d5e3471a5 ng-deep 정리중(4차) 2020-02-12 16:49:39 +09:00
leejinho
e87b27a4fa # 이슈처리 243 2020-02-12 16:27:12 +09:00
leejinho
59774abb1f bugfix :: 사용자 통합검색에서 소팅 추가. 2020-02-12 16:26:20 +09:00
leejinho
d9d17f8c2a bugfix 2020-02-12 15:21:29 +09:00
khk
ecb7eb5f2f 통합검색 inputbox 영역(background-color white로 변경) 요구사항 반영 2020-02-12 15:06:26 +09:00
khk
b60c6086d2 ng-deep 정리중(3차) 2020-02-12 14:13:23 +09:00
leejinho
729379d0f8 # 시험결과분석 81 2020-02-12 14:08:22 +09:00
richard-loafle
2a05ada4c5 bug fixed 2020-02-12 13:58:15 +09:00
richard-loafle
45046d57f3 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-12 13:34:57 +09:00
richard-loafle
2665252d8c bug of image viewer is fixed 2020-02-12 13:34:46 +09:00
leejinho
edb1388a42 # 시험결과분석 57 2020-02-12 13:19:55 +09:00
leejinho
dc2c254639 # 시험결과분석 54, 66 2020-02-12 13:00:43 +09:00
leejinho
74ba71ceb9 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-12 11:04:54 +09:00
leejinho
3d7051446b bugfix :: tms 알림, 코끼리 알림, 화상회의 알림 메시징 처리. 2020-02-12 11:04:42 +09:00
khk
28e1b0a923 image-viewer 스크롤 색상 변경 2020-02-12 10:33:31 +09:00
leejinho
a8beb2966e # 이슈처리 235 2020-02-12 09:18:37 +09:00
leejinho
08f03b7043 # 이슈처리 230 2020-02-12 08:40:49 +09:00
khk
1c3a32c8cb ng-deep 정리중 이슈 - Clipboard 수정 2020-02-11 18:41:39 +09:00
richard-loafle
e34a0bbb93 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-11 18:07:48 +09:00
richard-loafle
3f7f3e0f4f bug of scroll to bottom is fixed 2020-02-11 18:07:42 +09:00
leejinho
a2f58613ff bugfix 2020-02-11 17:23:26 +09:00
leejinho
986ff4e928 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-11 17:18:58 +09:00
khk
6ed31ffd62 ng-deep 삭제 후 이슈: 환경설정 수정중 2020-02-11 17:13:46 +09:00
leejinho
138396df5b Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-11 17:12:15 +09:00
leejinho
b80f895989 # 시험결과분석
PC 기능  모바일에서 항상 모바일 알림을 받음 설정시 PC의 알림받기 설정값도 영향을 받음 문제점 2월11일
2020-02-11 17:11:55 +09:00
khk
a2229f73ae 프로필 - 회사 (기본정보)에 추가 , 부서, 직급(세부정보)추가 2020-02-11 16:37:04 +09:00
richard-loafle
7094ebddfd Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-11 16:35:41 +09:00
richard-loafle
559873d0db bug of reload app is fixed 2020-02-11 16:35:37 +09:00
leejinho
796e00ae83 bugfix :: 대화방, 앨범함에 이미지 뭉게짐 현상 수정.
1. 앨범함 : 리스트에 가로세로 고정함에 의해서 비율 깨짐.
2. 대화방 : 높이가 작은 이미지를 강제로 140 까지 키우면서 생긴 이미지 열화.
2020-02-11 16:20:44 +09:00
leejinho
d021d67945 bugfix :: 다른대화방 오픈 후 여기까지 읽음이 있는 대화방 재오픈시 "여기까지 읽음" 객체는 있지만 포커싱이 되지 않는 문제 수정. 2020-02-11 16:04:33 +09:00
leejinho
88f88451d2 # 시험결과분석
51 PC 조직도 검색 조직도 검색결과 회사명 추가
2020-02-11 15:04:36 +09:00
leejinho
3015b5ef87 1. 봇방(roomtype === B) 리스트에서 제거. >> [PC 로그인 알림] 봇방 제거.
2. 쪽지보내기 > 이미지 첨부시 이미지 사이즈 커지는 문제 수정.
2020-02-11 14:07:25 +09:00
khk
0005bebdec ng-deep 정리중(2차) 2020-02-11 11:09:57 +09:00
khk
39ed5dc95f ng-deep 정리중 (1차) 2020-02-10 19:09:57 +09:00
richard-loafle
2c71302e80 bug fixed 2020-02-10 18:05:47 +09:00
richard-loafle
3f4d863001 bug fixed 2020-02-10 17:21:43 +09:00
richard-loafle
4fb85a9dc1 bug fixed 2020-02-10 17:06:34 +09:00
richard-loafle
bd60c39bbe Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 17:06:05 +09:00
richard-loafle
4faf0c6713 refactoring 2020-02-10 17:06:01 +09:00
leejinho
f2759864ce Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 17:06:01 +09:00
leejinho
eae8f9111e 조직도 트리 내부서 열어주기. 2020-02-10 17:05:39 +09:00
richard-loafle
360adf6af3 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 16:27:17 +09:00
richard-loafle
232dd6742c [ISSUE 220] fixed 2020-02-10 16:27:08 +09:00
khk
d804f7e84c 말풍선 <a>테그 링크표시 2020-02-10 16:18:49 +09:00
richard-loafle
5512723950 zooming of image is modified 2020-02-10 16:08:04 +09:00
richard-loafle
17f9af17aa bug fixed 2020-02-10 15:42:52 +09:00
richard-loafle
1f64a4d428 script injection is modified 2020-02-10 15:37:02 +09:00
richard-loafle
b095cc60f6 scroll to bottom 2020-02-10 15:27:24 +09:00
richard-loafle
c022c82ac4 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 15:21:28 +09:00
richard-loafle
e6aa3127c3 working for statusbar 2020-02-10 15:21:24 +09:00
richard-loafle
1870d5764d working for statusbar 2020-02-10 15:20:36 +09:00
leejinho
abdcf44af1 #시험결과분석 42 2020-02-10 14:33:04 +09:00
leejinho
e7d43c7dcd Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 14:10:49 +09:00
leejinho
3298542f04 # 시험결과분석 46 2020-02-10 14:10:40 +09:00
richard-loafle
aab40f81ca Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 13:45:07 +09:00
richard-loafle
18e1a35867 bug for auto update is fixed 2020-02-10 13:45:02 +09:00
leejinho
515b0135f8 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 13:03:19 +09:00
leejinho
a4b43d4f2e bugfix :: 그룹대화방 열려 있는 상태에서 대화상대 추가시 대화상대리스트 갱신되지 않는 문제 수정. 2020-02-10 13:02:56 +09:00
khk
31a8c93153 마지막대화로 이동 버튼 색상 수정 2020-02-10 11:26:55 +09:00
khk
195ce632d5 마지막 대화로 이동 버튼 추가 2020-02-10 11:10:11 +09:00
leejinho
8b96760554 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 10:52:35 +09:00
leejinho
47d58cbbe9 #이슈처리 214 > noti 성격의 INVITE_RES, NOTI 통합처리. 2020-02-10 10:52:28 +09:00
richard-loafle
dbc54f8287 bug of chat room is fixed 2020-02-10 10:29:17 +09:00
leejinho
b0b5ed2209 bugfix
1. 빈확장자 파일업로드시 오류처리.
2. 지원하지 않는 파일입니다. <br/> (ext..) 의 줄바꿈 처리.
2020-02-10 09:33:41 +09:00
leejinho
928e77d54c # 이슈처리 229 2020-02-10 09:17:57 +09:00
khk
f73e45f781 알림, 비디오, 검색 창 수정- 퍼블리싱 2020-02-07 18:08:51 +09:00
leejinho
3ab17bcf46 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 17:53:32 +09:00
leejinho
23f1f76753 # 이슈처리 191 2020-02-07 17:53:16 +09:00
richard-loafle
82537b2d0d Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 17:48:57 +09:00
richard-loafle
1fb8b4864f [ISSUE 225] fixed 2020-02-07 17:48:52 +09:00
leejinho
dadc980af3 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 17:40:50 +09:00
leejinho
fa4633b012 # 이슈처리 200, 232 2020-02-07 17:37:20 +09:00
richard-loafle
2ce0f3af3b Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 17:14:48 +09:00
richard-loafle
e5f61f7a4e [ISSUE 153] fixed 2020-02-07 17:14:42 +09:00
leejinho
d820d426ce Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 16:15:57 +09:00
leejinho
d36bc99fca # 이슈처리 227 2020-02-07 16:15:47 +09:00
richard-loafle
b01ce21274 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 15:29:21 +09:00
richard-loafle
ffbb9d84d2 [ISSUE 208] [ISSUE 153] fixed 2020-02-07 15:29:16 +09:00
khk
493d7de442 동영상 박스 수정 2020-02-07 15:09:33 +09:00
richard-loafle
c44e534bfc Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 14:42:16 +09:00
richard-loafle
65fbf8ab77 [ISSUE 208] fixed 2020-02-07 14:42:11 +09:00