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
