386 Commits

Author SHA1 Message Date
skiffer-git
af5ee45206 organization 2022-04-16 20:56:28 +08:00
skiffer-git
42af55a740 organization 2022-04-16 20:45:41 +08:00
skiffer-git
3c1e6d0e5c organization 2022-04-16 20:42:50 +08:00
skiffer-git
edf7df368e organization 2022-04-16 20:30:02 +08:00
skiffer-git
cde38e012f organization 2022-04-16 20:27:18 +08:00
skiffer-git
cc405b83e2 organization 2022-04-16 20:10:10 +08:00
skiffer-git
c65f5b7279 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-15 20:37:26 +08:00
skiffer-git
c216340120 organization 2022-04-15 19:48:17 +08:00
wangchuxiao
27cba5ba31 getui 2022-04-15 18:16:28 +08:00
wangchuxiao
dbc5bd96f3 getui 2022-04-15 17:43:04 +08:00
wangchuxiao
9489ab862b getui 2022-04-15 12:10:33 +08:00
wangchuxiao
1bb634bc6f merge code 2022-04-15 12:03:23 +08:00
wangchuxiao
4a7cfab543 getui 2022-04-15 11:56:36 +08:00
wangchuxiao
d670356388 getui 2022-04-13 15:29:35 +08:00
skiffer-git
659c3bc1cf add department db 2022-04-13 08:58:52 +08:00
skiffer-git
f5684f2c45 add department db 2022-04-13 08:58:16 +08:00
skiffer-git
bc06ba54b9 organization && department 2022-04-12 22:02:43 +08:00
wangchuxiao
4a8d37bde1 getui 2022-04-11 16:18:36 +08:00
wangchuxiao
4264cd8830 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-11 14:43:15 +08:00
wangchuxiao
edcc215774 getui 2022-04-11 14:41:09 +08:00
skiffer-git
3085fffb49 add department db 2022-04-11 14:08:23 +08:00
wangchuxiao
06370a763c getui 2022-04-08 17:20:55 +08:00
wangchuxiao
cbe3abeab0 getui 2022-04-08 16:15:22 +08:00
wangchuxiao
3d5e3ce6cf Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/tag_send_msg.go
2022-04-08 15:43:55 +08:00
wangchuxiao
4efdabc1ff getui 2022-04-08 15:40:07 +08:00
wenxu12345
42225dd35e log 2022-04-06 15:54:59 +08:00
Gordon
59cc45eaab replace log 2022-04-06 14:41:36 +08:00
wenxu12345
0232f52281 log 2022-04-05 19:31:35 +08:00
wenxu12345
6efe13d142 log 2022-04-05 16:41:37 +08:00
wangchuxiao
146aa497f9 tag and set private tips 2022-04-05 12:09:55 +08:00
wangchuxiao
f4921d1317 tag and set private tips 2022-04-05 10:27:34 +08:00
wangchuxiao
b82ff7b88d tips info 2022-04-01 14:49:48 +08:00
wangchuxiao
0e27b302bc tag and set private tips 2022-03-31 19:49:04 +08:00
wangchuxiao
4390302384 tag and set private tips 2022-03-31 16:50:46 +08:00
wangchuxiao
929c5e7a5b Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-31 14:50:17 +08:00
wangchuxiao
d600042110 tag and set private tips 2022-03-31 14:50:02 +08:00
Gordon
0a58e7433e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-31 11:43:25 +08:00
Gordon
5639c985df OA tag fields modify 2022-03-31 11:43:14 +08:00
wenxu12345
9fbfbfb23b Merge log files 2022-03-31 11:28:51 +08:00
wenxu12345
ecd2f0e2bf Merge log files 2022-03-31 11:15:06 +08:00
Gordon
60418276bd oa notification add 2022-03-30 20:04:12 +08:00
Gordon
6744745152 token add operationID 2022-03-30 15:52:04 +08:00
skiffer-git
009ae6a235 mute group 2022-03-29 18:54:55 +08:00
skiffer-git
bf5f72c00b mute group 2022-03-29 18:36:24 +08:00
skiffer-git
84aca5b9e1 mute group 2022-03-29 18:29:19 +08:00
wangchuxiao
29a268d476 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-29 17:33:13 +08:00
wangchuxiao
18d7aab703 tag 2022-03-29 17:33:06 +08:00
skiffer-git
373e6b6c8e mute group 2022-03-29 17:29:05 +08:00
Gordon
e8517e954d group add 2022-03-29 17:20:37 +08:00
Gordon
bc260fffde group add 2022-03-29 17:15:51 +08:00