Commit Graph

679 Commits

Author SHA1 Message Date
xxq250 66004f3457 gitea-hat-client log 2023-06-09 09:39:07 +08:00
xxq250 58354dc944 Merge branch 'pre_trustie_server' into trustie_server 2023-05-12 17:06:36 +08:00
chenjing 3d0cd96e32 issue index to name 2023-05-11 09:00:09 +08:00
xxq250 f07ae49246 整理配置文件 2023-05-10 17:31:57 +08:00
xxq250 69f8b43186 Merge branch 'master' of https://gitlink.org.cn/Gitlink/forgeplus into standalone_develop 2023-05-10 16:15:51 +08:00
xxq250 b3f713e050 整理配置文件 2023-05-10 16:12:04 +08:00
xxq250 4741a50b9e Merge pull request '整理配置文件和脚本细节' (#49) from standalone_develop into trustie_server 2023-05-10 14:38:04 +08:00
xxq250 bd0a195869 整理配置文件和脚本细节 2023-05-10 14:30:18 +08:00
xxq250 0d2d38d537 fixed 头歌快速登录用户绑定 2023-05-09 10:25:36 +08:00
xxq250 55581be46b fixed 头歌快速登录回调重复 2023-05-09 10:11:43 +08:00
xxq250 23e0d869c6 Merge branch 'standalone_develop' into trustie_server 2023-05-08 17:15:46 +08:00
xxq250 5343fcf29e 项目标识提示文案统一 2023-05-08 16:40:57 +08:00
xxq250 e6b3634b40 Merge branch 'standalone_develop' into trustie_server 2023-05-08 15:36:58 +08:00
xxq250 79f349d634 Merge pull request '新增replacefile接口' (#45) from KingChan/forgeplus:chenjing into standalone_develop 2023-05-05 17:20:27 +08:00
chenjing 769f888f3e replace_file 2023-05-06 01:15:00 +08:00
xxq250 fb745453c2 增加sidekiq线程数 2023-04-25 17:22:25 +08:00
yystopf d9fabdc183 Merge branch 'pre_trustie_server' into trustie_server 2023-04-21 15:37:36 +08:00
yystopf 1a6500d686 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-21 15:37:20 +08:00
yystopf e9da21bccf 新增:openkylin_sign 签署协议 2023-04-21 09:23:30 +08:00
yystopf d3a6b373a6 Merge branch 'pre_trustie_server' into trustie_server 2023-04-20 11:44:43 +08:00
yystopf 0ccd6790c3 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-20 11:43:45 +08:00
yystopf 3be157c51b Merge branch 'develop' into standalone_develop 2023-04-20 11:32:06 +08:00
yystopf 881acd2480 新增:用户签署cla字段 2023-04-20 11:31:34 +08:00
yystopf f0b3a54837 Merge branch 'pre_trustie_server' into trustie_server 2023-04-19 18:11:46 +08:00
yystopf 79b5e4ec93 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-19 18:11:37 +08:00
yystopf 9f63ad700e Merge branch 'develop' into standalone_develop 2023-04-19 18:11:22 +08:00
yystopf e815b0a8ac 更改:检查用户id的路由 2023-04-19 18:11:11 +08:00
yystopf 087d9c0aec Merge branch 'pre_trustie_server' into trustie_server 2023-04-19 16:45:52 +08:00
yystopf fed37877f0 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-19 16:45:38 +08:00
yystopf 5b7f19bb79 Merge branch 'develop' into standalone_develop 2023-04-19 16:45:24 +08:00
yystopf a38ebeaca2 新增:检查用户id的接口 2023-04-19 16:45:10 +08:00
xxq250 8bc4d586cf Merge branch 'pre_trustie_server' into trustie_server 2023-04-18 10:12:51 +08:00
xxq250 46cf275a81 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-18 09:57:18 +08:00
yystopf 95018c80a7 merge from develop 2023-04-18 09:45:56 +08:00
yystopf f078c59cf4 新增:项目标记已存在validate 2023-04-18 09:44:34 +08:00
xxq250 e140fb536c 文案 2023-04-17 18:38:27 +08:00
yystopf 450012b75b Merge branch 'pre_trustie_server' into trustie_server 2023-04-17 13:55:14 +08:00
yystopf 130c922bd1 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-17 13:54:58 +08:00
yystopf 2ca5a908aa Merge branch 'develop' into standalone_develop 2023-04-17 11:36:04 +08:00
yystopf 578acd7845 新增:贡献者代码行接口 2023-04-17 11:35:28 +08:00
xxq250 7b64813471 Merge branch 'pre_trustie_server' into trustie_server 2023-04-17 11:09:16 +08:00
xxq250 5a2659253e Merge branch 'standalone_develop' into pre_trustie_server 2023-04-17 11:08:51 +08:00
xxq250 1be61f97cf commit加入到项目动态,路由调整 2023-04-17 10:49:30 +08:00
xxq250 0a50da33a9 commit加入到项目动态,路由调整 2023-04-17 10:49:17 +08:00
xxq250 1baee3efb6 commit加入到项目动态,路由调整 2023-04-17 10:44:50 +08:00
xxq250 0a693a77b8 commit加入到项目动态,并显示详情 2023-04-17 10:38:10 +08:00
xxq250 cba729f482 项目动态接口 2023-04-17 10:27:50 +08:00
yystopf 44226dc981 Merge branch 'pre_trustie_server' into trustie_server 2023-04-14 15:46:53 +08:00
yystopf abd4531382 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-14 15:41:21 +08:00
yystopf 71052c0f7c Merge branch 'develop' into standalone_develop 2023-04-14 15:41:00 +08:00
yystopf 348f7b71ba Merge pull request 'webhook自定义事件' (#43) from feature_custom_webhook into develop 2023-04-14 11:39:47 +08:00
yystopf 3888e8c06a Merge branch 'develop' into standalone_develop 2023-04-12 14:51:36 +08:00
yystopf 0830850518 更改:下载文件以及查看文件逻辑 2023-04-12 14:51:27 +08:00
yystopf b4672929dc 新增:触发webhook的job 2023-04-11 10:16:38 +08:00
xxq250 5eff025f62 组织首页改版,增加精选、新闻 2023-04-10 15:09:41 +08:00
yystopf dfd4ff55a5 Merge branch 'pre_trustie_server' into trustie_server 2023-04-07 17:23:17 +08:00
yystopf 910e66a3ca Merge branch 'standalone_develop' into pre_trustie_server 2023-04-07 17:22:59 +08:00
yystopf 3c70bfe267 Merge pull request '项目搜索标签相关' (#42) from yystopf/forgeplus:hh_project_topic into develop 2023-04-07 17:22:54 +08:00
yystopf f5ec783175 Merge branch 'develop' into standalone_develop 2023-04-07 17:22:44 +08:00
yystopf b3de601527 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-07 17:18:26 +08:00
yystopf 153243fa9c Merge branch 'develop' into standalone_develop 2023-04-07 10:35:52 +08:00
yystopf 39a851b74b 更改 2023-04-07 10:35:44 +08:00
yystopf 78cf3debbb Merge branch 'develop' into standalone_develop 2023-04-07 10:33:34 +08:00
yystopf 4329236237 修改:router匹配.json 2023-04-07 10:32:57 +08:00
yystopf af964ee154 Merge branch 'develop' into standalone_develop 2023-04-06 16:47:36 +08:00
yystopf 63196e018a 更改:创建项目标识正则规则以及带.仓库无法正常显示的问题 2023-04-06 16:47:23 +08:00
yystopf 7a6d549fa0 新增:项目搜索标签删除逻辑 2023-04-06 15:40:01 +08:00
yystopf b336a1f334 新增:项目搜索标签功能 2023-04-06 14:31:59 +08:00
xxq250 c2cda6a4a2 fixed bot安装仓库列表,与github差异,所以取安装用户和bot对应所有的仓库 2023-04-04 15:30:39 +08:00
yystopf e31caac48f Merge branch 'pre_trustie_server' into trustie_server 2023-03-30 17:38:18 +08:00
yystopf e09a360e5e Merge branch 'standalone_develop' into pre_trustie_server 2023-03-30 17:33:58 +08:00
yystopf 96c32c072a Merge branch 'develop' into standalone_develop 2023-03-30 14:27:55 +08:00
xxq250 0e009202fc 同步bot信息,回调地址和名称 2023-03-29 17:58:52 +08:00
xxq250 7045fb3960 oauth 回调地址允许非https 2023-03-29 16:57:19 +08:00
xxq250 f0dca4c0c1 softbot补充和调整接口 2023-03-29 14:14:25 +08:00
xxq250 38ddb850c1 重写user.gitea_token,管理员token,yml配置 2023-03-28 14:36:58 +08:00
chenjing 7da1c7e13b add admin user view button for gitea token reset 2023-03-20 15:25:47 +08:00
yystopf 718457888d 更新:client调用以及gitea_client日志文件设置 2023-03-14 17:34:58 +08:00
yystopf 8e9c2232b0 新增:新版gitea路由请求地址 2023-03-14 17:34:57 +08:00
yystopf 5a3357a297 Merge branch 'pre_trustie_server' into trustie_server 2023-03-10 16:46:28 +08:00
yystopf 09e91c443d Merge branch 'standalone_develop' into pre_trustie_server 2023-03-10 16:37:57 +08:00
yystopf b44ab1e39e fix 2023-03-10 14:48:53 +08:00
xxq250 9a92a8c58c Merge branch 'pre_trustie_server' into trustie_server 2023-03-03 10:27:39 +08:00
chenjing 8e547c178a 后台组织管理 2023-03-02 17:54:34 +08:00
xxq250 b1c10d66f9 区块链确权相关 2023-03-02 13:49:50 +08:00
yystopf ce70378fc3 Merge branch 'develop' into standalone_develop 2023-03-01 16:29:45 +08:00
yystopf cbb0a639b2 Merge pull request '平台issue模块升级相关' (#24) from yystopf/forgeplus:hh_issue_upgrade into develop 2023-03-01 16:29:19 +08:00
yystopf dc9ca7d0ca 更改:疑修param为index以及新增统计标签下合并请求数量 2023-02-23 15:24:30 +08:00
chenjing b9e2a3736c admins org list 2023-02-22 09:24:11 +08:00
yystopf b85913e485 新增:疑修操作记录、评论列表接口以及更新疑修无法产生操作记录修复 2023-02-17 16:11:39 +08:00
xxq250 81aa786121 Merge branch 'pre_trustie_server' into trustie_server 2023-02-17 15:01:58 +08:00
xxq250 a35e24468c Merge branch 'standalone_develop' into pre_trustie_server 2023-02-17 15:01:20 +08:00
xxq250 3c51d69555 调整Bot授权接口 2023-02-16 09:57:25 +08:00
xxq250 6fe16c7c82 调整Bot授权接口 2023-02-16 09:19:37 +08:00
xxq250 1cd43de75b 增加Bot授权相关 2023-02-15 18:37:36 +08:00
yystopf 2a8e0d2be8 新增:标记管理接口,以及列表下拉框搜索参数 2023-02-15 17:24:36 +08:00
yystopf 404a6a00e7 新增:issue编辑删除接口 2023-02-14 23:19:17 +08:00
yystopf 11cbe170bc Merge branch 'pre_trustie_server' into trustie_server 2023-02-10 16:21:23 +08:00
yystopf e423e8d20b merge from stadalone_develop 2023-02-10 16:20:47 +08:00
yystopf 3a14aa10ce Merge branch 'develop' into standalone_develop 2023-02-10 13:44:43 +08:00
yystopf 934b42f1a1 新增:优先级和所有仓库成员接口 2023-02-09 16:20:16 +08:00
yystopf 1aeed8236d 更改:部分接口传参以及路由修复 2023-02-09 09:29:02 +08:00
yystopf fe972f1141 新增:项目标记接口 2023-02-08 10:15:29 +08:00
yystopf 587facfb3d 新增:发布人和状态接口 2023-02-07 17:12:43 +08:00
yystopf 7c911f5b86 新增:路由匹配特殊符号 2023-02-06 09:49:36 +08:00
yystopf 2772b97e32 新增:标签列表和删除接口 2023-02-03 18:03:57 +08:00
yystopf 8b90164247 新增:删除分支接口 2023-02-03 15:03:59 +08:00
yystopf a0f386950b Merge branch 'pre_trustie_server' into trustie_server 2023-02-03 14:12:23 +08:00
yystopf 8e94b28ba8 Merge branch 'standalone_develop' into pre_trustie_server 2023-02-03 14:11:05 +08:00
yystopf f2cdba29ea 新增:更改默认分支接口 2023-02-03 13:45:32 +08:00
yystopf 08d8abd163 Merge branch 'develop' into standalone_develop 2023-02-01 14:26:52 +08:00
yystopf 0229d99e74 新增:后台管理排行榜数据 2023-02-01 14:25:55 +08:00
xxq250 fbc8d68996 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-26 11:31:11 +08:00
xxq250 911fb2712a fixed qq认证密钥读取错误 2022-12-09 17:55:09 +08:00
xxq250 309ba151be fixed qq认证密钥读取错误 2022-12-09 17:54:34 +08:00
xxq250 98fb7308a6 Merge branch 'pre_trustie_server' into trustie_server 2022-12-08 14:54:06 +08:00
xxq250 19b6737260 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-08 14:53:33 +08:00
xxq250 1aab51104f fixed 第三方授权登录配置支持Get方法 2022-12-08 14:35:46 +08:00
yystopf 983f488177 fixed 第三方授权登录配置支持Get方法 2022-12-08 14:31:20 +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 ee27c90205 fixed qq命名调整,方便封装 2022-12-06 10:24:48 +08:00
xxq250 73d89a89e2 fixed 第三方授权登录配置url 2022-12-06 10:12:41 +08:00
xxq250 daf7514afe fixed 第三方授权登录配置 2022-12-05 17:46:21 +08:00
xxq250 e41adbc4a8 fixed 第三方授权gitee登录 2022-12-05 15:50:57 +08:00
xxq250 ed7c5b0a2d fixed 第三方授权gitee登录 2022-12-05 15:49:59 +08:00
xxq250 ae9f98dae5 Merge branch 'pre_trustie_server' into trustie_server 2022-12-02 16:07:28 +08:00
xxq250 86cd8309c4 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-02 16:06:53 +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
xxq250 604f5329e2 Merge branch 'standalone_develop' into pre_trustie_server 2022-11-25 16:07:40 +08:00
yystopf 22450c2748 Merge branch 'pre_trustie_server' into trustie_server 2022-11-25 15:59:12 +08:00
yystopf 04e8db8b3e Merge branch 'standalone_develop' into pre_trustie_server 2022-11-25 15:39:53 +08:00
xxq250 4e244bed3a 增加手机验证码校验 2022-11-24 14:28:49 +08:00
xxq250 fd2b20ed87 个人资料修改手机号 2022-11-24 11:09:58 +08:00
“xxq250” 5d2c27ad84 Merge branch 'pre_trustie_server' into trustie_server 2022-11-11 14:58:05 +08:00
“xxq250” a66920089b fixed 合并代码 2022-11-11 14:56:37 +08:00
yystopf 4687a51327 Merge branch 'pre_trustie_server' into trustie_server 2022-11-11 14:55:53 +08:00
yystopf 7cf556809d merge from stadalone_develop 2022-11-11 14:55:41 +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 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 33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
yystopf 83b46fcb50 新增:用户反馈意见后台管理逻辑 2022-11-09 11:37: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 14831be88b Merge branch 'pre_trustie_server' into trustie_server 2022-10-28 16:08:59 +08:00
viletyy db02c1ec6b Merge branch 'standalone_develop' into pre_trustie_server 2022-10-27 13:51:07 +08:00
“xxq250” 47aba3528d Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-10-21 14:48:37 +08:00
“xxq250” b80b89e81d fixed 支持refresh_token 2022-10-21 14:48:33 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf 64d9c334ce 修复:项目语言验证信息统一 2022-10-19 15:18:15 +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 5196f33f24 新增:项目许可证新增验证 2022-10-17 12:57:24 +08:00
“xxq250” cc74d53070 Merge branch 'pre_trustie_server' into trustie_server
# Conflicts:
#	lib/tasks/update_educoder_user.rake
2022-10-14 12:03:32 +08:00
“xxq250” 7304e87a11 Merge branch 'standalone_develop' into pre_trustie_server 2022-10-14 12:01:46 +08:00
“xxq250” e7bbe252de cloudIDE saas定制api 2022-10-12 15:37:22 +08:00
viletyy 3d475fdedd Merge branch 'develop' into standalone_develop 2022-09-29 13:59:04 +08:00
yystopf 2cde13eabb 新增:接口测试以及功能测试 2022-09-29 12:05:57 +08:00
“xxq250” 9a19046e96 Merge branch 'pre_trustie_server' into trustie_server 2022-09-07 11:15:52 +08:00
“xxq250” 9c5b899205 Merge branch 'develop' into pre_trustie_server 2022-09-07 11:14:34 +08:00
yystopf a0413be4b9 Merge branch 'develop' into standalone_develop 2022-09-06 14:58:02 +08:00
yystopf a438ab6f3e 新增:提示语locale配置 2022-09-06 14:57:54 +08:00
“xxq250” 7c7369730b Merge branch 'pre_trustie_server' into trustie_server 2022-09-02 16:10:30 +08:00
“xxq250” 9e4100bfab Merge branch 'standalone_develop' into pre_trustie_server 2022-09-02 16:02:23 +08:00
“xxq250” d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
2022-08-30 18:14:17 +08:00
“xxq250” 4b7c58b13f Merge remote-tracking branch 'origin/develop' into develop 2022-08-30 18:10:33 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
yystopf 43a41399ac 新增:添加全部或者移除全部团队项目 2022-08-30 10:35:43 +08:00
yystopf 0f41cabe71 新增:添加全部或者移除全部团队项目 2022-08-30 10:23:35 +08:00
yystopf 3445838e80 Merge branch 'pre_trustie_server' into trustie_server 2022-08-24 17:56:48 +08:00
“xxq250” 092e3e2546 Merge branch 'standalone_develop' into pre_trustie_server 2022-08-12 15:44:45 +08:00
“xxq250” eac06382fe fixed reposyncer logs routes 2022-08-05 11:41:13 +08:00
“xxq250” 9d385845a6 fixed 评审标记为已读和未读 2022-08-02 15:27:16 +08:00
yystopf 1410ba144c Merge branch 'pre_trustie_server' into trustie_server 2022-07-29 18:53:52 +08:00
yystopf 275456bf5f Merge branch 'standalone_develop' into pre_trustie_server 2022-07-29 18:53:33 +08:00
“xxq250” 321f367e3e Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-07-28 16:46:27 +08:00
“xxq250” 4ccf8ea5ff CloudIDEA文件标记已读未读 2022-07-28 16:42:21 +08:00
yystopf 445ae6fbc3 merge from develop 2022-07-27 16:12:12 +08:00
yystopf d6b5dc326a 新增: 评论相关api根据需求重写 2022-07-27 14:52:49 +08:00
“xxq250” 6f9db6b314 Merge remote-tracking branch 'origin/develop' into standalone_develop
# Conflicts:
#	app/models/pull_request.rb
2022-07-26 10:49:49 +08:00
“xxq250” 5877474f59 Merge remote-tracking branch 'origin/develop' into develop 2022-07-26 10:44:21 +08:00
“xxq250” 1bbde165c2 reposyncer同步仓库接口 2022-07-26 10:44:12 +08:00
yystopf 5463c22518 新增: 合并请求创建审查接口 2022-07-25 17:28:38 +08:00
yystopf 56b1110e4d Merge branch 'develop' into standalone_develop 2022-07-22 18:10:09 +08:00
yystopf 0df1e5fdd0 新增:合并请求版本列表和diff接口文档 2022-07-22 18:08:16 +08:00
yystopf 8ba70a33be 新增: pr版本列表和diff接口 2022-07-22 17:33:08 +08:00
“xxq250” de538364f4 Merge branch 'pre_trustie_server' into trustie_server 2022-07-21 17:12:03 +08:00
“xxq250” bacac130ea Merge branch 'standalone_develop' into pre_trustie_server 2022-07-21 17:11:32 +08:00
yystopf 35a0307667 merge from pre_trustie_server 2022-07-21 10:43:58 +08:00
“xxq250” 2ddf8ebf09 fixed 修改跨域方式trustie.net 2022-07-19 18:05:53 +08:00
“xxq250” cb0112fde8 fixed 修改跨域方式 2022-07-19 17:58:52 +08:00
“xxq250” b7a93137db fixed 修改跨域方式 2022-07-19 17:56:06 +08:00
“xxq250” 4e51ad0cf3 fixed 修改跨域方式 2022-07-19 17:51:56 +08:00
“xxq250” c14cfdeca7 fixed 修改跨域方式 2022-07-19 17:48:32 +08:00
“xxq250” 0c34e186ab fixed 修改跨域方式 2022-07-19 17:47:45 +08:00
yystopf 545ec28561 Merge branch 'develop' into standalone_develop 2022-07-19 16:47:19 +08:00