Commit Graph

962 Commits

Author SHA1 Message Date
leejinho
c31fc51644 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 14:35:03 +09:00
leejinho
9fea3a1f22 상대방이 퇴장 했을때 sync 쪽 user list 갱신하면서 room 에 joincount 갱신하도록 수정. 2020-02-06 14:34:42 +09:00
richard-loafle
9b76e29594 bug fixed 2020-02-06 14:31:21 +09:00
richard-loafle
95a22f0861 bug of login error is fixed 2020-02-06 14:16:36 +09:00
richard-loafle
773fa46c48 bug fixed 2020-02-06 13:56:07 +09:00
richard-loafle
0da7ff2af3 [ISSUE 212] fixed 2020-02-06 13:52:17 +09:00
richard-loafle
07e3f8125f bug fixed 2020-02-06 13:39:05 +09:00
richard-loafle
54efc50a78 bug fixed 2020-02-06 13:34:22 +09:00
richard-loafle
980e58287d bug fixed 2020-02-06 13:28:49 +09:00
richard-loafle
bba8e0047b log level 2020-02-06 13:15:31 +09:00
richard-loafle
f615979b44 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 13:05:29 +09:00
richard-loafle
d8ff959bd6 refactoring of file download 2020-02-06 13:05:24 +09:00
leejinho
b7483d2f12 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 12:51:44 +09:00
leejinho
aa2bdad471 # 이슈처리 213 2020-02-06 12:51:23 +09:00
khk
a09847c140 210번 수정(다이알로그 창 영역수정) 2020-02-06 11:22:05 +09:00
leejinho
254bc2c05b Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 10:52:13 +09:00
leejinho
9630ee59ae bugfix 2020-02-06 10:52:05 +09:00
richard-loafle
5d3938addd Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 10:26:44 +09:00
richard-loafle
d1698a28e6 open file is added 2020-02-06 10:26:39 +09:00
leejinho
7e6099a777 # 이슈처리 215, 216, 218 2020-02-06 10:24:47 +09:00
khk
6199b398b1 프로필 수정 2020-02-06 09:57:34 +09:00
richard-loafle
2cf189a5ae Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 17:57:23 +09:00
richard-loafle
11fc391fc4 [ISSUE 195] fixed 2020-02-05 17:57:18 +09:00
leejinho
4d0c8550e9 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 17:50:02 +09:00
leejinho
bc9d5764c8 강퇴 프로세스 개선. 불필요 화면 갱신 제거. 2020-02-05 17:49:53 +09:00
richard-loafle
e307cdb3b6 [ISSUE 113] fixed 2020-02-05 17:21:08 +09:00
richard-loafle
dd6bbc42f9 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 17:06:05 +09:00
richard-loafle
0dfd7d9bee [ISSUE 113] fixed 2020-02-05 17:06:00 +09:00
khk
d4a5f2b335 메시지 가시성 수정 2020-02-05 16:39:39 +09:00
leejinho
c004143441 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 16:19:40 +09:00
richard-loafle
9605304278 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 16:19:40 +09:00
leejinho
f601956e45 bugfix 2020-02-05 16:19:19 +09:00
richard-loafle
b948d5c324 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 16:18:35 +09:00
richard-loafle
324e2228ed bug fixed 2020-02-05 16:18:17 +09:00
khk
fa1d0287be 수정사항 반영 및 svg -> 폰트로 변경중 2020-02-05 15:50:35 +09:00
leejinho
4ee3448228 쪽지 답장 기능 추가. 2020-02-05 15:29:29 +09:00
leejinho
b55e144172 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 14:11:36 +09:00
leejinho
1a46307df7 bugfix 2020-02-05 14:10:34 +09:00
richard-loafle
46faa2a675 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 14:07:50 +09:00
richard-loafle
bab7b405a1 bug fixed 2020-02-05 14:07:46 +09:00
leejinho
68fae90bfc 선택된 방 chat list 에서 선택 표시 2020-02-05 13:07:51 +09:00
richard-loafle
9e2a5bec76 bug fixed 2020-02-05 12:06:58 +09:00
leejinho
74128a071a Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-05 11:48:28 +09:00
leejinho
e87320d1ee bugfix 2020-02-05 11:48:19 +09:00
khk
fb5dda3eb9 로그인- 반응형(inputbox 수정) 2020-02-05 11:46:16 +09:00
richard-loafle
0766bb6134 bug fixed 2020-02-05 11:07:43 +09:00
leejinho
953d813a95 bugfix :: 번역 오류시 대화가 더이상 안나가는 문제 수정. 2020-02-05 09:31:53 +09:00
richard-loafle
7c2e6b4ebb Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-04 17:59:31 +09:00
richard-loafle
4cf0292204 bug fixed 2020-02-04 17:59:27 +09:00
leejinho
4fc2f89ce5 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-04 17:54:50 +09:00
leejinho
023d75a476 PC 중복 로그인 알림 메시지 문구 변경. 2020-02-04 17:54:42 +09:00
richard-loafle
c4e9ebb217 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-04 17:13:16 +09:00
richard-loafle
ef007d0ab5 clipboard 2020-02-04 17:13:09 +09:00
khk
1d0dcf3791 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-04 17:03:55 +09:00
khk
59254ac811 셋팅창 메뉴 버튼 영역 수정 2020-02-04 17:03:33 +09:00
leejinho
3f61451be6 대화타입에 따라 노티, snackbar 출력하지 않도록 수정.
case EventType.Join:
      case EventType.Exit:
      case EventType.ForcedExit:
      case EventType.RenameRoom:
      case EventType.NotificationForTimerRoom:
      case EventType.GuideForRoomTimerChanged:
