Commit Graph

1347 Commits

Author SHA1 Message Date
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
af34a3485d bug fixed 2019-10-15 13:16:39 +09:00
17740d789c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-15 11:51:07 +09:00
dd88e30c17 munu of group is added 2019-10-15 11:50:59 +09:00
leejh
87ff39f11c Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-15 11:50:33 +09:00
leejh
6a852b4a1a 1. 타이머대화방 정보알림 처리.
2. 정보성 데이터 분리 처리.
3. 대화 회수 처리.
2019-10-15 11:50:23 +09:00
d0c9efaa76 variable name is changed 2019-10-15 11:09:31 +09:00
3b8b2b2ced Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-15 11:07:36 +09:00
19dea1bca8 contextMenu of profile is added 2019-10-15 11:07:26 +09:00
leejh
a986b3a370 로그인 페이지 //
remember Me 값에 따라 기본값 세팅 처리.
2019-10-15 09:31:33 +09:00
leejh
142631428a template add for attach-file 2019-10-14 17:28:43 +09:00
leejh
b6cb119a94 bugfix chat event sendDate express 2019-10-14 17:19:53 +09:00
leejh
da0ba9acbd modify message-box :: date-splitter 2019-10-14 17:19:13 +09:00
leejh
601e0861a8 bugfix event info data :: seq : string > number 2019-10-14 17:10:29 +09:00
leejh
d1e5c366b0 modify message-box Sticker 2019-10-14 15:34:00 +09:00
leejh
b2e1933470 modify message-box in Information by JOIN, EXIT 2019-10-14 15:33:21 +09:00
leejh
3ab5edbe53 source refactoring 2019-10-14 13:53:44 +09:00
leejh
b4823bfd9c modify message-box for file, attach-file, image, video 2019-10-14 13:53:22 +09:00
leejh
c270e40621 modify presence class in user-list-item.component 2019-10-14 10:31:28 +09:00
leejh
6aa2602dd0 add Mass talk detail View 2019-10-14 09:50:48 +09:00
57957cc164 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-11 18:25:06 +09:00
65fa631bfa presence is implemented 2019-10-11 18:24:57 +09:00
leejh
ed7e472464 unused code delete 2019-10-11 18:18:58 +09:00
leejh
eebb910b83 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.html
#	projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
#	projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
2019-10-11 18:10:25 +09:00
leejh
5ccb2b41b5 mass text component modify 2019-10-11 18:03:01 +09:00
leejh
06ffd4e213 bug fix 2019-10-11 18:02:27 +09:00
leejh
b49a8313a9 save LOGIN_RES info in sessionstorage 2019-10-11 18:01:39 +09:00
fee7aa70b0 content projection is applied 2019-10-11 17:52:00 +09:00
e9088572d5 notification of status is implemented 2019-10-11 16:40:55 +09:00
9b0106a4be receive alarm is implemented 2019-10-11 15:55:27 +09:00
37691a565f effects of notification are added 2019-10-11 14:01:43 +09:00
f4f986944b bug fixed 2019-10-11 13:17:52 +09:00
eb93a1743a state initializing after logout 2019-10-11 13:11:48 +09:00
78b9fbdd4b merge 2019-10-11 12:58:41 +09:00
bdfddc079e migration from plain state to ngrx entity 2019-10-11 11:58:03 +09:00
leejh
be0e24b922 modify chat message component / TEXT
modify userinfo in chat event list
2019-10-11 11:40:35 +09:00
leejh
55d593904b save sessionstorage for verinfo2 response data 2019-10-11 11:39:19 +09:00
leejh
5dd24638c8 ucap-profile-user-list-item > intro 옵션처리. 2019-10-10 18:39:04 +09:00
leejh
a8375e977b 조직도 > 부서원 ucap-profile-user-item-list 컴포넌트 적용.
맨 처음 내 부서원 선택되도록 설정.
2019-10-10 18:38:36 +09:00
leejh
9c21041c42 그룹 > 즐겨찾기 영역 생성 2019-10-10 18:35:23 +09:00
6fa6717c13 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 15:53:16 +09:00
5cdb2b18d1 scroll to bottom of message box is implemented 2019-10-10 15:53:08 +09:00
leejh
c098e88cc9 add chat room UI,
modify ucap-profile-user-list-item,
add group-expension-panel in ucap-profile-user-list-item.
2019-10-10 15:50:50 +09:00
d6f32316ee Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 15:44:49 +09:00
df1d9bea28 event message sync is modified 2019-10-10 15:44:39 +09:00
khk
b59e67ed42 buddy list modify 2019-10-10 15:37:18 +09:00
150ebd56af finalEventDate is added 2019-10-10 15:02:56 +09:00
fdf1c14b7e chat list is modified 2019-10-10 14:50:58 +09:00
0703e2807a message event is modified 2019-10-10 13:35:32 +09:00
e644979645 decoders are modified 2019-10-10 12:14:01 +09:00
59873ace7b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 10:57:35 +09:00
2da9eea06b module import 2019-10-10 10:57:24 +09:00
khk
2c1f4b1e0d Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 10:54:34 +09:00
2296b386b6 export bug fixed 2019-10-10 10:53:42 +09:00
khk
eabc97a6d2 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 10:53:38 +09:00
khk
b424c07bd4 git test1 2019-10-10 10:52:49 +09:00
69646500b2 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-10 10:43:18 +09:00
817efad9df Notification is implemented 2019-10-10 10:43:06 +09:00
khk
b32480d8ef git test 2019-10-10 10:40:11 +09:00
김남중
f363d23242 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger
# Conflicts:
#	projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html
#	projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
2019-10-10 10:33:26 +09:00
김남중
eb6b543b39 user list designed 2019-10-10 10:03:25 +09:00
fad0787266 sidenav of messenger is added 2019-10-08 18:12:58 +09:00
08c5d2825a group search is implemented 2019-10-08 17:57:57 +09:00
d7a1a398d3 switch of message type is applied 2019-10-08 16:41:23 +09:00
f72100c4f5 ping protocol is implemented 2019-10-08 16:24:31 +09:00
fa070c24d7 refactoring of notification 2019-10-08 16:15:36 +09:00
376069d8ad refactoring of api & pi 2019-10-08 15:42:36 +09:00
62b19d90b8 progressbar of message list is added 2019-10-08 15:25:00 +09:00
c8f32c04e8 message list bug fixed 2019-10-08 15:13:01 +09:00
0b7d3d7603 organization is modified 2019-10-08 15:01:42 +09:00
90614de5d0 send message is implemented 2019-10-08 14:59:22 +09:00
7832e7d13d send message is implemented 2019-10-08 14:34:37 +09:00
4e1246731e message list is implemented 2019-10-08 13:31:33 +09:00
abd87579ef event effect is implemented 2019-10-08 13:18:05 +09:00
9aae0885aa room info is implemented 2019-10-08 11:19:47 +09:00
bf2490dda3 dialog of group create is added 2019-10-08 09:18:40 +09:00
2ee7dd2526 group menu is added 2019-10-07 17:02:14 +09:00
33d8e733d1 tenent search component is added 2019-10-07 16:29:38 +09:00
ebb8093a3f MessageBoxes of Chat are added 2019-10-07 13:49:12 +09:00
a08003bf47 Selected Organization is implemented 2019-10-07 13:07:52 +09:00
2fe33a4c4f UserInfo for Login is added 2019-10-07 11:03:54 +09:00
3ab7ed7aad refactoring of protocol models 2019-10-07 10:08:14 +09:00
018f8c773f Organization tree component is implemented 2019-10-04 16:14:14 +09:00
1f2687189a refactoring of state 2019-10-04 13:45:02 +09:00
50152c5907 usage of template variable is modified 2019-10-04 10:28:10 +09:00
c1df332f1e postLogin is implemented 2019-10-04 10:19:55 +09:00
34db1b2d87 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-02 18:09:49 +09:00
58ded38772 effects for bulk-info is implemented 2019-10-02 18:09:39 +09:00
leejh
6747e06b5c template page added 2019-10-02 17:12:51 +09:00
a201536b02 effect for room sync is implemented 2019-10-02 15:49:25 +09:00
7c54e6606e refactoring of login process 2019-10-02 14:34:17 +09:00
7eb878cf68 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-10-02 10:35:46 +09:00
d8be9275d9 index bug fixed 2019-10-02 10:35:33 +09:00
leejh
8b0fa27920 bug fixed 2019-09-27 15:11:53 +09:00
26295889d7 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-27 12:53:31 +09:00
dff2e4e55f buddy & group list are implemented 2019-09-27 12:53:21 +09:00
leejh
ed8d623da8 fixed number type 2019-09-27 12:51:57 +09:00
leejh
d26b4a694b added protocol > FILE 2019-09-27 12:05:55 +09:00
leejh
5141de66c1 added protocol > QUERY 2019-09-26 17:13:01 +09:00
leejh
f88d16de8b added protocol > INFO 2019-09-26 15:31:19 +09:00
leejh
84aaa4e901 added protocol > status 2019-09-26 14:43:31 +09:00
8d8b1e5c47 layout is modified 2019-09-26 14:38:21 +09:00
8d73524de6 refactoring 2019-09-26 11:11:22 +09:00
465a3124d3 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 18:08:57 +09:00
1e0e83958f group list is implemented 2019-09-25 18:08:50 +09:00
leejh
e084f77ce1 added protocol EVENT > del,. cancel 2019-09-25 18:02:15 +09:00
leejh
c97f49c377 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 17:43:37 +09:00
leejh
b3562ab2b3 added protocol > EVENT > push, read 2019-09-25 17:43:04 +09:00
aac999dcf2 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 17:41:24 +09:00
c6ed6db2d8 input param is changed 2019-09-25 17:41:16 +09:00
leejh
f9cf9cbcf7 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 17:33:58 +09:00
leejh
0beb440dcc bug fixed and rename 2019-09-25 17:33:44 +09:00
6de48f83b4 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 17:26:27 +09:00
f575d9768a buddy list is implemented 2019-09-25 17:26:19 +09:00
leejh
e4a03d431a rename 2019-09-25 16:40:35 +09:00
leejh
7a1782a39b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 16:14:14 +09:00
leejh
d2ac61381a rename 2019-09-25 16:13:33 +09:00
leejh
d4abaeea32 added protocol > query > dept, deptUser 2019-09-25 16:13:24 +09:00
41890118e3 bug fixed 2019-09-25 16:12:28 +09:00
1c2c457187 rename 2019-09-25 15:52:40 +09:00
184f2365bb bug of stream is fixed 2019-09-25 15:35:06 +09:00
17e3fdd790 renamed 2019-09-25 14:48:36 +09:00
d6c57da8a8 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 14:06:33 +09:00
1eab7c36b5 query protocol service is implemented 2019-09-25 14:06:26 +09:00
leejh
c8c386553e Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 13:44:28 +09:00
leejh
ed37cacb89 added protocol SERVICE > PW_SET 2019-09-25 13:44:19 +09:00
449240460b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 13:26:50 +09:00
872203b86b query protocol is implemented 2019-09-25 13:26:41 +09:00
leejh
31129c90ac added protocol ROOM all,
buddy, group models filename chaged
2019-09-25 13:21:07 +09:00
06f0219660 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-25 11:48:00 +09:00
9473730d94 option protocol is implemented 2019-09-25 11:47:51 +09:00
leejh
ac1e3f8def 변수명 재정의 2019-09-25 09:32:56 +09:00
6e7b38bbbb Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger 2019-09-24 18:43:09 +09:00
a198cf8ddf bug of AppMessengerResolver is fixed 2019-09-24 18:42:53 +09:00
leejh
8c5cbe185a added protocol SYNC > BUDDY, GROUP, ROOM 2019-09-24 18:21:22 +09:00
leejh
58e4f249a2 Merge branch 'protocol' 2019-09-24 16:37:33 +09:00
c49e7e5931 agree of privacy is modified 2019-09-24 14:53:22 +09:00
e1260bff47 files of i18n ard added 2019-09-24 10:11:17 +09:00
leejh
b9e4b34e5b Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger into protocol 2019-09-24 09:30:20 +09:00
d60ebd06ee login is implemented 2019-09-24 09:23:30 +09:00
9913c89689 UI for group & native for browser are added 2019-09-24 09:03:36 +09:00
leejh
acf0721636 added protocol EVENT > SEND 2019-09-23 18:09:04 +09:00
leejh
0286b120f3 added protocol ROOM > INFO all 2019-09-23 17:00:05 +09:00
leejh
8caf5bdc56 added protocol ROOM > INVITE 2019-09-23 15:18:17 +09:00
leejh
226af990b0 take 처리 2019-09-23 15:17:48 +09:00
leejh
6f067dcc15 Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger into protocol 2019-09-23 14:38:42 +09:00
leejh
a6b93f8be8 add protocol ROOM > OPEN all 2019-09-23 14:38:22 +09:00
leejh
aaf3e2c743 models 의 export 수정 2019-09-23 14:37:38 +09:00
leejh
4d8aedd545 model 의 export,
buddy-update 의 항목명 수정.
2019-09-23 14:36:50 +09:00
c6d22a1fd5 Images of woori ard removed 2019-09-23 14:24:14 +09:00
692a585c1e UI Components of chat are added & Protocol service is modified 2019-09-23 14:23:24 +09:00
leejh
d19602e378 fixed Observable return type error 2019-09-23 11:47:36 +09:00
leejh
1c848e6e1c add protocol BUDDY all 2019-09-23 10:14:20 +09:00
leejh
88c49bc900 fixed bug and modify GROUP > group-update 2019-09-20 17:08:39 +09:00
leejh
5c1c0f30fc add protocol GROUP all 2019-09-20 16:49:42 +09:00
e847133650 core scss is added 2019-09-20 13:22:19 +09:00
a2db0ef3ca API, PI, Protocol are refactored 2019-09-20 11:39:09 +09:00
ff33395a5f app refactoring 2019-09-19 18:22:13 +09:00
a3e2f252b7 notification is implemented 2019-09-19 18:05:59 +09:00
036500f65e subscription of logout is added 2019-09-19 17:03:39 +09:00
977a6bcdc0 bug of login protocol is fixed 2019-09-19 15:51:42 +09:00
834c25762c protocol-inner is added 2019-09-19 14:15:43 +09:00
b934474aa3 reducer is added 2019-09-19 11:22:49 +09:00
d918b9a4db parameter of api call is modified 2019-09-19 10:40:16 +09:00
9464e3b6bd Initial Commit 2019-09-18 15:02:21 +09:00