Commit Graph

1504 Commits

Author SHA1 Message Date
khk
ebf25660d5 프로필 추가정보 적용 2019-12-24 15:44:30 +09:00
khk
1efc686562 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html
2019-12-24 15:37:34 +09:00
khk
4eaa4d4c18 프로필에 정보 추가 2019-12-24 15:06:22 +09:00
leejinho
ffce78720b Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-24 14:59:08 +09:00
leejinho
b68bb1d83a 프로필 1차 수정본. 2019-12-24 14:58:43 +09:00
leejinho
1d28f842a0 [대상향] 운영 PI, Prompt, Msg SSL 적용에 따른 설정 변경. 2019-12-24 14:57:55 +09:00
leejinho
ec2c822405 로그인시 로컬 IP, MAC 정보 송신하도록 수정 :: 세션 로그아웃시 해당 정보 내려주기로 함. 2019-12-24 14:56:15 +09:00
8ed5c11300 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-24 11:41:53 +09:00
73ba46ed58 environment module is added 2019-12-24 11:41:50 +09:00
leejinho
a9342ac745 대화방 검색 > 이전대화검색시 순환검색되지 않도록 수정. 2019-12-24 10:53:35 +09:00
leejinho
4ebe588e25 [대상향] 앱 타이틀 변경 > DS Talk 2019-12-24 10:32:02 +09:00
khk
6c43b34c4b 메신저 네이밍 수정 2019-12-24 09:45:14 +09:00
khk
2cea9e4cd1 프로필- 개인정보 추가 2019-12-23 19:12:22 +09:00
khk
73e2632044 프로필수정- 디자인수정 2019-12-23 17:48:28 +09:00
leejinho
94d2d98cb8 채팅방 날짜 수정. 2019-12-23 17:08:10 +09:00
leejinho
a813656c0e Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-23 16:53:28 +09:00
leejinho
166b86677f 이벤트 타입 [이벤트(P)] 처리. 2019-12-23 16:53:07 +09:00
202c629a82 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-23 16:47:25 +09:00
daa4bc2ba9 delete of message is added 2019-12-23 16:47:20 +09:00
6f9702f3db message notification is modified 2019-12-23 16:37:44 +09:00
leejinho
b4a6081edd 대화내용 검색 기능 추가. 2019-12-23 15:23:27 +09:00
leejinho
ccc88e194e 스티커 닫기 이벤트 추가. 2019-12-23 15:23:15 +09:00
leejinho
53c99cfe68 설치패키지의 로그인 화면 이미지 나오지 않는 문제 임시로 수정. 2019-12-23 15:21:48 +09:00
77ac22d122 message notification is modified 2019-12-23 14:47:35 +09:00
b1fb9ba6b8 notification setting is applied 2019-12-20 20:25:51 +09:00
fb802e0bf3 setting of notification is implemented 2019-12-20 19:53:08 +09:00
2203e94a4e timezone is implemented 2019-12-20 16:30:22 +09:00
leejinho
f137f0a9e5 검색시 본인 검색되지만 선택이 필요할 경우에는 선택되지 않도록 수정. #2 조직도 2019-12-20 11:51:00 +09:00
leejinho
1de4d72472 검색시 본인 검색되지만 선택이 필요할 경우에는 선택되지 않도록 수정. 2019-12-20 11:33:14 +09:00
leejinho
c289df1c47 강제로그아웃 후 발생하는 스크립트에러 수정 및 재로그인 안되는 문제 수정. 2019-12-20 11:07:41 +09:00
leejinho
f1b42392e4 메신저 최소 사이즈 고정 및 로그인페이지 레이아웃 수정. 2019-12-20 10:15:48 +09:00
khk
26a9cd019a min-height:700-->800수정 2019-12-20 09:54:02 +09:00
leejinho
404cf0a077 로그인 페이지 배경 로테이션 적용. 2019-12-20 09:36:46 +09:00
khk
4e44407f9b Daesang 로그인 디자인 수정 2019-12-19 19:11:06 +09:00
leejinho
83e29c172b [대상향] 웹링크 결재 카운트 처리. 2019-12-19 18:08:16 +09:00
leejinho
c88b198abb 그룹 > 사용자 검색 :: 검색된 사용자에 대해서 context menu 표출 안되던것 수정. 2019-12-19 17:47:10 +09:00
leejinho
c349500718 유저검색 팝업에 본인 검색되지 않도록 수정 2019-12-19 17:19:36 +09:00
leejinho
002ecf23dd 메신저 기본값 environment 로 이동 수정. 2019-12-19 16:07:33 +09:00
leejinho
568c0be6a5 타이머 대화방 사용유무, MASSTEXT 길이, 대화방 참여인원제한 > 환경설정으로 구성. 2019-12-19 15:29:18 +09:00
leejinho
7a448f3f1a 여기까지 읽음 기능 추가. 2019-12-19 14:23:11 +09:00
leejinho
7501275465 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-19 08:50:28 +09:00
leejinho
f69f7a5382 [대상향] 프로필 이미지 풀패스로 유입되는 건에 대한 처리. 2019-12-19 08:49:31 +09:00
leejinho
93c7991e20 [대상향 ]비밀번호 변경페이지 변경 2019-12-19 08:49:06 +09:00
22bb4d95f1 StartupHideWindow is implemented 2019-12-18 17:11:58 +09:00
70e17b4a3d package script of daesang real is modified 2019-12-18 15:57:02 +09:00
76dd6883d3 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-18 13:44:45 +09:00
26d112bd55 i18n is applied 2019-12-18 13:44:26 +09:00
leejinho
76a66088bd 프로필 이미지 업로드 옵션처리. 2019-12-18 10:46:42 +09:00
leejinho
0233ef4117 SMS 연동 2019-12-18 09:56:00 +09:00
leejinho
8e40d81f92 웹링크 버그 수정. 2019-12-18 08:49:34 +09:00
leejinho
2a992606b2 고정그룹에 대한 핸들링 처리 2019-12-18 08:40:45 +09:00
leejinho
900e9b57ea Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-17 17:41:58 +09:00
leejinho
f7b782df14 로그아웃시 웹링크 팝업 남아 있는 오류 수정. 2019-12-17 17:41:08 +09:00
db0c720f17 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-17 17:27:28 +09:00
65134c851e auto launch is implemented 2019-12-17 17:27:08 +09:00
leejinho
ed05045e43 [대상향] 로그인시 SSO 만기됬을 경우에 대한 처리 2019-12-17 17:24:06 +09:00
leejinho
eb440304ff Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-17 16:41:00 +09:00
leejinho
8cfb56efe1 쪽지 노티팝업 기능 추가. 2019-12-17 16:39:02 +09:00
b5ceea129b auto login of settings is modified 2019-12-17 16:29:04 +09:00
99ff3eaa36 Room name is modified 2019-12-17 16:13:38 +09:00
0c90c2e18d Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-17 15:13:43 +09:00
9441a1304c Translate of HR Information is implemented 2019-12-17 15:13:25 +09:00
leejinho
d5bdbd2cd7 refactoring 2019-12-17 13:00:33 +09:00
leejinho
fcfb03e9f9 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-17 11:45:30 +09:00
leejinho
ccb7b8df52 웹링크 뱃지기능 선처리. 2019-12-17 11:44:59 +09:00
khk
4e2f19b91e 대화방 입력폼, 다른이름으로 저장,스티커,조직도(수정중) 2019-12-17 09:18:48 +09:00
leejinho
57f05645b8 로그인화면 불필요 요소 숨김처리. 2019-12-17 08:55:52 +09:00
leejinho
4ff74796b1 로그아웃 팝업 오픈 후 취소시 에러 발생 수정. 2019-12-17 08:55:35 +09:00
leejinho
d2f2708224 [대상향] 웹링크 처리를 위한 appUserInfo 저장 로직 변경. 2019-12-17 08:55:06 +09:00
leejinho
abc1215d6c Call 기능 구현.
>> call api 호출 후 응답값에 대한 처리가 필요함. 현재 응답이 느려서 500 에러 떨어짐.
2019-12-16 17:42:49 +09:00
leejinho
0a3e8a9df0 자동로그인 수정 / 로그아웃 수정. 2019-12-16 09:58:01 +09:00
leejinho
ffb79c7de0 참조관계 수정. 2019-12-16 08:58:33 +09:00
leejinho
9079361aa5 회사코드 고정에 따른 enviroment 값 추가. 2019-12-16 08:53:06 +09:00
d78e015ba0 translate of organization is added 2019-12-16 05:20:52 +09:00
e4e005802f settings is modified 2019-12-16 04:49:27 +09:00
c37f439fb0 bug of updater is fixed 2019-12-16 02:33:40 +09:00
2baae8e81c Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-15 22:50:56 +09:00
0b8c11de48 auto login is implemented 2019-12-15 22:49:35 +09:00
leejinho
c193020409 프로필 정보 팝업 정보 수집방식 변경.
>> 기존 여려 type 으로 유입되는 userInfo 들을 SSVC_TYPE_QUERY_DATA_USER_REQ 프로토콜을 통한 {사용자정보SS} 타입으로 일괄처리하도록 수정.

