Commit Graph

1384 Commits

Author SHA1 Message Date
richard-loafle
4fb85a9dc1 bug fixed 2020-02-10 17:06:34 +09:00
richard-loafle
bd60c39bbe Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 17:06:05 +09:00
richard-loafle
4faf0c6713 refactoring 2020-02-10 17:06:01 +09:00
leejinho
f2759864ce Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 17:06:01 +09:00
leejinho
eae8f9111e 조직도 트리 내부서 열어주기. 2020-02-10 17:05:39 +09:00
richard-loafle
360adf6af3 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 16:27:17 +09:00
richard-loafle
232dd6742c [ISSUE 220] fixed 2020-02-10 16:27:08 +09:00
khk
d804f7e84c 말풍선 <a>테그 링크표시 2020-02-10 16:18:49 +09:00
richard-loafle
5512723950 zooming of image is modified 2020-02-10 16:08:04 +09:00
richard-loafle
17f9af17aa bug fixed 2020-02-10 15:42:52 +09:00
richard-loafle
1f64a4d428 script injection is modified 2020-02-10 15:37:02 +09:00
richard-loafle
b095cc60f6 scroll to bottom 2020-02-10 15:27:24 +09:00
richard-loafle
c022c82ac4 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 15:21:28 +09:00
richard-loafle
e6aa3127c3 working for statusbar 2020-02-10 15:21:24 +09:00
richard-loafle
1870d5764d working for statusbar 2020-02-10 15:20:36 +09:00
leejinho
abdcf44af1 #시험결과분석 42 2020-02-10 14:33:04 +09:00
leejinho
e7d43c7dcd Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 14:10:49 +09:00
leejinho
3298542f04 # 시험결과분석 46 2020-02-10 14:10:40 +09:00
richard-loafle
aab40f81ca Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 13:45:07 +09:00
richard-loafle
18e1a35867 bug for auto update is fixed 2020-02-10 13:45:02 +09:00
leejinho
515b0135f8 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 13:03:19 +09:00
leejinho
a4b43d4f2e bugfix :: 그룹대화방 열려 있는 상태에서 대화상대 추가시 대화상대리스트 갱신되지 않는 문제 수정. 2020-02-10 13:02:56 +09:00
khk
31a8c93153 마지막대화로 이동 버튼 색상 수정 2020-02-10 11:26:55 +09:00
khk
195ce632d5 마지막 대화로 이동 버튼 추가 2020-02-10 11:10:11 +09:00
leejinho
8b96760554 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-10 10:52:35 +09:00
leejinho
47d58cbbe9 #이슈처리 214 > noti 성격의 INVITE_RES, NOTI 통합처리. 2020-02-10 10:52:28 +09:00
richard-loafle
dbc54f8287 bug of chat room is fixed 2020-02-10 10:29:17 +09:00
leejinho
b0b5ed2209 bugfix
1. 빈확장자 파일업로드시 오류처리.
2. 지원하지 않는 파일입니다. <br/> (ext..) 의 줄바꿈 처리.
2020-02-10 09:33:41 +09:00
leejinho
928e77d54c # 이슈처리 229 2020-02-10 09:17:57 +09:00
khk
f73e45f781 알림, 비디오, 검색 창 수정- 퍼블리싱 2020-02-07 18:08:51 +09:00
leejinho
3ab17bcf46 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 17:53:32 +09:00
leejinho
23f1f76753 # 이슈처리 191 2020-02-07 17:53:16 +09:00
richard-loafle
82537b2d0d Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 17:48:57 +09:00
richard-loafle
1fb8b4864f [ISSUE 225] fixed 2020-02-07 17:48:52 +09:00
leejinho
dadc980af3 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 17:40:50 +09:00
leejinho
fa4633b012 # 이슈처리 200, 232 2020-02-07 17:37:20 +09:00
richard-loafle
2ce0f3af3b Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 17:14:48 +09:00
richard-loafle
e5f61f7a4e [ISSUE 153] fixed 2020-02-07 17:14:42 +09:00
leejinho
d820d426ce Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 16:15:57 +09:00
leejinho
d36bc99fca # 이슈처리 227 2020-02-07 16:15:47 +09:00
richard-loafle
b01ce21274 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 15:29:21 +09:00
richard-loafle
ffbb9d84d2 [ISSUE 208] [ISSUE 153] fixed 2020-02-07 15:29:16 +09:00
khk
493d7de442 동영상 박스 수정 2020-02-07 15:09:33 +09:00
richard-loafle
c44e534bfc Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 14:42:16 +09:00
richard-loafle
65fbf8ab77 [ISSUE 208] fixed 2020-02-07 14:42:11 +09:00
khk
43b389d4d6 프로필 너비조정 2020-02-07 14:34:09 +09:00
khk
aea898dea7 대화방 검색 변경, 동영상 미지원 가이이드 2020-02-07 14:13:56 +09:00
richard-loafle
3b2560948a Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 13:33:34 +09:00
richard-loafle
ebddfb20c5 bug fixed 2020-02-07 13:33:30 +09:00
khk
e7bf489656 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-07 10:36:09 +09:00
khk
4fa9fe2a24 [Issue - 228] 수정 및 다이얼로그 창 대화리스트 수정 2020-02-07 10:35:44 +09:00
leejinho
39058a66e3 # 이슈처리 222, 228 2020-02-07 10:20:01 +09:00
richard-loafle
50f1d83a92 bug fixed 2020-02-06 20:15:41 +09:00
khk
47e84c6c50 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 18:43:47 +09:00
khk
026cc4ccbd 수정중 2020-02-06 18:43:24 +09:00
leejinho
137ec7960e 도메인 변경에 따른 수정. 2020-02-06 18:43:17 +09:00
leejinho
31f11ce001 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 18:07:21 +09:00
leejinho
8fdce621e9 # 이슈처리 209 2020-02-06 18:07:09 +09:00
richard-loafle
f7cc055b96 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 17:51:34 +09:00
richard-loafle
619ebe4e61 validation of group name is modified 2020-02-06 17:49:05 +09:00
leejinho
7c39285905 # 이슈처리 223 2020-02-06 16:59:35 +09:00
leejinho
81866a23fb 이미 열린 방에 대해서 다시 열고자 할때 갱신하지 않도록 수정. ChatStore.selectedRoom effect 수정. 2020-02-06 16:51:24 +09:00
leejinho
97befdc860 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 16:26:38 +09:00
leejinho
ac8e9dc325 bugfix 2020-02-06 16:26:14 +09:00
leejinho
f9dc3d4f16 # 이슈처리 46, 226 2020-02-06 16:25:56 +09:00
richard-loafle
e518ed386e bug fixed 2020-02-06 16:15:52 +09:00
richard-loafle
90918b3595 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 16:01:14 +09:00
richard-loafle
91cc673d80 bug of search is fixed 2020-02-06 16:00:56 +09:00
khk
389997dee3 대화방 전달 - 대화탭수정 2020-02-06 15:53:06 +09:00
richard-loafle
7308940001 Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 15:30:30 +09:00
richard-loafle
e2fde4ceb0 bug of search is fixed 2020-02-06 15:30:25 +09:00
leejinho
9325c7ff8f Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger 2020-02-06 15:19:24 +09:00
leejinho
101a7c86fc 기존대화방에 대화상대 추가시 인원변경 없이 "확인" 을 눌렀을때 아무반응하지 않도록 수정. 2020-02-06 15:19:03 +09:00
leejinho
349eadc316 대화리스트 > 마지막 대화 escape 처리 표현 2020-02-06 14:57:41 +09:00
khk
0596c7e68d snackbar 수정 2020-02-06 14:40:06 +09:00
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
14bd14340f bug fixed 2020-02-06 14:31:43 +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
739925911d bug fixed 2020-02-06 10:34:44 +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
57fc605679 [ISSUE 208] fixed 2020-02-05 18:09:04 +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
12f09c33dd 업로드 허용 확장자 화이트 리스트 갱신. 2020-02-05 14:48:08 +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
551f495698 comment removed 2020-02-05 12:07:36 +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
a14148389b bug fixed 2020-02-05 11:38:51 +09:00
richard-loafle
0766bb6134 bug fixed 2020-02-05 11:07:43 +09:00
leejinho
370fa44579 bugfix :: 이벤트 타입(P:일정) 에 'XX 전 알림' 문구 처리. 2020-02-05 09:32:46 +09:00
leejinho
953d813a95 bugfix :: 번역 오류시 대화가 더이상 안나가는 문제 수정. 2020-02-05 09:31:53 +09:00
khk
735ace3381 통합검색 결과없음 표시 2020-02-04 18:24:45 +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
khk
d9a65f988b 이용주의사항 bg수정 2020-02-04 10:06:20 +09:00