2020-02-04 17:02:27 +09:00
leejinho
9bb14a3fac Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-04 16:34:50 +09:00
leejinho
4569202230 bugfix ::
1. 강제퇴장시 state 에서 remove 하지 않고 isJoinRoom 플래그만 변경하도록 수정.
2. 대화상대 초대시 방정보를 갱신하도록 수정. >> INVITE_NOTI 에 초대자 정보가 유입되지 않음.
2020-02-04 16:34:27 +09:00
khk
1da9fe0940 수정사항 반영 2020-02-04 16:24:39 +09:00
leejinho
b58e52325d 팝업 닫는 로직 통합에 의한 불필요 소스 제거. 2020-02-04 13:37:56 +09:00
richard-loafle
ad78e23303 close all dialogs when force logout 2020-02-04 13:25:09 +09:00
richard-loafle
5a84657d53 add perfect-scrollbar 2020-02-04 13:05:19 +09:00
leejinho
8115d3af69 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-04 11:30:06 +09:00
leejinho
e38a22d998 bugfix ::
logout 시 에러.
팝업 오픈시에 로그아웃되면 팝업이 남아있는 문제.
2020-02-04 11:29:55 +09:00
richard-loafle
0e59704533 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-04 11:27:53 +09:00
richard-loafle
b314a72bad refactoring of organization 2020-02-04 11:27:48 +09:00
leejinho
f98acedbb2 bugfix : duplication message unread count retrieve 2020-02-04 09:52:43 +09:00
khk
8629d1f321 쪽지- 디자인 수정 2020-02-03 18:35:56 +09:00
richard-loafle
af582b0c8e [ISSUE 75] fixed 2020-02-03 17:09:58 +09:00
richard-loafle
b4550e21fe [ISSUE 92] fixed 2020-02-03 16:58:58 +09:00
richard-loafle
51dbc01dd6 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-03 13:58:53 +09:00
richard-loafle
8400b6911d [ISSUE 89] fixed 2020-02-03 13:58:48 +09:00
leejinho
8b31156489 bugfix :: 다국어 설정 시 > 쪽지 검색 > select 에서 에러 발생하는 부분 수정. 2020-02-03 13:32:28 +09:00
leejinho
e5aae20dcd Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-03 08:49:18 +09:00
leejinho
5f4aecfe57 bugfix :: timer room event clear 2020-02-03 08:49:10 +09:00
khk
e502bbff54 색상 변경에 따른 수정 2020-01-31 18:14:55 +09:00
leejinho
eaadd72e89 로그인 후 내 프레즌스 표시를 위한 프로토콜 처리. 2020-01-31 18:00:18 +09:00
leejinho
9e8c15df82 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-31 17:17:05 +09:00
leejinho
1ae77ffc95 쪽지
1. empty 화면 구성.
2. 빈문자열 겸색 안되게 수정.

