|
|
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 |
|
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 |
|
leejh
|
3b71bd936d
|
수정 :: 새로운 대화 개설용 유저 선택 팝업 > 유저선택 후 확인 버튼 > 대화방 개설
|
2019-10-17 18:05:44 +09:00 |
|
leejh
|
687b49816a
|
수정 :: 새로운 대화 개설용 유저 선택 팝업 > 유저선택 항목 탭간 서로 공유
|
2019-10-17 17:02:20 +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 |
|
|
|
a4c572f5e7
|
loading type is changed
|
2019-10-16 15:06:22 +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
|
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
|
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 |
|
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 |
|
|
|
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 |
|
|
|
19dea1bca8
|
contextMenu of profile is added
|
2019-10-15 11:07:26 +09:00 |
|
leejh
|
142631428a
|
template add for attach-file
|
2019-10-14 17:28:43 +09:00 |
|
leejh
|
d1e5c366b0
|
modify message-box Sticker
|
2019-10-14 15:34:00 +09:00 |
|
leejh
|
b4823bfd9c
|
modify message-box for file, attach-file, image, video
|
2019-10-14 13:53:22 +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
|
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
|
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 |
|
|
|
2da9eea06b
|
module import
|
2019-10-10 10:57:24 +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 |
|
김남중
|
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 |
|
