3566 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
wangchuxiao	338d7f0df6	update orgnization after update user	2022-08-16 12:16:16 +08:00
wangchuxiao	fd19dd1a03	Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del	2022-08-16 12:01:20 +08:00
wangchuxiao	6d19af02c9	Merge branch 'v2.3.0release' into del	2022-08-16 12:01:04 +08:00
skiffer-git	1deb7e9f95	config	2022-08-16 11:59:00 +08:00
wangchuxiao	5a6f96f84b	update orgnization after update user	2022-08-16 11:49:20 +08:00
wangchuxiao	3f74022142	Merge branch 'main' into del	2022-08-15 21:51:12 +08:00
wangchuxiao	ccd2ed8ac2	Merge branch 'v2.3.0release' into del	2022-08-15 21:51:06 +08:00
wangchuxiao	a72e422684	fix code	2022-08-15 21:51:00 +08:00
wangchuxiao	da8755fcb7	fix code	2022-08-15 21:37:38 +08:00
wangchuxiao	3be284c129	fix code	2022-08-15 21:30:47 +08:00
wangchuxiao	15e2d172a4	fix code	2022-08-15 21:27:05 +08:00
wangchuxiao	4e54cb56e5	fix code	2022-08-15 21:09:21 +08:00
wangchuxiao	ad1015c8b0	fix code	2022-08-15 20:41:46 +08:00
wangchuxiao	1dbe80afc4	Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del	2022-08-15 20:38:41 +08:00
wangchuxiao	0683352c4b	fix code	2022-08-15 20:38:33 +08:00
wangchuxiao	d666f0245d	Merge pull request #267 from ouyangshi/del ... 封禁用户列表	2022-08-15 20:37:36 +08:00
wangchuxiao	7f252909fc	fix code	2022-08-15 20:36:16 +08:00
欧阳氏	7b9d0b4f1f	封禁用户列表	2022-08-15 20:33:09 +08:00
wangchuxiao	37193c48d9	fix code	2022-08-15 20:31:03 +08:00
wangchuxiao	1747ae8984	fix code	2022-08-15 20:21:06 +08:00
wangchuxiao	dfee8891d3	fix code	2022-08-15 20:16:15 +08:00
wangchuxiao	cb10df7c9f	fix code	2022-08-15 20:11:08 +08:00
wangchuxiao	c6b669eb9d	fix code	2022-08-15 20:09:02 +08:00
wangchuxiao	919e2543ca	fix code	2022-08-15 19:50:13 +08:00
wangchuxiao	b705ac24fa	fix code	2022-08-15 19:27:23 +08:00
wangchuxiao	9aa7ba77f5	fix code	2022-08-15 19:19:22 +08:00
wangchuxiao	d5b873b70b	Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del ... # Conflicts: # pkg/common/db/mysql_model/im_mysql_model/ip_model.go	2022-08-15 19:01:57 +08:00
wangchuxiao	4ec255917d	Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del	2022-08-15 18:59:52 +08:00
wangchuxiao	9b86a18752	Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del ... # Conflicts: # pkg/common/db/mysql_model/im_mysql_model/ip_model.go	2022-08-15 18:58:48 +08:00
skiffer-git	630fef29a2	Restrict user login with IP	2022-08-15 18:43:12 +08:00
wangchuxiao	05d45c94d5	ip limit	2022-08-15 18:39:34 +08:00
skiffer-git	44e4c59493	Restrict user login with IP	2022-08-15 18:34:03 +08:00
skiffer-git	24e7076423	Restrict user login with IP	2022-08-15 18:28:04 +08:00
Gordon	1f8a965b7a	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-15 18:00:08 +08:00
Gordon	8b491f4c94	retry function	2022-08-15 17:59:52 +08:00
skiffer-git	8b857f9980	Restrict user login with IP	2022-08-15 17:52:45 +08:00
wangchuxiao	7d1707ca7c	fix log	2022-08-15 16:51:41 +08:00
skiffer-git	5e3a3c61f3	Set the token activity time to five minutes ago	2022-08-15 15:47:26 +08:00
skiffer-git	073b6d200a	Set the token activity time to five minutes ago	2022-08-15 15:40:36 +08:00
Gordon	652d560a21	Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release	2022-08-15 11:17:12 +08:00
Gordon	be69ee8b1d	fcm update	2022-08-15 11:16:37 +08:00
wangchuxiao	fc5aefe435	Merge pull request #265 from ouyangshi/del ... 邀请码功能	2022-08-15 00:11:30 +08:00
wangchuxiao	d5239365be	hide jwt not active yet	2022-08-14 23:34:51 +08:00
欧阳氏	ac7f905248	完善 用户注册 用户更新	2022-08-14 22:53:41 +08:00
wangchuxiao	1a2ea05361	fix bug	2022-08-14 14:09:31 +08:00
欧阳氏	39606248a1	邀请码功能 ... 1、新增邀请码功能 needInvitationCode: false 改成 true 后生效 2、完善后台用户注册 修改相关	2022-08-13 10:41:10 +08:00
skiffer-git	4e5c1606f3	log	2022-08-12 21:48:13 +08:00
Gordon	b8aa54a159	mark message	2022-08-12 20:05:01 +08:00
wangchuxiao	7caccce907	fix log	2022-08-12 19:51:23 +08:00
wangchuxiao	82777d641c	fix log	2022-08-12 19:47:06 +08:00