>> 대상향으로 추가정보 추가 수집하도록 커스터마이징
2019-12-15 21:36:12 +09:00
497f04efca Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2019-12-15 18:07:43 +09:00
f309e14397 dasang module is added 2019-12-15 18:07:25 +09:00
leejinho
1ccd32957f 조직도 부서원의 context 메뉴 기능 추가. 2019-12-15 17:43:48 +09:00
leejinho
32155ed7a9 [대상] 로그인시 회사코드 고정하는 부분 수정 2019-12-15 17:43:16 +09:00
leejinho
ac76cbb1c3 [대상향]
개인정보처리방침 > 이용 주의사항 으로 변경처리
2019-12-15 14:49:52 +09:00
leejinho
438cb519b4 회사코드 고정 2019-12-15 14:49:04 +09:00
leejinho
43f071319e 웹링크 버그 수정. 2019-12-15 14:01:45 +09:00
leejinho
97c90ff06d 웹링크 브라우저 연동 처리. 2019-12-13 16:51:44 +09:00
leejinho
f3513e0f9a 처리되지 않은 EventType 유입시 에러 발생하지 않도록 수정. 2019-12-13 16:51:26 +09:00
leejinho
dc26faa618 urlInfo 정보 수집 2019-12-13 14:38:42 +09:00
0271d86add configuration of daesang is added 2019-12-13 13:45:08 +09:00
3f8b68efff Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-12 17:15:16 +09:00
e84d47540d renderer update is implemented 2019-12-12 17:15:09 +09:00
leejinho
967d25c155 예약쪽지 수정 기능 구현. 2019-12-12 15:11:49 +09:00
leejinho
bc037c6d52 쪽지 detail > 이미지 지연로딩을 위해 default 이미지 처리. 2019-12-11 11:00:52 +09:00
leejinho
4e5ace1d40 쪽지 연결. 2019-12-11 08:18:32 +09:00
leejinho
b81975be9b 웹링크 툴팁 2019-12-11 08:08:37 +09:00
leejinho
d11e47a272 대화방 내 강퇴기능 구현 2019-12-10 12:38:20 +09:00
leejinho
7060e3a7af 불필요 소스 제거. 2019-12-09 18:52:13 +09:00
leejinho
dfde4bf491 순환참조 오류 수정. 2019-12-09 18:50:42 +09:00
leejinho
2dcd0036d0 ## 방정보.참여자 정보 수정.
1. isJoinRoom 값에 따른 화면별 처리.

## 강퇴기능 씽크 제반 작업.
1.  모바일 씽크작업.
2. 강퇴 메시지 처리.