사용자검색
1. top-bar 에서 빈문자열 검색 안되게 수정.
2. 팝업내 재검색시 1페이지 검색하도록 수정.
2020-01-31 17:16:50 +09:00
khk
1502cb99d6 웹링크 뺏지 수정 2020-01-31 16:38:19 +09:00
leejinho
52bd202c6a Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-31 15:25:40 +09:00
leejinho
9916344911 bugfix 2020-01-31 15:25:28 +09:00
richard-loafle
db000a5b49 [ISSUE 192] bug fixed 2020-01-31 15:00:58 +09:00
leejinho
7438d1d691 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-31 14:32:41 +09:00
leejinho
af312d9ba1 # 이슈처리
194 대화 회수 후 전달 대화방 목록 확인 시 대화상대없음 으로 보여짐
198 부재중 시간 설정 후 확인 시 부재중으로 변하지 않음

로그아웃시 idle 체크 해제
알림대화타입 대화전달 못하게 막음.
2020-01-31 14:32:17 +09:00
richard-loafle
011015c275 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-31 13:12:26 +09:00
richard-loafle
ae55cee3ab refactoring of chat room 2020-01-31 13:12:21 +09:00
khk
5ba9d7fe9c 파일 드레그 가이드 문구 레이아웃 및 최소사이즈 대화방 컨텐츠 수정(반응형) 2020-01-31 11:29:06 +09:00
richard-loafle
6657461150 refactoring of chat search 2020-01-31 10:41:52 +09:00
leejinho
de0a6b016e 사용자 검색 > 프로필 > 1:1대화 클릭 >> 모든 팝업을 닫아주는 기능 추가. 2020-01-31 09:08:39 +09:00
khk
f54a26fb9e 수정사항반영 2020-01-30 19:41:37 +09:00
richard-loafle
f8c717551e cdk-virtual-scroll-viewport is removed 2020-01-30 17:46:32 +09:00
khk
787cac6359 슬라이드바 좌측으로 붙임 2020-01-30 17:44:05 +09:00
leejinho
04409d2546 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-30 17:16:40 +09:00
leejinho
d623359d1e modify integrated search. 2020-01-30 17:16:20 +09:00
richard-loafle
b1ed539d46 virtual-scroller is added 2020-01-30 17:06:01 +09:00
richard-loafle
186a99bee9 comment is removed 2020-01-30 14:44:07 +09:00
leejinho
9d79f3d4bd Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-30 11:20:53 +09:00
leejinho
4e6332dccf # 이슈처리
192 다른 이름으로 저장 취소시 팝업 문의건
2020-01-30 11:03:34 +09:00
leejinho
81c8a2b790 # 이슈처리
190 쪽지 제목 장문 작성 후 발송 시 발송되지 않음
2020-01-30 10:32:36 +09:00
khk
dd23462374 미로그인시 - 통합검색 없음 2020-01-30 09:18:07 +09:00
leejinho
32cb30834e Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-30 08:24:42 +09:00
leejinho
6b8313b14d IOS 캡쳐 노티 이벤트(X) 처리 2020-01-30 08:23:11 +09:00
khk
87a9a76e04 검색 input창 정리 및 통합검색 진행중 2020-01-29 17:08:20 +09:00
leejinho
bb22a17baf bug fix
profile popup close button added
2020-01-29 14:59:56 +09:00
leejinho
121883a46c Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-29 13:14:48 +09:00
leejinho
9ab918cd1d 팝업에 닫기 버튼 생성. 2020-01-29 13:14:26 +09:00
richard-loafle
468262cf43 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-29 11:45:19 +09:00
richard-loafle
c294cc66b5 bug fixed 2020-01-29 11:45:14 +09:00
leejinho
ded09a9c83 사용자 검색 >> 프레즌스 적용 2020-01-29 11:15:57 +09:00
leejinho
790e8ac060 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-29 09:58:56 +09:00
leejinho
d2032c4625 사용자 검색 1차 커밋 2020-01-29 09:58:40 +09:00
khk
2da4bb69f7 대화방검색, 스티커, 번역 수정중 2020-01-28 20:50:52 +09:00
khk
b9e135dfab 팝업 닫기버튼 추가 2020-01-28 15:40:18 +09:00
leejinho
77bc91aa39 # 이슈처리
184 1:1대화방 상대방이 방 나가기 시대화 상대 없음 으로 표시됨
185 회의중, 상태메시지 입력 후 X버튼 후 편집버튼 선택 시 오류
186 그룹대화방 생성 후 메시지 발신 시 여기까지 읽음 기능 표시됨
187 그룹 대화방 읽음 표시 카운트 오류
2020-01-28 13:43:24 +09:00
khk
f00028f2b0 화면사이즈 변경에 따른 미디어쿼리 적용 진행중 2020-01-23 15:56:24 +09:00
leejinho
00e6df85d1 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-23 14:45:29 +09:00
leejinho
507d0249f8 # 이슈처리
163 그룹1,2 소속부서 인원 추가 후 1에서 삭제시 2에서 삭제되지 않음
2020-01-23 14:45:21 +09:00
richard-loafle
2ac36a830a bug fixed 2020-01-23 14:17:36 +09:00
richard-loafle
5fc468c7c2 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-23 14:15:18 +09:00
richard-loafle
49ffe6b3d8 update is modified 2020-01-23 14:15:08 +09:00
leejinho
fcc17a3d45 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-23 13:50:28 +09:00
leejinho
1d30d35684 # 이슈처리
179 조직도 전체 선택 후 그룹추가 시 전체 선택 표시 남아있음
2020-01-23 13:07:13 +09:00
richard-loafle
91fcf7f2e5 merged 2020-01-23 12:42:33 +09:00
khk
ddb52c3fb4 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-23 12:26:45 +09:00
khk
9ba7bd4966 버젼정보 및 수정사항 2020-01-23 12:11:45 +09:00
leejinho
83847aab28 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-23 11:35:21 +09:00
leejinho
9153a92dab # 이슈처리
172 번역on 후 스티커 발신 시 발신되지 않음
175 쪽지 검색 후 스크롤 시 플로팅 버튼 고정되지 않음
178 동일한 그룹에 대화 상대 이동시 사용자 사라짐
182 퇴장/강퇴한 사용자 그룹멤버 추가되어 있음
2020-01-23 11:34:58 +09:00
richard-loafle
97499b0415 app exit is added 2020-01-23 11:23:31 +09:00
khk
bbebd8bedc 프레임 관련 요구사항 반영 2020-01-22 18:06:28 +09:00
richard-loafle
26e355ef04 no search result of chat left side is added 2020-01-22 17:50:05 +09:00
khk
9c82e023e2 로그인 (미디어쿼리적용) 2020-01-22 16:58:05 +09:00
richard-loafle
41fb1b14a0 bug fixed 2020-01-22 16:37:47 +09:00
richard-loafle
00dc2d511b style of check ofr updates is modified 2020-01-22 16:15:00 +09:00
richard-loafle
4cef55ded8 check for updates is modified 2020-01-22 16:10:30 +09:00
richard-loafle
85200f420d bug fixed 2020-01-22 15:00:06 +09:00
Richard Park
e46522734a checking updates is added 2020-01-22 14:16:32 +09:00
Richard Park
6b3e3bee3a indicator of left side drawer is implemented 2020-01-22 11:17:02 +09:00
Richard Park
bc6177b477 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-22 10:36:19 +09:00
Richard Park
c8b5aae629 refactoring of left side drawer indicator 2020-01-22 10:36:14 +09:00
khk
fe37b0c1ce 슬라이드버튼 2020-01-22 10:16:03 +09:00
Richard Park
a62a18b0b6 left side drawer is implemented 2020-01-21 18:20:34 +09:00
Richard Park
09e419c917 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-21 17:46:19 +09:00
Richard Park
c17eb2a2fa indicator of left side drawer is added 2020-01-21 17:46:08 +09:00
leejinho
3ffe4b2746 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-01-21 16:37:02 +09:00
leejinho
3a9be3ff93 대화방 > 프로필 > 프로필 팝업 오픈 안되는 문제 수정. 2020-01-21 16:36:30 +09:00
Richard Park
0f51d458e0 left side drawer is implemented 2020-01-21 15:29:59 +09:00
Richard Park
6952b84edb left side drawer is added 2020-01-21 15:08:15 +09:00
leejinho
acd8abed09 left section conversion to drawer 2020-01-21 13:32:10 +09:00
khk
d00d4d4a54 수정사항 반영 2020-01-20 18:54:24 +09:00