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 |
|
|
|
582b76024b
|
Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
|
2019-10-18 13:35:56 +09:00 |
|
|
|
6de7ec63c0
|
version of material is updated
|
2019-10-18 13:35:48 +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 |
|
