Commit Graph

3744 Commits

Author SHA1 Message Date
7b724cfeca fixed 用户简介支持表情 2022-12-07 15:36:33 +08:00
2238c8fcbb fixed qq命名调整,方便封装 2022-12-06 10:27:04 +08:00
73d89a89e2 fixed 第三方授权登录配置url 2022-12-06 10:12:41 +08:00
e41adbc4a8 fixed 第三方授权gitee登录 2022-12-05 15:50:57 +08:00
ed7c5b0a2d fixed 第三方授权gitee登录 2022-12-05 15:49:59 +08:00
ea187a59a0 fixed 随机密码防止溢出 2022-12-02 15:38:56 +08:00
77087345c8 fixed 异常日志 2022-12-02 15:30:43 +08:00
05702872b3 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-12-02 15:18:01 +08:00
1fc79535ad fixed 错误对象 2022-12-02 15:17:57 +08:00
af8183485e merge from develop 2022-12-02 14:04:23 +08:00
4b1f1c697e 更改:下载excel文件不走跳转 2022-12-02 13:59:41 +08:00
77c7acd582 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-12-02 12:11:30 +08:00
025a6a53e9 修复:图片无法下载的问题 2022-12-02 12:11:24 +08:00
0747fc6849 fixed 用户名称统一nickname 2022-12-02 11:16:13 +08:00
cbe10b4b89 fixed 第三方授权登录(github,gitee,qq,wechat),输出URL到前端 2022-12-01 18:03:06 +08:00
5717d0c69f Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-12-01 17:52:27 +08:00
6b846b10bb fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:51:54 +08:00
feb8c66e4b Merge remote-tracking branch 'origin/develop' into standalone_develop
# Conflicts:
#	app/controllers/concerns/register_helper.rb
#	app/controllers/oauth/base_controller.rb
2022-12-01 17:48:11 +08:00
763d7b499e fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:22:22 +08:00
4683b20b3d Merge branch 'develop' into standalone_develop 2022-11-29 17:09:00 +08:00
9b39446dfb 修复:提交文件内容格式由前端决定 2022-11-29 17:08:26 +08:00
c6e77ac7ee 修复:提交文件未创建新分支时为空判断 2022-11-29 17:02:10 +08:00
f5cdb6f02d 新增:旧统计接口移除处理 2022-11-29 14:31:14 +08:00
ed335375bb Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-11-28 16:56:51 +08:00
f818a3ac91 fixed 用户名称统一用昵称 2022-11-28 16:56:46 +08:00
520ed80224 更改:gitlink特殊表更改 2022-11-28 11:43:37 +08:00
90ef8f2f2e Merge branch 'develop' into standalone_develop 2022-11-28 11:42:33 +08:00
f7ca03db81 修复:通用分支移除projects_activity表修改 2022-11-28 11:41:36 +08:00
66a1be944a fixed 组织用户不存在 2022-11-28 11:20:44 +08:00
8da8b021f6 Merge remote-tracking branch 'origin/develop' into develop 2022-11-28 11:20:01 +08:00
70ba78a9b5 fixed 组织用户不存在 2022-11-28 11:19:56 +08:00
6191ddd233 修复:通用分支移除声明表修改 2022-11-28 10:57:05 +08:00
ee0f09c8fa Merge branch 'develop' into standalone_develop 2022-11-25 14:19:20 +08:00
35cf298f5d fixed 增加emoji表情支持表字段,长度限制 2022-11-25 14:19:05 +08:00
04814bafbb Merge branch 'develop' into standalone_develop 2022-11-25 14:16:01 +08:00
ee5d959404 fixed 增加emoji表情支持表字段,长度限制 2022-11-25 14:15:47 +08:00
15cbb9ee72 Merge branch 'develop' into standalone_develop 2022-11-25 14:11:05 +08:00
7f47cd8d46 fixed 增加emoji表情支持表字段 2022-11-25 14:09:26 +08:00
b68ab63eba fixed 验证码校验匹配规则修正 2022-11-24 17:41:18 +08:00
5da6330f57 增加手机验证码校验 2022-11-24 14:30:10 +08:00
4e244bed3a 增加手机验证码校验 2022-11-24 14:28:49 +08:00
fd2b20ed87 个人资料修改手机号 2022-11-24 11:09:58 +08:00
aeff21f7df Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-11-23 18:15:31 +08:00
29d2ca63ed 取消lastname同步nickname 2022-11-23 18:15:27 +08:00
06c0ac65bf Merge remote-tracking branch 'origin/develop' into develop 2022-11-23 17:58:56 +08:00
8f8dab10c3 fixed 增加emoji表情支持 2022-11-23 17:58:51 +08:00
ae63f735dc merge from develop 2022-11-23 17:47:27 +08:00
a6923bf7ed 新增:get_user_info电话号码展示 2022-11-23 17:44:37 +08:00
“xxq250”
1c71eab72e fixed 增加emoji表情支持 2022-11-23 17:11:27 +08:00
“xxq250”
667dca0553 Merge remote-tracking branch 'origin/develop' into develop 2022-11-23 17:07:59 +08:00