Commit Graph

381 Commits

Author SHA1 Message Date
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