Commit Graph

915 Commits

Author SHA1 Message Date
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