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
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
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
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
c6e05667fe
status of user profile is modified
2019-11-18 18:06:38 +09:00
59e4a500d0
bug of tray is fixed
2019-11-18 16:49:41 +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
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
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
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
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
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
khk
f747490a7c
design 변경
2019-11-08 08:58:22 +09:00
85dafe6922
thumbnail is added
2019-11-07 18:08:00 +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
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
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
bf9c7f80bf
bug fixed
2019-11-05 14:55:17 +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
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
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
654a8475fe
bug of scroll is fixed
2019-11-01 15:06:37 +09:00
bb1c74823d
merged
2019-11-01 15:06:20 +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
057a5e8705
bugfix
2019-11-01 09:06:52 +09:00
khk
35a3292ddb
디자인 레이아웃 변경
2019-10-31 19:17:29 +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
leejh
4b4f8a0067
bugfix
...
방나가기(Room Exit) 시에 state 에서 roominfo 만 삭제되던것 roomUserInfos 도 샂게 하도록 수정.
해당 부분이 방 재 오픈시 유저 기준 검색하는 부분에서 에러를 발생하여 조치함.
2019-10-31 15:33: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
239404257c
FAB 툴팁 기능 추가 및 새 대화 팝업 연동.
2019-10-31 10:26:47 +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
