 xxq250
|
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 |
|
xxq250
|
763d7b499e
|
fixed 第三方授权登录(github,gitee,qq,wechat)
|
2022-12-01 17:22:22 +08:00 |
 yystopf
|
4683b20b3d
|
Merge branch 'develop' into standalone_develop
|
2022-11-29 17:09:00 +08:00 |
|
yystopf
|
9b39446dfb
|
修复：提交文件内容格式由前端决定
|
2022-11-29 17:08:26 +08:00 |
|
yystopf
|
c6e77ac7ee
|
修复：提交文件未创建新分支时为空判断
|
2022-11-29 17:02:10 +08:00 |
|
yystopf
|
f5cdb6f02d
|
新增：旧统计接口移除处理
|
2022-11-29 14:31:14 +08:00 |
|
xxq250
|
ed335375bb
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-11-28 16:56:51 +08:00 |
|
xxq250
|
f818a3ac91
|
fixed 用户名称统一用昵称
|
2022-11-28 16:56:46 +08:00 |
|
yystopf
|
520ed80224
|
更改：gitlink特殊表更改
|
2022-11-28 11:43:37 +08:00 |
|
yystopf
|
90ef8f2f2e
|
Merge branch 'develop' into standalone_develop
|
2022-11-28 11:42:33 +08:00 |
|
yystopf
|
f7ca03db81
|
修复：通用分支移除projects_activity表修改
|
2022-11-28 11:41:36 +08:00 |
|
xxq250
|
66a1be944a
|
fixed 组织用户不存在
|
2022-11-28 11:20:44 +08:00 |
|
xxq250
|
8da8b021f6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-11-28 11:20:01 +08:00 |
|
xxq250
|
70ba78a9b5
|
fixed 组织用户不存在
|
2022-11-28 11:19:56 +08:00 |
|
yystopf
|
6191ddd233
|
修复：通用分支移除声明表修改
|
2022-11-28 10:57:05 +08:00 |
|
xxq250
|
ee0f09c8fa
|
Merge branch 'develop' into standalone_develop
|
2022-11-25 14:19:20 +08:00 |
|
xxq250
|
35cf298f5d
|
fixed 增加emoji表情支持表字段，长度限制
|
2022-11-25 14:19:05 +08:00 |
|
xxq250
|
04814bafbb
|
Merge branch 'develop' into standalone_develop
|
2022-11-25 14:16:01 +08:00 |
|
xxq250
|
ee5d959404
|
fixed 增加emoji表情支持表字段，长度限制
|
2022-11-25 14:15:47 +08:00 |
|
xxq250
|
15cbb9ee72
|
Merge branch 'develop' into standalone_develop
|
2022-11-25 14:11:05 +08:00 |
|
xxq250
|
7f47cd8d46
|
fixed 增加emoji表情支持表字段
|
2022-11-25 14:09:26 +08:00 |
|
xxq250
|
b68ab63eba
|
fixed 验证码校验匹配规则修正
|
2022-11-24 17:41:18 +08:00 |
|
xxq250
|
5da6330f57
|
增加手机验证码校验
|
2022-11-24 14:30:10 +08:00 |
|
xxq250
|
4e244bed3a
|
增加手机验证码校验
|
2022-11-24 14:28:49 +08:00 |
|
xxq250
|
fd2b20ed87
|
个人资料修改手机号
|
2022-11-24 11:09:58 +08:00 |
|
xxq250
|
aeff21f7df
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-11-23 18:15:31 +08:00 |
|
xxq250
|
29d2ca63ed
|
取消lastname同步nickname
|
2022-11-23 18:15:27 +08:00 |
|
xxq250
|
06c0ac65bf
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-11-23 17:58:56 +08:00 |
|
xxq250
|
8f8dab10c3
|
fixed 增加emoji表情支持
|
2022-11-23 17:58:51 +08:00 |
|
yystopf
|
ae63f735dc
|
merge from develop
|
2022-11-23 17:47:27 +08:00 |
|
yystopf
|
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 |
|
“xxq250”
|
f23f02cb80
|
fixed 增加emoji表情支持
|
2022-11-23 17:07:54 +08:00 |
|
“xxq250”
|
a01831e416
|
fixed banner增加url跳转
|
2022-11-17 15:04:23 +08:00 |
|
“xxq250”
|
98f30b4a3e
|
fixed banner增加url跳转
|
2022-11-17 15:00:49 +08:00 |
|
“xxq250”
|
19d32799a9
|
fixed banner url
|
2022-11-17 14:59:19 +08:00 |
|
“xxq250”
|
4e6e654e1f
|
banner配置增加跳转URL
|
2022-11-17 14:58:51 +08:00 |
|
yystopf
|
8b85fc11c2
|
Merge branch 'develop' into standalone_develop
|
2022-11-16 15:28:44 +08:00 |
|
yystopf
|
6d3c7ddac4
|
修复：合并请求查询关闭类型须根据合并请求类型查询
|
2022-11-16 15:28:36 +08:00 |
|
yystopf
|
38a8191b74
|
Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop
|
2022-11-16 15:27:54 +08:00 |
|
yystopf
|
e183f48c02
|
修复：合并请求查询关闭类型须根据合并请求类型查询
|
2022-11-16 15:27:49 +08:00 |
|
“xxq250”
|
0d9accfb35
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-11-15 17:14:46 +08:00 |
|
“xxq250”
|
8ff5ee1eec
|
fixed 附件下载权限
|
2022-11-15 17:14:12 +08:00 |
|
“xxq250”
|
a1731f91a9
|
fixed 附件下载权限
|
2022-11-15 17:12:10 +08:00 |
|
yystopf
|
ea7cf1cd1f
|
修复：排序字段
|
2022-11-15 15:17:06 +08:00 |
|
yystopf
|
9f74651a2b
|
Merge branch 'develop' into standalone_develop
|
2022-11-15 14:42:07 +08:00 |
|
yystopf
|
255b615327
|
更改：项目首页分类后数量更改
|
2022-11-15 14:41:08 +08:00 |
|
“xxq250”
|
0cb6f233f3
|
项目搜索增加组织和用户信息搜索
|
2022-11-15 14:40:37 +08:00 |
|
“xxq250”
|
134a395ffa
|
fixed 区分找回密码邮件标题
|
2022-11-15 14:31:18 +08:00 |