## 사용자 초대 ::
1. 모바일과 씽크.
2. 초대시 방정보 갱신되지 않는 문제 수정.
2019-12-09 16:52:43 +09:00
leejinho
39aaa78e4e 방 나가기 모바일 씽크 작업. 2019-12-09 16:25:08 +09:00
leejinho
5c05a04cca Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-09 13:42:48 +09:00
leejinho
e927163f95 앨범함 이미지 썸네일 처리 로직 수정.
파일함 나에게 전달, 전달, 삭제 기능 구현.
2019-12-09 13:42:40 +09:00
73d7f181ea validation of schedule send is modified 2019-12-09 11:28:27 +09:00
0f2a0bf4cb Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-09 10:53:44 +09:00
aa364cac67 validation of editor is modified 2019-12-09 10:53:25 +09:00
leejinho
6a3ca4da7b # 이슈처리
[66 비밀대화방으로 전달 시 일반대화방으로 전달됨] :: 대화방 전달시 대화방 인원 수집후 기존 로직을 태우던 것을 대화방에 일단 전송 후 대화방을 여는 로직으로 수정.
2019-12-09 09:58:43 +09:00
leejinho
2a6623f7b0 # 이슈처리
[10 즐겨찾기 해제하였지만 즐겨찾기 그룹에 있음] :: 즐겨찾기 인원이 없을 경우 비워주도록 수정.
2019-12-09 09:01:12 +09:00
leejinho
cc7908875a Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-06 18:08:16 +09:00
leejinho
b7927e3fa4 앨범함 썸네일 이미지 안나오는 부분 수정. 2019-12-06 18:08:01 +09:00
0f0d3a8338 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-06 17:53:28 +09:00
1738b0776c message reservation is implemented 2019-12-06 17:53:19 +09:00
leejinho
82b7f070a2 웹링크 화면 구성. 2019-12-06 15:14:12 +09:00
leejinho
5628ba2fbe 파일함 다운로드 기능 구현.
다운로드 기한 날짜 기능 구현.
2019-12-06 13:35:31 +09:00
leejinho
7e38da2717 앨범함 다운로드 기능 구현. 2019-12-05 17:42:13 +09:00
leejinho
298ccfb045 조직도 부서원 이름순으로 정렬하도록 수정. :: 추후 인사시스템 언어정보에 따라 ordering 처리 해줘야 함. 2019-12-05 14:37:40 +09:00
leejinho
ae0a5776a1 유저선택 팝업에 ignoreUserList 정책 적용.
:: 대화상대추가 시 제거할 수 없는 기존 인원이 존재하여, 이를 checkable && disabled 처리 하도록 수정.
2019-12-05 14:37:09 +09:00
leejinho
b3ab8fa9b2 쪽지 검색 리스트 수정. 2019-12-05 11:09:44 +09:00
398fc77e19 list item of message is added 2019-12-04 18:32:09 +09:00
aac8802822 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-04 17:59:10 +09:00
4f6b1dd6ca write of message is implemented 2019-12-04 17:58:59 +09:00
leejinho
7b927afb4b 앨범함, 파일함 :: 다운로드 기본 폴도 열기 기능 구현. 2019-12-04 16:37:19 +09:00
leejinho
baafd13cd6 기간만료된 파일 전달 하지 못하도록 수정. 2019-12-04 14:36:15 +09:00
leejinho
ac54b20021 만료된 파일 클릭시 뷰어 오픈 안되도록 수정. 2019-12-04 12:16:16 +09:00
8dbd747f16 multiple image is implemented 2019-12-03 19:06:29 +09:00
b0e2b12b09 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-03 18:59:20 +09:00
ccf7ea0092 message is added 2019-12-03 18:59:11 +09:00
leejinho
8c554b523a Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-03 14:32:56 +09:00
leejinho
5ac76edadd 공지사항 기능 추가. 2019-12-03 14:32:50 +09:00
leejinho
ec60e33af1 top-bar 내 tooltip 적용. 2019-12-03 14:32:31 +09:00
leejinho
51a84ee42f 비밀번호 만료 처리 변수명 수정 및 로직 수정. 2019-12-03 14:30:41 +09:00
khk
20614ed4f0 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html
#	projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
2019-12-03 09:32:54 +09:00
leejinho
d5b6514f48 unsubscribe add 2019-12-03 08:51:49 +09:00
05a52dd1d5 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-02 18:46:14 +09:00
2a737bbe37 inline edit is added 2019-12-02 18:46:07 +09:00
leejinho
e6cdde6c31 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-12-02 15:31:41 +09:00
leejinho
b3f29e89fd 새쪽지 작성 중간 커밋 2019-12-02 15:31:32 +09:00
bf333785b9 bug fixed 2019-11-29 18:32:30 +09:00
eb542bd923 upload of profile image is implemented 2019-11-29 18:24:51 +09:00
4da93a5351 bug fixed 2019-11-29 16:08:24 +09:00
2d99b7c4c8 bug fixed 2019-11-29 15:09:47 +09:00
e651e6f7b5 bug fixed 2019-11-29 14:53:48 +09:00
31153b52bf change password is modified 2019-11-29 14:26:59 +09:00
68e861a39b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-28 18:12:27 +09:00
b72e2adc8b change password is implemented 2019-11-28 18:12:20 +09:00
leejinho
0f88633aea Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-28 17:30:50 +09:00
leejinho
697aa2ac07 쪽지 기능구현 :: 상세보기, 삭제, 읽음확인, 발송취소. 2019-11-28 17:30:43 +09:00
c5d61417f3 password process of login is modified 2019-11-28 15:48:36 +09:00
3fd92b2df5 usePrivateInformationAgree is added 2019-11-28 14:02:07 +09:00
0a9e3bc84c consts are added 2019-11-28 13:44:41 +09:00
643fe7a7c1 bug of logout is fixed 2019-11-28 13:19:19 +09:00
leejinho
5852196129 #이슈처리
[74 선택한 스티커 보여주지 않지만 텍스트와 같이 전송됨] :: 스티커 선택 창 닫으면 초기화 하도록 수정.
2019-11-28 09:26:08 +09:00
leejinho
943452a5c9 유저선택 팝업에 툴팁 기능 추가. 2019-11-27 18:15:01 +09:00
leejinho
0b70c78a94 # 이슈처리
[39 요일 영어로 보여짐] :: 포멧 수정.
2019-11-27 17:56:24 +09:00
leejinho
c8731ea256 [58 사진 마우스 오버 시 팝업 발생] :: 이미지에 오버했을 경우 실제 파일명이 말풍선으로 출력될 수 있도로 수정.
[69 목록 내린 후 다른 부서 선택 시 흰화면 보여짐] :: 다른부서 검색 후 스크롤을 올려주도록 수정.
2019-11-27 16:52:37 +09:00
leejinho
2e984a2fa2 bugfix 스티커 연속으로 보내지지 않는 버그 수정 2019-11-27 15:40:09 +09:00
leejinho
a4e018eef3 # 이슈처리
[53 0명 그룹 대화방 생성됨] :: 0명그룹에 그룹대화 메뉴 삭제
2019-11-27 15:30:14 +09:00
leejinho
9c7839f65a # 이슈처리
[55 새그룹 팝업에서 No 선택 시 추가하는 팝업 발생함] :: 버그수정
[56 새그룹 팝업에서 Yes 선택 시 팝업 타이틀 오류] :: 문구 수정
2019-11-27 15:02:02 +09:00
leejinho
187efa67ab [20 전달 탭 사용자 선택 통일성 없음] 이슈처리.
이벤트 꼬이는 문제 수정 및 대화방 리스트 클릭시 체크박스 토글되도록 수정.
2019-11-27 14:39:43 +09:00
leejinho
0bc6968e98 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-26 17:54:43 +09:00
leejinho
e0c1e181f7 쪽지 미리보기 중간 적용. 2019-11-26 17:54:37 +09:00
khk
fb753bef76 sound-viewer 2019-11-26 15:11:07 +09:00
7e91df9a5d general settings is modified 2019-11-26 15:08:00 +09:00
297baa1771 count of room member is commented 2019-11-26 14:53:51 +09:00
67a6e4ceaf progress bar is modified 2019-11-26 14:06:50 +09:00
4582a25219 progress-bar is modified 2019-11-26 13:57:37 +09:00
5cc74eb11e toolbar of message is modified 2019-11-26 13:51:19 +09:00
97d23ab1ff Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-26 13:37:13 +09:00
bf8e3e9b5f group is modified 2019-11-26 13:37:07 +09:00
khk
456b35c845 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-26 10:57:18 +09:00
khk
7da4bfb5ee 테마선택- tab으로 변경 2019-11-26 10:56:58 +09:00
d053db400f bug fixed 2019-11-26 10:52:50 +09:00
abfeaa4dc9 organization is modified 2019-11-26 10:43:37 +09:00
664a92781f Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 16:48:13 +09:00
1d25831e0c splash is modified 2019-11-25 16:48:06 +09:00
leejinho
07de37f2d2 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 15:49:02 +09:00
leejinho
9cb016244d 쪽지 검색 기능 추가. 2019-11-25 15:48:54 +09:00
leejinho
f33df67724 bugfix 스티커 버그 수정. 2019-11-25 15:48:43 +09:00
khk
6a812a2240 스플레시 - 수정 2019-11-25 15:44:08 +09:00
khk
4e47dd6855 스플레시 추가 2019-11-25 15:23:52 +09:00
leejinho
81f871bea3 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 14:12:57 +09:00
leejinho
d7cec3f93f 스티커 기능 구현..
## issue : 스티커 해제를 위한 로직 추가 필요.
2019-11-25 14:12:49 +09:00
ce226bd3f6 logo is changed 2019-11-25 11:29:54 +09:00
5641f8b777 icon of app is changed 2019-11-25 11:10:30 +09:00
746a5f2a5c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 10:57:10 +09:00
5f31e8c136 change theme is modified as temparary 2019-11-25 10:57:02 +09:00
khk
92e2ec75e4 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 10:54:34 +09:00
khk
ca9d976f05 그룹명수정 2019-11-25 10:51:45 +09:00
leejinho
c052c0b9e8 Call 메뉴 숨김. 2019-11-25 10:50:16 +09:00
leejinho
87646ba902 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 10:47:50 +09:00
leejinho
fd5b4b12f3 로그아웃, 설정 버튼에 대한 유효성 체크.
1. 로그아웃시 보여지지 않게 수정.
2. 로그인 상태가 아닐 경우에 skip 하도록 수정.
3. 로그아웃시 confirm 하도록 수정.
2019-11-25 10:47:44 +09:00
khk
93ece671cd Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 10:40:05 +09:00
khk
134656935f 환경설정 - 테마 추가 2019-11-25 10:39:09 +09:00
fae557890f Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 10:29:06 +09:00
9ab79fd494 organization is modified 2019-11-25 10:28:59 +09:00
leejinho
bde11c8711 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 09:57:06 +09:00
leejinho
e916203994 left-side navi 에 내프로필 컴포넌트화. 2019-11-25 09:56:59 +09:00
893ebae543 event of top-bar is added 2019-11-25 09:41:15 +09:00
55bfee5980 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-25 09:34:20 +09:00
f2bd8aea17 organization is modified 2019-11-25 09:34:12 +09:00
khk
15f98d5f78 대상아이콘 추가 2019-11-25 09:28:01 +09:00
khk
916b4cb75a 테마 수정 2019-11-25 09:05:35 +09:00
khk
4f31f81c26 레이아웃변경 2019-11-22 17:35:00 +09:00
leejinho
3abb947d92 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-22 17:25:59 +09:00
leejinho
deb48ab7e8 쪽지 right drawer 에서 left side navi 로 이동. 2019-11-22 17:25:51 +09:00
khk
f48cd1b696 내프로필 이미지 영역 추가 2019-11-22 16:41:04 +09:00
leejinho
8c6731b2e8 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-22 16:15:17 +09:00
leejinho
53378832ec FAB 위치 수정 :: 좀더 왼쪽으로 이동하여 그룹의 more 버튼과 겹치지 않도록 수정.
조직도 리스트의 cdk-virture-scroll 위치값 리세팅하도록 수정.
2019-11-22 16:15:11 +09:00
khk
9cd463ccb7 버튼 수정 2019-11-22 15:49:39 +09:00
leejinho
4725140c11 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-22 15:19:55 +09:00
leejinho
c67dc1ca9c [21 전달된 메시지 바로 보여지지 않음] 대화방 선택 전달시 발생할 소지 있음 :: 비동기처리방식을 동기처리 방식으로 수정. 2019-11-22 15:19:47 +09:00
khk
a0a9d9868d 로그아웃, 환경설정 버튼 추가 2019-11-22 14:48:02 +09:00
leejinho
a0f0cd28a7 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-22 14:18:03 +09:00
leejinho
1be22492f2 [19 현재 대화방은 전달 기능 불가능] 현재 대화방도 전달 가능하도록 수정.
[30 대화 참여자 목록 프로필 정렬 오류] 프레즌스 정보가 없어도 공간 확보.
대화방 파일 expired 처리 수정.
2019-11-22 14:17:53 +09:00
khk
18b68e290e 개인정보영역 수정 2019-11-22 12:09:04 +09:00
khk
d0af7a78ca 뺏지 색상변경 2019-11-22 10:35:34 +09:00
khk
34ae7023ff 그룹멤버로 추가 - 레이아웃 수정 2019-11-22 10:22:23 +09:00
ae6bbd1ac5 ucap-clickable is added 2019-11-22 10:03:45 +09:00
b1517b7a2d Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-22 09:53:19 +09:00
9321688bc4 bug fixed 2019-11-22 09:53:11 +09:00
leejinho
729a95e1eb [이슈처리 5] MyTalk 에서 unread count 보이는 문제 수정. #2 2019-11-22 09:17:47 +09:00
leejinho
c7f6222c58 [이슈처리 6] 기본 그룹 삭제 오류 수정 2019-11-22 09:10:37 +09:00
leejinho
d90e93f0c6 [이슈처리 5] MyTalk 에서 unread count 보이는 문제 수정. 2019-11-22 09:03:32 +09:00
khk
447577aa1b setting-frame수정(미완) 2019-11-21 19:08:31 +09:00
44def4db5f Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 18:23:11 +09:00
2db59205e6 settings is modified 2019-11-21 18:23:05 +09:00
leejinho
ea1caa1498 대화방의 information type 에 대한 스타일 적용 2019-11-21 18:02:11 +09:00
leejinho
bd0a128723 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 17:43:28 +09:00
leejinho
b3ac86e4d6 1. 대화방 > 대화상대추가 :: 기존인원이 지워져도 데이터는 문제 없도록 수정. >>> 추후 기존인원을 뺄 수 없도록 수정해야 함.
2. 유저선택 팝업 > 그룹 선택시 그룹원 선택 되도록 수정 >>> 이벤트 꼬이는 문제가 있어 추후 해결해야함.
2019-11-21 17:43:20 +09:00
khk
3c63bc3d1b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 16:51:22 +09:00
khk
b43afc3ebb 앨범,파일함- 퍼펙트 스크롤 적용 2019-11-21 16:43:47 +09:00
7eec2a1c68 settings is added 2019-11-21 16:43:25 +09:00
leejinho
534e026742 1. 대화 전달 > 유저선택 팝업 > 대화리스트로 탭 이동시 user select chips 는 없어지는데 인원수가 안없어지는 문제 수정.
2. 조직도 > 유저 선택 > 그룹에 추가 > 그룹선택 팝업 :: 그룹명 옆에 그룹인원수 명시 >>>> 디자인 수정 필요.
2019-11-21 16:24:47 +09:00
leejinho
3e11d4e4a2 그룹 > 그룹 타이틀의 more 버튼 및 context menu 분기 처리. 2019-11-21 16:15:15 +09:00
leejinho
81397401b9 새그룹 추가시 빈그룹으로 생성할 수 있도록 수정,
그룹 생성시 confirm 하도록 수정.
2019-11-21 16:14:51 +09:00
leejinho
5fa57c7130 대화 삭제, 회수 시 confirm dialog 사이즈 조절 220px > 400px 2019-11-21 16:13:49 +09:00
leejinho
8ffde2ef54 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 15:35:13 +09:00
leejinho
d81141b3b5 오픈된 대화방의 파일 송수신시 파일함 정보 갱신하도록 수정. 2019-11-21 15:35:06 +09:00
6f52bd411c bug fixed 2019-11-21 15:32:18 +09:00
7d76bb7076 vertial tab is modified 2019-11-21 15:19:27 +09:00
c7b14abb6d Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 15:16:16 +09:00
khk
598818df37 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 15:12:02 +09:00
khk
2c464bcc52 말풍선 - 줄바꿈 2019-11-21 15:04:03 +09:00
leejinho
c59ef5eb49 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 15:01:47 +09:00
leejinho
834357a550 bugfix >> @대화방 타입별 context menu 분리처리. 2019-11-21 15:01:41 +09:00
4f08c831bd Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 15:00:56 +09:00
khk
6dee2b5824 말풍선- 줄바꿈 2019-11-21 15:00:19 +09:00
khk
f3c0a1d878 setting-frame 레이아웃 2019-11-21 14:54:25 +09:00
eb396972ee Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 14:52:16 +09:00
ae65d68f5b material design icons is added 2019-11-21 14:52:09 +09:00
leejinho
188b6e9823 그룹 > 펼쳐놓고 그룹멤버 수정시 접히면서 스크롤이 하단에 유지되는 문제.
> 수정 후 scroll top으로.
2019-11-21 14:51:00 +09:00
leejinho
a58423271d 조직도 > 프로필 팝업 오튼 기능 추가. 2019-11-21 14:10:15 +09:00
leejinho
e57a44fa5b 앨범함 preview defatul 이미지 분기처리. 2019-11-21 14:05:55 +09:00
leejinho
06ff83c0c3 대화방 타입별 context menu 분리처리. 2019-11-21 14:02:11 +09:00
leejinho
f162cf3353 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 11:46:56 +09:00
leejinho
b3c649c393 그룹 > 동료리스트 context menu > 이 그룹에서 삭제, 대화 상대, 대화 상대 이동 :: 기능 구현. 2019-11-21 11:46:49 +09:00
bd7d82aba5 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-21 10:30:48 +09:00
99f657988a settings is added 2019-11-21 10:29:19 +09:00
leejinho
7cd159efba 그룹 > 동료 context menu > 프로필 보기, 대화하기 기능 추가. 2019-11-21 09:07:25 +09:00
leejinho
2a7e37c3c4 bugfix 2019-11-21 09:06:37 +09:00
leejinho
f90bb4c674 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss
2019-11-20 18:06:42 +09:00
leejinho
3b1a077ef9 스티커 레이어 초안 작성. 2019-11-20 18:04:24 +09:00
khk
d1f1985742 대상 테마 수정 2019-11-20 17:31:08 +09:00
leejinho
47ff1d3e4a 기능추가 :: 프로필 > 즐겨찾기 등록/해제, 동료추가 / 삭제 2019-11-20 14:57:54 +09:00
leejinho
2f72ee7ae6 대화 입력창 max row 설정. 2019-11-20 11:02:14 +09:00
leejinho
8f81085251 1. anchor tag cursor styling.
2. anchor tag open url for sticker, mass-text and mass-text-detail
3. mass-detail view component added
2019-11-20 10:29:49 +09:00
leejinho
47dbd5d39a 대화방 > text 내 링크 연결. 2019-11-19 19:34:53 +09:00
leejinho
06a71351d3 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-19 19:16:03 +09:00
leejinho
79b099c7e4 대화방 > text 내 링크 포인트 분류 2019-11-19 19:15:56 +09:00
92129ef2d7 logout notification is modified 2019-11-19 19:03:58 +09:00
81c3cbe43a initialization of logout is modified 2019-11-19 18:43:49 +09:00
44e576fc72 native notifications are added 2019-11-19 16:44:50 +09:00
e46d3481b0 redo 2019-11-19 13:19:30 +09:00
leejinho
a58525874d Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-19 13:14:47 +09:00
leejinho
2dc7c0da57 유저선택 팝업 선택 안되는 버그 수정. 2019-11-19 13:14:38 +09:00
khk
8a7469cd5e right-drawer 수정중(임시) 2019-11-19 13:13:08 +09:00
165ff91337 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-19 12:05:09 +09:00
834494aa73 chat list 2019-11-19 12:05:03 +09:00
khk
122b6ddf05 테마 색상변경 2019-11-19 11:41:54 +09:00
leejinho
1edba79352 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-19 11:41:46 +09:00
leejinho
0ce3dac5a8 유저선택 팝업 scss 수정. 2019-11-19 11:41:39 +09:00
2f52cfe5ef bug of perfect scrollbar is fixed 2019-11-19 11:30:43 +09:00
khk
289f52be70 새그룹추가 레이아웃 2019-11-19 10:47:18 +09:00
leejinho
8c8a7b0133 1. 조직도 > 유저 선택 > 그룹에 추가 > 이후 전체 선택 부분 정상동작하지 않는 버그 수정.
2. 유저 선택 팝업 그룹 로직 변경에 따른 스타일 수정 부탁.
2019-11-19 09:21:45 +09:00
3fba7224ba ripple is added 2019-11-18 18:35:27 +09:00
5a7585fc68 ripple is added 2019-11-18 18:29:55 +09:00
f70bc5c46d header toggle 2019-11-18 18:25:46 +09:00
c6e05667fe status of user profile is modified 2019-11-18 18:06:38 +09:00
7aa5f4f227 bug of virtual scroll is fixed 2019-11-18 16:58:27 +09:00
59e4a500d0 bug of tray is fixed 2019-11-18 16:49:41 +09:00
686c859e74 expandAll & collapseAll is modified 2019-11-18 16:28:47 +09:00
7fa5fc76f3 bug of group tree is fixed 2019-11-18 16:11:09 +09:00
0d2a4a7db6 group tree is modified 2019-11-18 15:46:18 +09:00
khk
11013f1f32 그룹 수정 2019-11-18 15:02:47 +09:00
ae413a3843 electron packaging is added 2019-11-18 13:57:41 +09:00
7eda167067 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-18 09:41:53 +09:00
4dc92c0005 refactoring 2019-11-18 09:22:36 +09:00
khk
c5d336a297 스크롤 조정 2019-11-18 09:15:20 +09:00
leejinho
e6a7838dff Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-15 17:55:13 +09:00
leejinho
c5fb1df147 Alert and confirm 적용
alert :
1. 파일전송 확장자 오류.
2. 파일전송시 HTTP error
confirm:
1. 대화방 나가기 전.
ext:
1. 새그룹추가 팝업 : 그룹명 valid 에 의한 버튼 활성화 비활성화 여부.
2019-11-15 17:55:05 +09:00
314dc75c96 change from expansion panel to tree 2019-11-15 17:32:48 +09:00
21e6e2d621 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-15 13:20:11 +09:00
50f24b8b47 tab content is modified 2019-11-15 13:20:01 +09:00
leejinho
6305855bfa bugfix :: 조직도 부서 클릭시 조회 안되던 문제 수정. 2019-11-15 11:43:24 +09:00
7c0f212b8a perfect-scrollbar is applied 2019-11-15 11:28:44 +09:00
aba846cce7 set default value is modified 2019-11-15 11:21:42 +09:00
leejinho
c9070ecc96 layout 정리 2019-11-15 10:49:41 +09:00
5f5269c15b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-15 10:13:38 +09:00
50c8c2a02d virtual scroll of organization is implemented 2019-11-15 10:13:18 +09:00
leejinho
e32c994d2a 쪽지 > 리스트 초기 데이터 수집 및 리스팅 2019-11-14 17:43:45 +09:00
leejinho
9ec163bac6 로그인 페이지 로그인 실패시 Alert 처리. 2019-11-14 14:19:59 +09:00
leejinho
6550c419a1 쪽지 interface 수정.
// JSON 객체를 raw body 에 실어보내는 로직으로 구현.
2019-11-14 13:30:28 +09:00
leejinho
08331aadc0 쪽지 protocol added 2019-11-14 10:31:23 +09:00
leejinho
0fb8a56a90 파일함 테이블 레이아웃 변경 2019-11-14 08:30:59 +09:00
khk
01b59d9bfb Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-13 18:36:26 +09:00
khk
fea937cd12 프로필&뷰어 수정 2019-11-13 17:46:25 +09:00
241fd65d31 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-13 16:30:21 +09:00
9b4e8ff35c bug fixed for ie11 2019-11-13 16:30:15 +09:00
khk
ae1b3503d3 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-13 15:44:46 +09:00
leejinho
2c41c49cdb Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-13 15:42:56 +09:00
leejinho
330ef27693 message-api basic templete add 2019-11-13 15:42:30 +09:00
568ff48268 progress bar of file down is modified 2019-11-13 15:28:33 +09:00
khk
c7dca90e10 tree 디자인 변경 2019-11-13 14:48:27 +09:00
a33ee7c2ff api message project is added 2019-11-13 13:55:28 +09:00
457c22390c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-13 11:48:48 +09:00
d5aae2d958 support of ie11 is added 2019-11-13 11:48:39 +09:00
leejinho
5eddb7d793 right drawer 에 title, close button 추가. 2019-11-13 11:06:13 +09:00
leejinho
88f103610a split 기능 추가. 2019-11-13 10:45:06 +09:00
leejinho
f5d6d663c1 favicon 변경,
그룹 > 즐겨찾기 인원수 스타일 적용.
2019-11-13 09:13:12 +09:00
09148e04bb Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-12 18:54:30 +09:00
e9b444e64b preparement of deploy 2019-11-12 18:54:21 +09:00
leejinho
3227747a8d 대화방 참여자 목록 보기 기능 구현. 2019-11-12 18:10:38 +09:00
leejinho
2f684ffdb2 파일함 / 앨범함 레이아웃 정리 2019-11-12 17:10:11 +09:00
leejinho
0a84625468 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-12 14:08:23 +09:00
leejinho
e15d8c592e 파일함 정리 / 앨범함 데이터 연동. 2019-11-12 14:08:14 +09:00
1d282b59cb open room of notification is implemented 2019-11-12 10:38:51 +09:00
leejinho
8fec0e15f2 조직도 타이틀, 검색 기능 구현. 2019-11-12 09:47:56 +09:00
e994e8d092 icon of notification is added 2019-11-11 18:23:30 +09:00
20ce90e1fa Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-11 18:09:55 +09:00
d529a3b4a0 browser notification is implemented 2019-11-11 18:09:47 +09:00
leejinho
0615a7bde0 bugfix :: 방을 열고 > 닫았을 경우 unreadcount 쌓이지 않는 문제 수정. 2019-11-11 16:23:06 +09:00
fe1ebca2b5 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-11 15:53:47 +09:00
20c49b7cdd refactoring 2019-11-11 15:53:39 +09:00
leejinho
57d3b2e828 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-11 14:31:47 +09:00
leejinho
c6dcdc6f45 파일함, 앨범함 데이터 수집 및 drawer 기초작업 2019-11-11 14:31:26 +09:00
khk
89d4f8010a Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-11 12:24:27 +09:00
khk
b93d78b02e video-viewer 디자인적용 2019-11-11 11:42:08 +09:00
leejinho
b43d7dd5ff 대화방 > 그룹멤버로추가 :: 기능구현 2019-11-11 10:53:24 +09:00
3fc5fa254a Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-09 17:36:03 +09:00
d35227ff3d electron notification is implemented 2019-11-09 17:29:02 +09:00
c40bd2484d refactoring 2019-11-09 13:35:24 +09:00
khk
b5f3773c98 이미지뷰어 아이콘 수정 2019-11-08 16:02:42 +09:00
leejh
d71100f66f user profile / added prototype 2019-11-08 13:35:39 +09:00
leejh
75627e0a16 image viewer style modify 2019-11-08 10:58:45 +09:00
khk
f747490a7c design 변경 2019-11-08 08:58:22 +09:00
leejh
2e83971c18 > video file upload thumbnail image resize.
> extention tolowercase
> video type message-box layout modify
2019-11-08 08:41:41 +09:00
9417b757da file download is added 2019-11-07 18:28:13 +09:00
a7dbb1f545 thumbnail of video is added 2019-11-07 18:17:25 +09:00
85dafe6922 thumbnail is added 2019-11-07 18:08:00 +09:00
77ceeb84f7 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-07 17:33:17 +09:00
74c3619ff7 virtual scroll is added 2019-11-07 17:33:03 +09:00
leejh
fda2a21fd6 video 타입 message box 화면 처리. 2019-11-07 17:27:42 +09:00
leejh
b6aad4ddc9 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-07 16:56:35 +09:00
leejh
731a9f74a0 IDLE 체크로 부재중 <> 온라인 상태 변경 로직 추가.(only electron) 2019-11-07 16:56:14 +09:00
b077b91dde binary viewer is added 2019-11-07 15:59:50 +09:00
8066acc2bd audio & video viewer are added 2019-11-07 15:46:02 +09:00
7d612ff208 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-07 13:48:40 +09:00
6297a0b2c3 refactoring 2019-11-07 13:48:25 +09:00
leejh
d8581a70fe Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-07 13:16:18 +09:00
leejh
b42b007609 보안코드 삽입 2019-11-07 13:16:09 +09:00
leejh
0362bc427c 대화방 > 스크롤 관련 로직 수정.
>> 스크롤 중 최근대화 유입시 스크롤 처리. 및 snackbar 로 유입대화 보기기능 추가.
2019-11-07 13:14:44 +09:00
bb4cdfab26 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-07 11:37:53 +09:00
88e715eb60 file download is implemented 2019-11-07 11:37:33 +09:00
leejh
43a4ee05dc Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-06 19:11:18 +09:00
leejh
56892c18c5 bugfix :: 스크롤로 이전대화 보기 기능 구현.
> perfect scroll 에서 초기 init 시 psYReachStart 이벤트가 무조건 발생하여 이전대화 더보기를 강제 수행하던 버그를 수정.
> 스크롤 UP 에 연속한 reachStart 이벤트 발생시에만 이전대화 보기 기능을 수행하도록 수정.
> 방정보가 바뀌면 해당 정보를 구분하는 구분자들을 초기화 함.
2019-11-06 19:11:08 +09:00
958295a8c1 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-06 18:19:51 +09:00
37cce9bfce download is added 2019-11-06 18:19:37 +09:00
leejh
e59eb90613 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-06 17:35:41 +09:00
leejh
1dc65479e1 채팅방 설정 수정
> 채팅입력창 enable 관련 처리.
> 봇방 방제목 처리.
2019-11-06 17:32:27 +09:00
d40523a674 image viewer is implemented 2019-11-06 17:25:59 +09:00
922140bad1 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-06 16:25:10 +09:00
ebd6b07b15 type of userSeq is changed from string to number 2019-11-06 16:24:51 +09:00
leejh
bca6a54a24 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-06 14:06:39 +09:00
leejh
ee1938799e [[중요중요!!!]]
Issue : 방이름 전체 변경시 같은 requestId 를 가지고 SSVC_TYPE_ROOM_UPD_REQ (10/31) 요청시 RES(10/32) 도착 전에 EVENT_SEND_RES (20/12) 가 먼저 도착함.
service Id 와 sub service id 를 같이 체크하면 좋지만 우선 service ID 를 같이 체크하는 로직을 넣어두고, 서버에서 순서를 바꿔줄 수 없는지 요청해 봄.

