Commit Graph

3247 Commits

Author SHA1 Message Date
xxq250 56d9a4f46b fixed 代码贡献者email 2023-01-06 11:17:19 +08:00
xxq250 7c80f74e26 fixed 代码贡献者email 2023-01-06 11:16:50 +08:00
yystopf e1c600a2f5 更改:分页大小最高限制为50 2023-01-05 15:40:03 +08:00
yystopf ead5753f65 Merge branch 'develop' into standalone_develop 2023-01-04 11:38:41 +08:00
yystopf a274fa913d 更改:项目排行榜缓存键加入时间参数 2023-01-04 11:38:07 +08:00
yystopf dd979eb1d0 Merge branch 'develop' into standalone_develop 2023-01-04 09:43:27 +08:00
yystopf 6b9adefde2 修复:action使用正确 2023-01-04 09:43:18 +08:00
yystopf 872a2b334b Merge branch 'develop' into standalone_develop 2023-01-04 09:19:55 +08:00
yystopf cec764127e 更改:项目排行榜规则及个数 2023-01-04 09:19:42 +08:00
xxq250 b8af22e3bc fixed 授权登录绑定账号 2022-12-30 10:33:11 +08:00
xxq250 18ad80c51c fixed 授权登录绑定账号 2022-12-30 10:26:59 +08:00
xxq250 05933c9eff fixed 项目列表增加私有组织中项目过滤 2022-12-28 09:32:53 +08:00
xxq250 6047d6a91b fixed 创建仓库开通建木DevOps url修正 2022-12-27 15:40:19 +08:00
xxq250 a04cad32cf fixed 授权登录绑定账号返回用户信息 2022-12-26 16:24:27 +08:00
xxq250 346ca9eb27 fixed 授权登录绑定账号返回用户信息 2022-12-26 16:15:18 +08:00
xxq250 0a44e84540 fixed 授权登录绑定账号返回用户信息 2022-12-26 16:09:43 +08:00
xxq250 87ee19e882 fixed 授权登录绑定账号返回用户信息 2022-12-26 11:19:58 +08:00
xxq250 3459054349 fixed 授权登录绑定账号 2022-12-22 17:04:50 +08:00
xxq250 d821006cb5 fixed 邮件发送模板 2022-12-16 12:03:51 +08:00
xxq250 aba1dad1ea fixed 创建仓库开通建木DevOps log 2022-12-15 17:54:52 +08:00
xxq250 859d72f7d7 fixed 创建仓库开通建木DevOps通知传递用户 2022-12-15 16:45:28 +08:00
xxq250 b2310fb98b fixed 创建仓库开通建木DevOps log 2022-12-15 16:33:00 +08:00
xxq250 672107412b fixed 创建仓库开通建木DevOps job 2022-12-15 15:06:02 +08:00
xxq250 454baf8010 fixed 创建仓库开通建木DevOps 404 2022-12-15 14:25:42 +08:00
xxq250 1de784e9c7 fixed 创建仓库开通建木DevOps 2022-12-15 14:02:47 +08:00
xxq250 46f388999d fixed 创建仓库开通建木DevOps 2022-12-15 13:53:34 +08:00
xxq250 1a0390bf55 fixed 创建仓库开通建木DevOps 2022-12-15 11:47:11 +08:00
xxq250 2f9a514837 fixed 创建仓库开通建木DevOps 2022-12-15 11:41:11 +08:00
xxq250 311852234f fixed 创建仓库开通建木DevOps 2022-12-15 11:38:03 +08:00
xxq250 69065d1e5a 项目列表增加私有组织中项目过滤 2022-12-09 15:42:47 +08:00
xxq250 45aa49f27d 项目列表增加私有组织中项目过滤 2022-12-09 15:39:33 +08:00
xxq250 d9833ef1bf 更改组织可见性为私有,则需将该组织下的所有仓库同步更改为私有仓库 2022-12-09 14:18:19 +08:00
xxq250 68c05c8df1 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-12-09 14:03:46 +08:00
xxq250 f796d1be42 更改组织可见性为私有,则需将该组织下的所有仓库同步更改为私有仓库 2022-12-09 14:03:41 +08:00
yystopf a15d0827b7 merge from develop 2022-12-09 11:49:26 +08:00
yystopf 204554b34c Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-12-09 11:45:36 +08:00
yystopf bc2992cc3d 新增:后台管理更改用户信息邮箱需同步至gitea 2022-12-09 11:45:31 +08:00
xxq250 a631d423c6 fixed 项目跳转链接修正 2022-12-09 11:07:00 +08:00
xxq250 edd1d27b0a fixed 用户项目跳转链接修正 2022-12-09 11:04:24 +08:00
xxq250 3edac3656a fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 18:14:43 +08:00
xxq250 487630ad1c fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:28:31 +08:00
xxq250 3db761e2ae fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:25:54 +08:00
xxq250 988ebf3fc3 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:19:03 +08:00
xxq250 6350d2e5a9 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:19:02 +08:00
xxq250 d0b638cbc0 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:16:21 +08:00
xxq250 1c16b74f1b fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:15:33 +08:00
xxq250 1aab51104f fixed 第三方授权登录配置支持Get方法 2022-12-08 14:35:46 +08:00
yystopf a01c98164a Merge branch 'develop' into standalone_develop 2022-12-08 11:52:38 +08:00
yystopf dfa0f1161d Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-12-08 11:52:06 +08:00
yystopf bc6f5cec4d 新增:仓库贡献者行数查询接口 2022-12-08 11:51:59 +08:00
xxq250 2238c8fcbb fixed qq命名调整,方便封装 2022-12-06 10:27:04 +08:00
xxq250 ee27c90205 fixed qq命名调整,方便封装 2022-12-06 10:24:48 +08:00
xxq250 73d89a89e2 fixed 第三方授权登录配置url 2022-12-06 10:12:41 +08:00
xxq250 534ee80523 Merge remote-tracking branch 'origin/develop' into develop 2022-12-05 17:46:25 +08:00
xxq250 daf7514afe fixed 第三方授权登录配置 2022-12-05 17:46:21 +08:00
xxq250 ea187a59a0 fixed 随机密码防止溢出 2022-12-02 15:38:56 +08:00
xxq250 77087345c8 fixed 异常日志 2022-12-02 15:30:43 +08:00
xxq250 05702872b3 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-12-02 15:18:01 +08:00
xxq250 1fc79535ad fixed 错误对象 2022-12-02 15:17:57 +08:00
yystopf af8183485e merge from develop 2022-12-02 14:04:23 +08:00
yystopf 4b1f1c697e 更改:下载excel文件不走跳转 2022-12-02 13:59:41 +08:00
yystopf 77c7acd582 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-12-02 12:11:30 +08:00
yystopf 025a6a53e9 修复:图片无法下载的问题 2022-12-02 12:11:24 +08:00
xxq250 0747fc6849 fixed 用户名称统一nickname 2022-12-02 11:16:13 +08:00
xxq250 cbe10b4b89 fixed 第三方授权登录(github,gitee,qq,wechat),输出URL到前端 2022-12-01 18:03:06 +08:00
xxq250 6b846b10bb fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:51:54 +08:00
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 f818a3ac91 fixed 用户名称统一用昵称 2022-11-28 16:56:46 +08:00
xxq250 66a1be944a fixed 组织用户不存在 2022-11-28 11:20:44 +08:00
xxq250 70ba78a9b5 fixed 组织用户不存在 2022-11-28 11:19:56 +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 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 a6923bf7ed 新增:get_user_info电话号码展示 2022-11-23 17:44:37 +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
yystopf 64c6f69f56 新增:统计项目分类下私有项目的数量 2022-11-15 14:25:35 +08:00
“xxq250” 62a9941e22 fixed 项目列表查询排序优化 2022-11-15 14:00:31 +08:00
“xxq250” b05e08a1c5 项目搜索增加用户信息搜索 2022-11-15 10:47:14 +08:00
“xxq250” 64fdfd3b01 项目搜索增加用户信息搜索 2022-11-15 10:33:41 +08:00
“xxq250” 005687442e 项目搜索增加用户信息搜索 2022-11-15 10:27:19 +08:00
“xxq250” d4762d2900 项目搜索增加用户信息搜索 2022-11-15 10:25:17 +08:00
“xxq250” 518f373b88 增加ucloud短信发送通道 2022-11-15 10:03:01 +08:00
“xxq250” e0588b7863 fixed 增加邮箱发送者名称 2022-11-11 15:57:15 +08:00
“xxq250” 69037beee2 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-11-11 14:55:00 +08:00
“xxq250” babcb16c41 fixed 埋点记录 2022-11-11 14:54:54 +08:00
yystopf 6e46b683e1 Merge branch 'develop' into standalone_develop 2022-11-11 14:13:56 +08:00
yystopf 49abadfa3f 新增:合并请求合并之后挂载的issue设置为关闭 2022-11-11 14:13:38 +08:00
yystopf 4cde7c374e 更改:反馈意见编辑器隐藏上传按钮 2022-11-11 14:04:36 +08:00
yystopf 84bfdf749f Merge branch 'develop' into standalone_develop 2022-11-11 12:25:46 +08:00
yystopf b56930b9ab 修复:反馈意见发送邮件失败错误返回 2022-11-11 12:25:25 +08:00
yystopf 4a7dcf8a91 Merge branch 'develop' into standalone_develop 2022-11-11 11:50:26 +08:00
yystopf f98886b3a0 修复 2022-11-11 11:50:07 +08:00
yystopf 30572aa41c 修复:重复代码移除 2022-11-11 11:11:34 +08:00
yystopf 7492662f7d Merge branch 'develop' into standalone_develop 2022-11-10 16:22:40 +08:00
yystopf ef83697cb8 修复:tooltip闪烁问题 2022-11-10 16:21:43 +08:00
yystopf 6dc06fc088 Merge branch 'develop' into standalone_develop 2022-11-10 11:03:08 +08:00
yystopf 570f664c27 修复:标记issue数量问题 2022-11-10 11:02:50 +08:00
yystopf e92588cf6d Merge branch 'develop' into standalone_develop 2022-11-09 14:56:43 +08:00
yystopf e24921bba3 修复 2022-11-09 14:56:27 +08:00
yystopf f75e05bb84 Merge branch 'develop' into standalone_develop 2022-11-09 14:55:06 +08:00
yystopf e4d62c5335 新增:字符串截取展示 2022-11-09 14:54:43 +08:00
yystopf c3703a7f69 merge from develop 2022-11-09 14:42:40 +08:00
yystopf 6d9cf8aad2 修复 2022-11-09 14:41:17 +08:00
yystopf 33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
yystopf e3179dfd6e 新增:新增反馈意见邮件回复功能 2022-11-09 14:35:11 +08:00
yystopf 7817487ab7 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-11-09 11:37:18 +08:00
yystopf 83b46fcb50 新增:用户反馈意见后台管理逻辑 2022-11-09 11:37:12 +08:00
“xxq250” 8ce3fac96d fixed 项目列表查询排序优化 2022-11-08 17:26:39 +08:00
“xxq250” 1f2af50091 fixed 项目列表查询count优化 2022-11-08 17:20:29 +08:00
“xxq250” 7cc9d207b6 fixed 项目列表查询count优化 2022-11-08 17:18:04 +08:00
“xxq250” abfb62f342 fixed 项目优化排序 2022-11-08 17:16:25 +08:00
“xxq250” f4794f6489 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-11-08 15:33:54 +08:00
“xxq250” 575dbb0544 fixed 项目优化排序 2022-11-08 15:33:38 +08:00
“xxq250” ccbbab0741 fixed 项目优化排序 2022-11-08 15:33:12 +08:00
yystopf 2b2a44831e Merge branch 'develop' into standalone_develop 2022-11-08 13:41:00 +08:00
yystopf 3e5c1da2c5 新增:反馈意见模型及接口 2022-11-08 13:27:46 +08:00
viletyy 0a06b2098b Merge branch 'develop' into standalone_develop 2022-11-02 14:22:14 +08:00
yystopf 07aefa79eb 更改:项目后台管理移除精选设置 2022-11-02 14:21:49 +08:00
“xxq250” 79d46231ba fixed 项目搜索仅公开项目,platform=forge 2022-11-01 18:14:08 +08:00
“xxq250” 2618dc5798 fixed 项目搜索仅公开项目 2022-11-01 17:51:46 +08:00
“xxq250” 2bd723fc64 fixed 项目搜索先es search服务容错 2022-11-01 17:37:25 +08:00
“xxq250” 79dae01a69 fixed 项目搜索先es search 中文 2022-11-01 17:31:33 +08:00
“xxq250” 63ea4808c9 fixed 项目搜索先es search 中文 2022-11-01 17:30:01 +08:00
“xxq250” c7a6d78c15 fixed 项目搜索先es search 2022-11-01 17:27:31 +08:00
“xxq250” 3ff3502bbc fixed 项目搜索先es search 2022-11-01 17:25:28 +08:00
viletyy 7f91ebb509 Merge branch 'develop' into standalone_develop 2022-11-01 15:29:30 +08:00
yystopf 423d5a9316 修复:同步项目权限到组织时需预先判断是否存在于团队中 2022-11-01 15:29:07 +08:00
viletyy 2548b0e9c0 Merge branch 'develop' into standalone_develop 2022-10-27 17:58:27 +08:00
yystopf 9664ca001e 新增: 邮箱验证码重新发送后之前的验证码需设置为无效 2022-10-27 17:57:55 +08:00
viletyy d665d0edb1 Merge branch 'develop' into standalone_develop 2022-10-27 10:49:05 +08:00
yystopf e15809c186 修复:无法正常转移的问题 2022-10-27 10:48:24 +08:00
viletyy 4235c3ee63 Merge branch 'develop' into standalone_develop 2022-10-27 09:56:14 +08:00
yystopf 7d4c0df691 修复 2022-10-27 09:55:55 +08:00
viletyy 761c311a88 Merge branch 'develop' into standalone_develop 2022-10-27 09:30:09 +08:00
yystopf e72dfa4973 修复:项目迁移设置权限在更改拥有者之后 2022-10-27 09:28:52 +08:00
viletyy 893f6c04a5 Merge branch 'develop' into standalone_develop 2022-10-26 14:58:25 +08:00
yystopf 3d5b2e76d7 修复:update_column无法触发count_cache 2022-10-26 14:58:04 +08:00
viletyy 6e9962e0da Merge branch 'develop' into standalone_develop 2022-10-26 14:50:23 +08:00
yystopf 8b14ee3c72 修复:更改组织下项目权限同时更改组织下权限同步至gitea 2022-10-26 14:49:40 +08:00
“xxq250” a4c892ec0a fixed cloudIDE saas定制api 2022-10-25 11:19:59 +08:00
“xxq250” 2945570a51 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-10-21 17:44:06 +08:00
“xxq250” 969cbcfe60 fixed users/me返回email,用于三方登录 2022-10-21 17:44:02 +08:00
viletyy 4d61127e49 Merge branch 'develop' into standalone_develop 2022-10-21 15:29:20 +08:00
yystopf 3f7366fbcd 修复:更改用户通知邮箱只能自己改自己的 2022-10-21 15:28:48 +08:00
viletyy 97a661cd95 Merge branch 'develop' into standalone_develop 2022-10-21 15:07:48 +08:00
yystopf cfdbc5a682 修复 2022-10-21 15:07:31 +08:00
viletyy f557994f8a Merge branch 'develop' into standalone_develop 2022-10-21 15:04:52 +08:00
yystopf 9b880e3209 修复 2022-10-21 15:04:26 +08:00
viletyy 04642497df Merge branch 'develop' into standalone_develop 2022-10-21 14:43:08 +08:00
yystopf c2ef23b746 修复 2022-10-21 14:42:51 +08:00
viletyy 292167b47e Merge branch 'develop' into standalone_develop 2022-10-21 14:41:09 +08:00
yystopf 8a33ea6707 修复 2022-10-21 14:40:43 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf 9ee4c85b7c 更改:验证返回status以及万能验证码 2022-10-21 14:31:32 +08:00
“xxq250” 4cc4ed5864 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-10-21 09:42:27 +08:00
“xxq250” 0a5dd2f1ee ssh公钥允许token请求 2022-10-21 09:42:21 +08:00
yystopf e9b23d6577 更改:合并请求代码冲突提示语更改 2022-10-19 16:17:44 +08:00
yystopf 64d9c334ce 修复:项目语言验证信息统一 2022-10-19 15:18:15 +08:00
yystopf cad7e24299 修复:项目列表表头样式 2022-10-18 15:53:37 +08:00
yystopf 3b15dd84fc 新增:标签列表返回总数 2022-10-18 14:52:15 +08:00
yystopf 58a43a8b80 更改:合并请求和issue仅加载开启中的里程碑 2022-10-18 13:43:16 +08:00
yystopf e25231738a 新增:标签名字列表 2022-10-18 13:32:57 +08:00
yystopf 35965f542a 新增:标签名字列表 2022-10-18 13:31:12 +08:00
yystopf fa48e3f5ca 修复:许可证和忽略文件内容为空表单提示 2022-10-18 11:14:35 +08:00
yystopf 13e2738fb5 新增:列表页新增only_watched参数 2022-10-17 17:37:03 +08:00
viletyy a494a905fa Merge branch 'develop' into standalone_develop 2022-10-17 13:16:49 +08:00
yystopf 30437d828c 新增:项目git忽略文件新增验证 2022-10-17 13:16:22 +08:00
yystopf dcc7ab6738 更改:项目分类去掉图片上传 2022-10-17 13:01:08 +08:00
yystopf 5196f33f24 新增:项目许可证新增验证 2022-10-17 12:57:24 +08:00
yystopf 8807be6e4d 新增:项目语言新增唯一性验证 2022-10-17 10:52:57 +08:00
yystopf 8d41c27044 更改:项目成员添加提示 2022-10-17 10:42:40 +08:00
viletyy 77ec7e5a69 Merge branch 'develop' into standalone_develop 2022-10-17 10:25:47 +08:00
yystopf 53fe554d1e 更改:后台管理表头样式 2022-10-17 10:25:17 +08:00
“xxq250” 4e02dbe06b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	app/controllers/attachments_controller.rb
2022-10-17 10:14:13 +08:00
“xxq250” 620ddff9bb fixed issue评论附件权限 2022-10-17 10:13:30 +08:00
viletyy 732d1a1adb Merge branch 'develop' into standalone_develop 2022-10-15 11:29:58 +08:00