궁극적으로는 내가 요청한 건에 대한 응답 프로토콜에만 requestID 를 실어 보내줘야 하고, noti 나 noti 성격의 res 에는 request id 를 달아 보내주면 안됨.
더 궁극적으로는 noti 는 noti 로,, noti 성격의 res 를 noti 로 보낼 수 있도록 서버가 수정되어 줘야 함.
2019-11-06 14:06:25 +09:00
leejh
1e2b58534c 기능추가 :: 대화방 설정 / 방이름 변경 || 타이머 대화방 설정 2019-11-06 13:58:56 +09:00
bc38d47c14 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-06 13:48:20 +09:00
820e4b8675 event json is refactored 2019-11-06 13:48:06 +09:00
dda8d41325 scss is refactored 2019-11-06 13:47:46 +09:00
leejh
55df25742b 대화리스트 PS 레이아웃 정리. 2019-11-05 18:12:31 +09:00
877b02bc31 extensions are added 2019-11-05 15:00:50 +09:00
bf9c7f80bf bug fixed 2019-11-05 14:55:17 +09:00
f382696838 bug fixed 2019-11-05 14:11:08 +09:00
fd4561f965 merged 2019-11-05 13:49:14 +09:00
086a4556f8 file upload is implemented 2019-11-05 13:46:17 +09:00
5b9fa9f55c names are changed 2019-11-05 13:45:30 +09:00
8da169a144 FileUploadItem is added 2019-11-05 13:40:01 +09:00
a4ee7cc83e encodeFormData is added 2019-11-05 13:39:28 +09:00
1f1baf74b0 FormData encoder is added 2019-11-05 13:37:51 +09:00
leejh
437209bf7f FAB 기능 추가 :: 대 메뉴 선택에 따른 처리. 2019-11-04 17:52:47 +09:00
leejh
bceade2261 레이아웃 정리 2019-11-04 13:09:58 +09:00
leejh
c7a7f6ca23 기능추기 :: 대화 상대 추가 2019-11-04 11:36:58 +09:00
leejh
610ca140a6 bug fix :: 조직도 > 부서원 리스트의 전체선택 :: 부서원이 없는 부서 선택시 전체선택되는 문제 수정. 2019-11-04 11:35:52 +09:00
leejh
d323168b4f Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-01 17:43:17 +09:00
khk
4ba74c0cab 대화 내용 단어로 줄바꿈 2019-11-01 17:33:14 +09:00
khk
ddd64c4e59 대화내용 줄바꿈 2019-11-01 16:44:28 +09:00
leejh
6d4b933d62 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-01 15:54:03 +09:00
leejh
89a1f90065 대화상대추가 팝업연결 2019-11-01 15:53:54 +09:00
fe3f8d838c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-11-01 15:06:45 +09:00
654a8475fe bug of scroll is fixed 2019-11-01 15:06:37 +09:00
bb1c74823d merged 2019-11-01 15:06:20 +09:00
khk
616ac1f84c 대화회수 디자인적용 2019-11-01 14:52:53 +09:00
leejh
bf9bcd967b Timer 대화방의 대화 자동 삭제 기능 추가. 2019-11-01 13:43:49 +09:00
eb413ea932 mime information is added 2019-11-01 13:43:29 +09:00
772d038d22 config of acceptable file extension is added 2019-11-01 13:43:03 +09:00
0f4c612de5 alias of ui scss is modified 2019-11-01 13:42:08 +09:00
khk
86ee7dd515 대화방 header수정 2019-11-01 13:03:57 +09:00
leejh
9aff7114f8 Notification 사전작업 2019-11-01 11:25:54 +09:00
leejh
5c7ac7f199 bugfix 2019-11-01 09:46:32 +09:00
leejh
057a5e8705 bugfix 2019-11-01 09:06:52 +09:00
khk
35a3292ddb 디자인 레이아웃 변경 2019-10-31 19:17:29 +09:00
leejh
2d20686a8c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-core/src/lib/types/maximum-range.type.ts
#	projects/ucap-webmessenger-core/src/public-api.ts
2019-10-31 18:32:08 +09:00
fdba1d11a6 bug fixed 2019-10-31 18:22:43 +09:00
77702b99b2 refactoring 2019-10-31 18:22:28 +09:00
leejh
667e5ea5cc Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-31 18:14:53 +09:00
leejh
749237b1bc 대화방 > 이전 대화 보기 기능 구현. infinity scroll 2019-10-31 18:12:38 +09:00
9853438691 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-31 17:09:47 +09:00
15121bceff file upload is modified 2019-10-31 17:09:38 +09:00
89ab43892d file icon font is added 2019-10-31 17:09:18 +09:00
leejh
4b4f8a0067 bugfix
방나가기(Room Exit) 시에 state 에서 roominfo 만 삭제되던것 roomUserInfos 도 샂게 하도록 수정.
해당 부분이 방 재 오픈시 유저 기준 검색하는 부분에서 에러를 발생하여 조치함.
2019-10-31 15:33:56 +09:00
leejh
dda31b2e7f timer room 개설시 대화방명 오류 수정. 2019-10-31 15:23:56 +09:00
leejh
4bfb41adf0 timer room 기능 추가. 2019-10-31 15:05:59 +09:00
leejh
9d0f6bdd8a tree 에 loginRes 객체 주입 > 내 부서 열어주기 위한 전처리. 2019-10-31 11:58:39 +09:00
leejh
fa214fc01d bugfix
현재 대화방이 열려 있지 않았을때 readNotification 이 유입되었을 경우 state.roomInfo.roomSeq 가 null exception 되는 문제 수정.
2019-10-31 11:57:40 +09:00
leejh
069d39aa8f Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-31 10:26:55 +09:00
leejh
239404257c FAB 툴팁 기능 추가 및 새 대화 팝업 연동. 2019-10-31 10:26:47 +09:00
749afe9942 default expand of tree is added 2019-10-31 10:13:30 +09:00
leejh
a5d79b34fa warnnng 제거. 2019-10-31 09:47:50 +09:00
leejh
36a983a6fd FAB common component add 2019-10-30 18:18:35 +09:00
leejh
33e6566eff unread count 관련 처리. 2019-10-30 16:22:49 +09:00
leejh
d099bcb035 bug fix
1. 대화창 > 빈값으로 대화 입력시 alert
2. 대화방 > 대화 > 대화전달 팝업 :: 대화방 리스트 안나오는 문제 수정.
2019-10-30 11:12:45 +09:00
khk
9d2e92b31a 레이아웃 scss반영 2019-10-29 19:06:25 +09:00
9a13fbde18 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-29 18:19:51 +09:00
5d44c1d2f1 image viewer and file upload are modified 2019-10-29 18:19:41 +09:00
f75bd7c2bb progress-bar is added 2019-10-29 18:18:16 +09:00
feb398b6d9 file upload is added 2019-10-29 18:17:48 +09:00
a880e89ba4 progress of file upload is added 2019-10-29 18:17:16 +09:00
9ae1ed25c4 encoder and decoder are added 2019-10-29 18:16:51 +09:00
eef36fcb44 extra parameter is added 2019-10-29 18:16:19 +09:00
leejh
61fd8c00d7 음성파일 처리 및 expired 처리. 2019-10-29 18:11:31 +09:00
leejh
0bd29af831 파일 타입 추가. 2019-10-29 17:26:44 +09:00
leejh
566109eadf 조직도 부서원 전체선택 기능 추가. 2019-10-29 17:07:45 +09:00
e516d4b756 optional urls are added 2019-10-29 16:53:25 +09:00
leejh
fb94b5480a 다른디바이스와의 Sync 처리. ::: 동료 / 그룹 2019-10-29 15:29:26 +09:00
93eb386825 sort of event list is added 2019-10-29 14:11:01 +09:00
6ff7a3acda Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-29 13:45:28 +09:00
e50531f22b scrollbar of html is removed 2019-10-29 13:45:20 +09:00
leejh
25c502b877 bugfix : 대화리스트 검색 오류 수정. 2019-10-29 12:23:40 +09:00
22605ae51e perfect scrollbar of messeages is added 2019-10-29 11:39:34 +09:00
43d96eb477 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-29 11:07:13 +09:00
e177cf5184 autocomplete of room search is added 2019-10-29 11:07:03 +09:00
leejh
72a6b5b931 다른디바이스와의 Sync 처리. ::: ROOM_UPT_RES 2019-10-29 10:46:55 +09:00
leejh
7d6ebad5d5 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-29 10:10:16 +09:00
leejh
eb0f86578d 1. 다른디바이스와의 Sync 처리. ::: EVENT_RES, EVENT_READ_RES
2. 대화리스트의 finalEventMessage 갱신되지 않는 문제 수정 :: virture scroll 처리 제거.
2019-10-29 10:10:08 +09:00
2e63f25685 floating label of search room is disabled 2019-10-29 09:47:48 +09:00
c1f1d6f012 layout is modified 2019-10-29 09:28:43 +09:00
49e9704bfb layout is modified 2019-10-29 09:21:54 +09:00
337c7b9030 merged 2019-10-29 09:18:46 +09:00
98fe3085be image viewer added 2019-10-29 09:07:06 +09:00
98ec608779 logo added 2019-10-29 09:06:19 +09:00
leejh
266f690ea3 미사용 component 삭제 2019-10-29 08:58:00 +09:00
leejh
fcba726a2f MASS TEXT 전달 수신 기능 추가. 2019-10-28 18:03:27 +09:00
a7218ebcef style is modified 2019-10-28 16:45:07 +09:00
leejh
3df2d535eb source refactoring 2019-10-28 11:15:38 +09:00
leejh
e56b3a8c4d virture scroll 기능 추가. 2019-10-28 11:15:20 +09:00
leejh
451c013421 기능추가 :: 대화 나에게 전달 2019-10-25 17:51:33 +09:00
9d185862ac merged 2019-10-25 15:58:30 +09:00
e42a698df5 backdrop of context menu is removed 2019-10-25 15:56:03 +09:00
leejh
27342890db bugfix 2019-10-25 15:36:29 +09:00
leejh
d746aece70 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-ui/src/lib/ucap-ui.module.ts
2019-10-25 13:40:32 +09:00
leejh
68dd36214c 말풍선 내 줄바꿈 문자 처리.
대화리스트 finaleventDate 처리.
2019-10-25 13:16:45 +09:00
c3fc458b0c replace from ImageComponent to ImageDirective 2019-10-25 13:04:21 +09:00
1f60c57239 bug fixed 2019-10-25 10:09:16 +09:00
940c28218d Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-25 09:46:32 +09:00
9639099549 bug fix 2019-10-25 09:46:14 +09:00
bf2e4e3c86 angular ivy 2019-10-25 09:46:05 +09:00
leejh
c52cda0e46 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-24 17:05:30 +09:00
leejh
7f32caa01f 기능추가 :: 대화방 > 대화전달 2019-10-24 17:04:58 +09:00
leejh
14ab59459f 기능추가 ::
1. 방닫기 기능추가
2. 방나가기 시 현재 열려 있는 방 닫아주는 기능 추가.
2019-10-24 16:53:21 +09:00
leejh
e7bbdeb105 bug fix :: 기존방에 새 EVENT_SEND_NOTI 가 발생시 방리스트 정보에 finalEventMessage 를 갱신해 주는데 json 형식의 데이터 노출되는 문제 수정.
/// 입장 , 퇴장 정보에 대한 처리가 필요할 수도 있다.
2019-10-24 16:51:30 +09:00
b22eb5c747 directives are changed 2019-10-24 16:30:28 +09:00
b4503d7309 li to button 2019-10-24 16:28:19 +09:00
e2b3c8c7d3 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-24 15:37:45 +09:00
057257cc45 version of packages are updated, title bar of electron is added 2019-10-24 15:37:33 +09:00
leejh
bb527dcb65 bug fix :: 대화방 읽음 처리 버그 수정. 2019-10-24 10:51:50 +09:00
leejh
f5a4039bbf Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-24 10:45:35 +09:00
leejh
45892b4991 기능구현 :: 대화방 > 대화 회수, 삭제 2019-10-24 10:45:28 +09:00
leejh
9df7e98778 message-box 디자인 수정 :: 회수 메시지 2019-10-24 10:43:09 +09:00
khk
ed1296354e class변경 2019-10-24 10:16:08 +09:00
khk
a341f6df73 테마, 컴포넌트 분리 2019-10-24 10:07:30 +09:00
leejh
69ab6e5d3b bug fix :: 대화방 알림 토글시 방제목이 없을 경우 서버에서 방번호로 입력하도록 되어 있는 버그
>> 우회하기 위해 방제목이 없을 경우 blank 하나 넣어서 전송하도록 수정.
2019-10-23 17:26:04 +09:00
leejh
72c704e9af 기능 추가 :: 대화 > 대화목록 :: context menu 기능 추가 및 기능 구현.
1. 대화방 열기,
2. 대화방 알림 토들
3. 대화방 나가기.
2019-10-23 17:03:34 +09:00
leejh
7e5bc54be1 기능추가 :: 대화 > 검색기능 2019-10-23 15:45:48 +09:00
leejh
8b55d904d6 기능추가 :: 그룹 > 검색 2019-10-23 15:07:41 +09:00
leejh
d7a6eb66ed 기능추가 :: 조직도 > 그룹에 추가 :: 그룹선택 팝업 및 그룹에 추가 하는 로직 구성. 2019-10-23 13:18:38 +09:00
leejh
914d62d48b 기능추가 :: 조직도 > 하단버튼 > 대화 :: 대화개설 기능 ㅊ구ㅏ. 2019-10-22 17:49:18 +09:00
leejh
3d219837bd 기능추가 :: 조직도 > 부서 선택 :: 부서원 조회 시 프로그레스 추가.
수정 :: 유저선택 팝업 > 선택된 유저 met-chips 로 변경.
수정 :: sync_group2 수행시 syncDate 에 ' ' blank 하나 주는것으로 처리 :: 서버에서 해당 부분 파싱 불가.
2019-10-22 17:05:29 +09:00
leejh
7ff8edb4a7 수정 :: 그룹 > 내프로필 :: context menu 옵션처리. 2019-10-22 09:53:16 +09:00
leejh
5c8c7bbc59 기능추가 :: 그룹 > 내프로필 :: 표현 및 mytalk 개설 기능 추가. 2019-10-22 09:47:14 +09:00
leejh
d2a2115f33 기능추가 :: 대화방 > 대화방명 데이터 매핑. 2019-10-22 09:30:23 +09:00
leejh
29ec8492ae bugfix 2019-10-21 18:10:39 +09:00
leejh
bf6a5c3669 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-21 17:23:09 +09:00
leejh
768144ed53 기능추가 :: 그룹 > 그룹원 > context Menu > 즐겨찾기 등록/해제 2019-10-21 17:23:02 +09:00
2b1630ffb3 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-21 16:59:43 +09:00
41ebda97df display mode of accordion is changed 2019-10-21 16:59:35 +09:00
leejh
93ccbb518b 기능추가 :: 그룹명 변경 2019-10-21 16:32:22 +09:00
leejh
bd0b8561e5 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-21 16:11:39 +09:00
leejh
44bf93c54b 기능추가 :: 그룹 삭제 2019-10-21 16:11:33 +09:00
ea66ebf88c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-21 15:35:22 +09:00
c323672241 size of locations is modified 2019-10-21 15:35:14 +09:00
leejh
925c63f37d Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-21 15:05:00 +09:00
leejh
13a6f53919 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-side.component.html
2019-10-21 15:04:37 +09:00
c789c02e89 bug fixed 2019-10-21 15:04:10 +09:00
leejh
27b9bb599a 수정 :: 대화 > 대화리스트에 프로필 사진 적용. 2019-10-21 15:03:27 +09:00
932af0d271 ui scss is added 2019-10-21 14:44:26 +09:00
751047b38a bug fixed 2019-10-21 13:52:01 +09:00
af18ab5c21 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-21 13:41:39 +09:00
leejh
22431e598c bug fix scss 2019-10-21 13:39:36 +09:00
5b3a5fdb28 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-21 13:37:10 +09:00
1147fe830d file upload zone is added 2019-10-21 13:36:58 +09:00
leejh
8b42d74c8c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-21 13:21:09 +09:00
khk
f19adf082a 디자인 수정. 2019-10-21 13:20:14 +09:00
leejh
3f1a99bf28 기능 추가 :: 그룹 멤버 변경 2019-10-21 13:10:19 +09:00
leejh
f3f8059564 기능 추가 :: 새그룹 추가 로직 구현. 2019-10-18 16:48:53 +09:00
leejh
46753d2f67 bug fix :: 동료그룹 >
1. 그룹 isActive 값 여부에 따라 수집.
2. 동료 isBuddy, isActive 값 여부에 따라 수집.
2019-10-18 16:48:30 +09:00
leejh
d8d58e3bd7 bug fix :: 대화방 리스트에 갖고 있지 않은 새 대화방의 대화가 유입 시 unReadCount 수집에 발생하는 에러 수정. 2019-10-18 13:34:24 +09:00
leejh
7b67d21ff3 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-18 13:02:51 +09:00
leejh
2f214e1ef2 수정 :: 유저 선택 팝업 :: 새그룹추가 화면 구성. 2019-10-18 13:02:43 +09:00
ca21e6a5c0 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-18 12:49:31 +09:00
5d2be25885 bug fixed 2019-10-18 12:49:23 +09:00
leejh
36ea177786 수정 :: 유저 선택 팝업 :: 팝업 타입 정의 및 기 선택 유저리스트에서 선택 취소기능 추가. 2019-10-18 09:48:38 +09:00
a16940b3f2 bug fixed 2019-10-18 09:32:09 +09:00
076fa6931f image loading is modified 2019-10-18 09:12:19 +09:00
d488edd0a4 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-17 18:11:46 +09:00
58ac1ad4b9 image component is added 2019-10-17 18:11:38 +09:00
leejh
3b71bd936d 수정 :: 새로운 대화 개설용 유저 선택 팝업 > 유저선택 후 확인 버튼 > 대화방 개설 2019-10-17 18:05:44 +09:00
leejh
96f07a071c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-17 17:02:28 +09:00
leejh
687b49816a 수정 :: 새로운 대화 개설용 유저 선택 팝업 > 유저선택 항목 탭간 서로 공유 2019-10-17 17:02:20 +09:00
a6450fba84 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-17 16:57:46 +09:00
7ab38da3cb image loading is modified 2019-10-17 16:57:37 +09:00
leejh
d29ca388bf 수정 :: 새로운 대화 개설용 유저 선택 팝업 > 유저선택 처리 2019-10-17 15:07:39 +09:00
leejh
99d7440c25 기능추가 :: 대화 > unread Count Badge 처리. 2019-10-17 15:06:38 +09:00
leejh
6f5a4bfc99 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-17 11:49:48 +09:00
leejh
c827a9cde3 수정 :: 새로운 대화 개설용 유저 선택 팝업 > 유저선택 이벤트 등록 2019-10-17 11:49:41 +09:00
a342dda830 badge is added 2019-10-17 11:06:02 +09:00
94dcd79055 dialogs of app are refactored 2019-10-17 09:18:55 +09:00
00abdb4cd7 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-16 18:05:26 +09:00
43afb43b0e Copy message is implemented 2019-10-16 18:05:18 +09:00
leejh
ac196f5053 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/index.ts
2019-10-16 17:50:15 +09:00
leejh
18fbfa72bd 기능추가 :: 새로운 대화 개설용 유저 선택 팝업 2019-10-16 17:46:53 +09:00
0c1ae7ec64 contextMenu of messages is modified 2019-10-16 16:33:19 +09:00
0dd36a92db buddy click is modified 2019-10-16 15:44:16 +09:00
2d6d4adb35 Dialogs are added 2019-10-16 15:36:18 +09:00
659b45610e Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-16 15:06:31 +09:00
a4c572f5e7 loading type is changed 2019-10-16 15:06:22 +09:00
leejh
dcb452f375 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-16 15:03:51 +09:00
leejh
fe8b038466 수정 :: 대화방 > event > context menu > 대회 회수 :: 버튼 표출 조건 수정. 2019-10-16 15:03:27 +09:00
230e824003 merged 2019-10-16 15:01:16 +09:00
2764d5f995 register group is added 2019-10-16 14:53:53 +09:00
leejh
ac87fcf9c7 추가 :: 대화방 오픈시 EVENT_READ_REQ 수행. 2019-10-16 14:52:31 +09:00
leejh
e4fd26f0b6 bug fix 2019-10-16 14:51:33 +09:00
leejh
5982cdae69 bugfix 2019-10-16 10:54:06 +09:00
leejh
73eea5e240 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-16 10:22:46 +09:00
leejh
c7a79425ef 수정 :: 대화 > 리스트 :: finalEventMessage 의 처리 수정. JSON > text 2019-10-16 10:22:05 +09:00
leejh
c437e846fb 수정(기능추가) :: 상대방이 대화 회수 시 대화 > 리스트의 방정보 갱신(finalEventMessage) 2019-10-16 10:21:26 +09:00
c651b5773b refactoring 2019-10-16 10:20:49 +09:00
c90656aabb Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-16 10:10:34 +09:00
f87a456b48 refactoring 2019-10-16 10:10:20 +09:00
leejh
a679f4b2b9 수정 :: 대화 > 리스트의 finalEventMessage 처리 2019-10-16 09:01:03 +09:00
leejh
7ec9d2356b 수정 :: event info state 를 entity 처리 하도록 수정.
기능 구현 :: 대화 회수시 현재 대화방의 event 회수 처리 할 수 있도록 수정.
2019-10-15 19:09:26 +09:00
43f937e74c bug fixed 2019-10-15 18:28:01 +09:00
ac8acc2b5c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-15 18:20:58 +09:00
291eb4538c bug of context menu is fixed 2019-10-15 18:20:50 +09:00
leejh
8b1130ca2c template bugfix 2019-10-15 17:32:59 +09:00
leejh
21c9bd0ae2 수정 :: KEY_VER_INFO 에 대한 미진한 부분 처리. 2019-10-15 16:59:05 +09:00
fc770168c7 context menu is modified 2019-10-15 16:39:58 +09:00
48088d71d7 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-15 15:02:08 +09:00
04fc05c9e4 context menu of EventType.Character is added 2019-10-15 15:02:00 +09:00
leejh
db722df333 수정 :: KEY_VER_INFO 의 SessionStorage 정보를 ui component 에서 참조하던것을 상위 컴포넌트에서 주입하는 방식으로 수정. 2019-10-15 14:58:11 +09:00
leejh
25449965a1 수정 :: Sync room 시 entity 의 정보 upsert 하도록 수정. for 새로운 방정보를 sync 를 통해서 수집할 경우 초기화 갱신되는 문제 수정.
수정 :: Sybc room 시 isJoinRoom 정보로 내가 참여중인 대화방만 수집하여 정보를 구성하도록 수정.
2019-10-15 14:40:44 +09:00
a6b5ac05aa refactoring 2019-10-15 13:54:58 +09:00
af34a3485d bug fixed 2019-10-15 13:16:39 +09:00
17740d789c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-15 11:51:07 +09:00
dd88e30c17 munu of group is added 2019-10-15 11:50:59 +09:00
leejh
87ff39f11c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-15 11:50:33 +09:00
leejh
6a852b4a1a 1. 타이머대화방 정보알림 처리.
2. 정보성 데이터 분리 처리.
3. 대화 회수 처리.
2019-10-15 11:50:23 +09:00
d0c9efaa76 variable name is changed 2019-10-15 11:09:31 +09:00
3b8b2b2ced Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-15 11:07:36 +09:00
19dea1bca8 contextMenu of profile is added 2019-10-15 11:07:26 +09:00
leejh
a986b3a370 로그인 페이지 //
remember Me 값에 따라 기본값 세팅 처리.
2019-10-15 09:31:33 +09:00
leejh
142631428a template add for attach-file 2019-10-14 17:28:43 +09:00
leejh
b6cb119a94 bugfix chat event sendDate express 2019-10-14 17:19:53 +09:00
leejh
da0ba9acbd modify message-box :: date-splitter 2019-10-14 17:19:13 +09:00
leejh
601e0861a8 bugfix event info data :: seq : string > number 2019-10-14 17:10:29 +09:00
leejh
d1e5c366b0 modify message-box Sticker 2019-10-14 15:34:00 +09:00
leejh
b2e1933470 modify message-box in Information by JOIN, EXIT 2019-10-14 15:33:21 +09:00
leejh
3ab5edbe53 source refactoring 2019-10-14 13:53:44 +09:00
leejh
b4823bfd9c modify message-box for file, attach-file, image, video 2019-10-14 13:53:22 +09:00
leejh
c270e40621 modify presence class in user-list-item.component 2019-10-14 10:31:28 +09:00
leejh
6aa2602dd0 add Mass talk detail View 2019-10-14 09:50:48 +09:00
57957cc164 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-11 18:25:06 +09:00
65fa631bfa presence is implemented 2019-10-11 18:24:57 +09:00
leejh
ed7e472464 unused code delete 2019-10-11 18:18:58 +09:00
leejh
eebb910b83 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
#	projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
#	projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
2019-10-11 18:10:25 +09:00
leejh
5ccb2b41b5 mass text component modify 2019-10-11 18:03:01 +09:00
leejh
06ffd4e213 bug fix 2019-10-11 18:02:27 +09:00
leejh
b49a8313a9 save LOGIN_RES info in sessionstorage 2019-10-11 18:01:39 +09:00
fee7aa70b0 content projection is applied 2019-10-11 17:52:00 +09:00
e9088572d5 notification of status is implemented 2019-10-11 16:40:55 +09:00
9b0106a4be receive alarm is implemented 2019-10-11 15:55:27 +09:00
37691a565f effects of notification are added 2019-10-11 14:01:43 +09:00
f4f986944b bug fixed 2019-10-11 13:17:52 +09:00
eb93a1743a state initializing after logout 2019-10-11 13:11:48 +09:00
78b9fbdd4b merge 2019-10-11 12:58:41 +09:00
bdfddc079e migration from plain state to ngrx entity 2019-10-11 11:58:03 +09:00
leejh
be0e24b922 modify chat message component / TEXT
modify userinfo in chat event list
2019-10-11 11:40:35 +09:00
leejh
55d593904b save sessionstorage for verinfo2 response data 2019-10-11 11:39:19 +09:00
leejh
5dd24638c8 ucap-profile-user-list-item > intro 옵션처리. 2019-10-10 18:39:04 +09:00
leejh
a8375e977b 조직도 > 부서원 ucap-profile-user-item-list 컴포넌트 적용.
맨 처음 내 부서원 선택되도록 설정.
2019-10-10 18:38:36 +09:00
leejh
9c21041c42 그룹 > 즐겨찾기 영역 생성 2019-10-10 18:35:23 +09:00
6fa6717c13 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 15:53:16 +09:00
5cdb2b18d1 scroll to bottom of message box is implemented 2019-10-10 15:53:08 +09:00
leejh
c098e88cc9 add chat room UI,
modify ucap-profile-user-list-item,
add group-expension-panel in ucap-profile-user-list-item.
2019-10-10 15:50:50 +09:00
d6f32316ee Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 15:44:49 +09:00
df1d9bea28 event message sync is modified 2019-10-10 15:44:39 +09:00
khk
b59e67ed42 buddy list modify 2019-10-10 15:37:18 +09:00
150ebd56af finalEventDate is added 2019-10-10 15:02:56 +09:00
fdf1c14b7e chat list is modified 2019-10-10 14:50:58 +09:00
0703e2807a message event is modified 2019-10-10 13:35:32 +09:00
e644979645 decoders are modified 2019-10-10 12:14:01 +09:00
59873ace7b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 10:57:35 +09:00
2da9eea06b module import 2019-10-10 10:57:24 +09:00
khk
2c1f4b1e0d Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 10:54:34 +09:00
2296b386b6 export bug fixed 2019-10-10 10:53:42 +09:00
khk
eabc97a6d2 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 10:53:38 +09:00
khk
b424c07bd4 git test1 2019-10-10 10:52:49 +09:00
69646500b2 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 10:43:18 +09:00
817efad9df Notification is implemented 2019-10-10 10:43:06 +09:00
khk
b32480d8ef git test 2019-10-10 10:40:11 +09:00
김남중
f363d23242 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html
#	projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
2019-10-10 10:33:26 +09:00
김남중
eb6b543b39 user list designed 2019-10-10 10:03:25 +09:00
fad0787266 sidenav of messenger is added 2019-10-08 18:12:58 +09:00
08c5d2825a group search is implemented 2019-10-08 17:57:57 +09:00
d7a1a398d3 switch of message type is applied 2019-10-08 16:41:23 +09:00
f72100c4f5 ping protocol is implemented 2019-10-08 16:24:31 +09:00
fa070c24d7 refactoring of notification 2019-10-08 16:15:36 +09:00
376069d8ad refactoring of api & pi 2019-10-08 15:42:36 +09:00
62b19d90b8 progressbar of message list is added 2019-10-08 15:25:00 +09:00
c8f32c04e8 message list bug fixed 2019-10-08 15:13:01 +09:00
0b7d3d7603 organization is modified 2019-10-08 15:01:42 +09:00
90614de5d0 send message is implemented 2019-10-08 14:59:22 +09:00
7832e7d13d send message is implemented 2019-10-08 14:34:37 +09:00
4e1246731e message list is implemented 2019-10-08 13:31:33 +09:00
abd87579ef event effect is implemented 2019-10-08 13:18:05 +09:00
9aae0885aa room info is implemented 2019-10-08 11:19:47 +09:00
bf2490dda3 dialog of group create is added 2019-10-08 09:18:40 +09:00
2ee7dd2526 group menu is added 2019-10-07 17:02:14 +09:00
33d8e733d1 tenent search component is added 2019-10-07 16:29:38 +09:00
ebb8093a3f MessageBoxes of Chat are added 2019-10-07 13:49:12 +09:00
a08003bf47 Selected Organization is implemented 2019-10-07 13:07:52 +09:00
2fe33a4c4f UserInfo for Login is added 2019-10-07 11:03:54 +09:00
3ab7ed7aad refactoring of protocol models 2019-10-07 10:08:14 +09:00
018f8c773f Organization tree component is implemented 2019-10-04 16:14:14 +09:00
1f2687189a refactoring of state 2019-10-04 13:45:02 +09:00
50152c5907 usage of template variable is modified 2019-10-04 10:28:10 +09:00
c1df332f1e postLogin is implemented 2019-10-04 10:19:55 +09:00
34db1b2d87 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-02 18:09:49 +09:00
58ded38772 effects for bulk-info is implemented 2019-10-02 18:09:39 +09:00
leejh
6747e06b5c template page added 2019-10-02 17:12:51 +09:00
a201536b02 effect for room sync is implemented 2019-10-02 15:49:25 +09:00
7c54e6606e refactoring of login process 2019-10-02 14:34:17 +09:00
7eb878cf68 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-02 10:35:46 +09:00
d8be9275d9 index bug fixed 2019-10-02 10:35:33 +09:00
leejh
8b0fa27920 bug fixed 2019-09-27 15:11:53 +09:00
26295889d7 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-27 12:53:31 +09:00
dff2e4e55f buddy & group list are implemented 2019-09-27 12:53:21 +09:00
leejh
ed8d623da8 fixed number type 2019-09-27 12:51:57 +09:00
leejh
d26b4a694b added protocol > FILE 2019-09-27 12:05:55 +09:00
leejh
5141de66c1 added protocol > QUERY 2019-09-26 17:13:01 +09:00
leejh
f88d16de8b added protocol > INFO 2019-09-26 15:31:19 +09:00
leejh
84aaa4e901 added protocol > status 2019-09-26 14:43:31 +09:00
8d8b1e5c47 layout is modified 2019-09-26 14:38:21 +09:00
8d73524de6 refactoring 2019-09-26 11:11:22 +09:00
465a3124d3 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 18:08:57 +09:00
1e0e83958f group list is implemented 2019-09-25 18:08:50 +09:00
leejh
e084f77ce1 added protocol EVENT > del,. cancel 2019-09-25 18:02:15 +09:00
leejh
c97f49c377 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 17:43:37 +09:00
leejh
b3562ab2b3 added protocol > EVENT > push, read 2019-09-25 17:43:04 +09:00
aac999dcf2 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 17:41:24 +09:00
c6ed6db2d8 input param is changed 2019-09-25 17:41:16 +09:00
leejh
f9cf9cbcf7 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 17:33:58 +09:00
leejh
0beb440dcc bug fixed and rename 2019-09-25 17:33:44 +09:00
6de48f83b4 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 17:26:27 +09:00
f575d9768a buddy list is implemented 2019-09-25 17:26:19 +09:00
leejh
e4a03d431a rename 2019-09-25 16:40:35 +09:00
leejh
7a1782a39b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 16:14:14 +09:00
leejh
d2ac61381a rename 2019-09-25 16:13:33 +09:00
leejh
d4abaeea32 added protocol > query > dept, deptUser 2019-09-25 16:13:24 +09:00
41890118e3 bug fixed 2019-09-25 16:12:28 +09:00
1c2c457187 rename 2019-09-25 15:52:40 +09:00
184f2365bb bug of stream is fixed 2019-09-25 15:35:06 +09:00
17e3fdd790 renamed 2019-09-25 14:48:36 +09:00
d6c57da8a8 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 14:06:33 +09:00
1eab7c36b5 query protocol service is implemented 2019-09-25 14:06:26 +09:00
leejh
c8c386553e Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 13:44:28 +09:00
leejh
ed37cacb89 added protocol SERVICE > PW_SET 2019-09-25 13:44:19 +09:00
449240460b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 13:26:50 +09:00
872203b86b query protocol is implemented 2019-09-25 13:26:41 +09:00
leejh
31129c90ac added protocol ROOM all,
buddy, group models filename chaged
2019-09-25 13:21:07 +09:00
06f0219660 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 11:48:00 +09:00
9473730d94 option protocol is implemented 2019-09-25 11:47:51 +09:00
leejh
ac1e3f8def 변수명 재정의 2019-09-25 09:32:56 +09:00
6e7b38bbbb Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-24 18:43:09 +09:00
a198cf8ddf bug of AppMessengerResolver is fixed 2019-09-24 18:42:53 +09:00
leejh
8c5cbe185a added protocol SYNC > BUDDY, GROUP, ROOM 2019-09-24 18:21:22 +09:00
leejh
58e4f249a2 Merge branch 'protocol' 2019-09-24 16:37:33 +09:00
c49e7e5931 agree of privacy is modified 2019-09-24 14:53:22 +09:00
e1260bff47 files of i18n ard added 2019-09-24 10:11:17 +09:00
leejh
b9e4b34e5b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger into protocol 2019-09-24 09:30:20 +09:00
d60ebd06ee login is implemented 2019-09-24 09:23:30 +09:00
9913c89689 UI for group & native for browser are added 2019-09-24 09:03:36 +09:00
leejh
acf0721636 added protocol EVENT > SEND 2019-09-23 18:09:04 +09:00
leejh
0286b120f3 added protocol ROOM > INFO all 2019-09-23 17:00:05 +09:00
leejh
8caf5bdc56 added protocol ROOM > INVITE 2019-09-23 15:18:17 +09:00
leejh
226af990b0 take 처리 2019-09-23 15:17:48 +09:00
leejh
6f067dcc15 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger into protocol 2019-09-23 14:38:42 +09:00
leejh
a6b93f8be8 add protocol ROOM > OPEN all 2019-09-23 14:38:22 +09:00
leejh
aaf3e2c743 models 의 export 수정 2019-09-23 14:37:38 +09:00
leejh
4d8aedd545 model 의 export,
buddy-update 의 항목명 수정.
2019-09-23 14:36:50 +09:00
c6d22a1fd5 Images of woori ard removed 2019-09-23 14:24:14 +09:00
692a585c1e UI Components of chat are added & Protocol service is modified 2019-09-23 14:23:24 +09:00
leejh
d19602e378 fixed Observable return type error 2019-09-23 11:47:36 +09:00
leejh
1c848e6e1c add protocol BUDDY all 2019-09-23 10:14:20 +09:00
leejh
88c49bc900 fixed bug and modify GROUP > group-update 2019-09-20 17:08:39 +09:00
leejh
5c1c0f30fc add protocol GROUP all 2019-09-20 16:49:42 +09:00
e847133650 core scss is added 2019-09-20 13:22:19 +09:00
a2db0ef3ca API, PI, Protocol are refactored 2019-09-20 11:39:09 +09:00
ff33395a5f app refactoring 2019-09-19 18:22:13 +09:00
a3e2f252b7 notification is implemented 2019-09-19 18:05:59 +09:00
036500f65e subscription of logout is added 2019-09-19 17:03:39 +09:00
977a6bcdc0 bug of login protocol is fixed 2019-09-19 15:51:42 +09:00
834c25762c protocol-inner is added 2019-09-19 14:15:43 +09:00
b934474aa3 reducer is added 2019-09-19 11:22:49 +09:00
d918b9a4db parameter of api call is modified 2019-09-19 10:40:16 +09:00
9464e3b6bd Initial Commit 2019-09-18 15:02:21 +09:00