 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 |
|
yystopf
|
25afedcdfd
|
新增: 批量更改文件
|
2022-07-19 16:47:01 +08:00 |
|
yystopf
|
1882120df3
|
新增: 获取单文件blame信息
|
2022-07-19 11:14:50 +08:00 |
|
yystopf
|
274cd81655
|
新增：获取commit列表
|
2022-07-19 10:41:25 +08:00 |
|
yystopf
|
92be882e54
|
Merge branch 'develop' into standalone_develop
|
2022-07-18 15:40:42 +08:00 |
|
yystopf
|
6273349334
|
新增: 获取比较blame、token以及异常捕获处理
|
2022-07-18 15:39:51 +08:00 |
|
yystopf
|
f161349bd7
|
Merge branch 'develop' into standalone_develop
|
2022-07-18 11:19:23 +08:00 |
|
yystopf
|
52701d1c2f
|
Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop
|
2022-07-18 11:18:35 +08:00 |
|
yystopf
|
b248f770f1
|
新增：获取单个提交的blame信息接口以及文档
|
2022-07-18 11:18:29 +08:00 |
xiaoxiaoqiong
|
ed0655452c
|
增加从webhook接收仓库日志记录
|
2022-07-18 09:34:56 +08:00 |
|
yystopf
|
6de6e34a4e
|
Merge branch 'develop' into standalone_develop
|
2022-07-15 17:03:31 +08:00 |
|
yystopf
|
0dd062ce1c
|
新增: blobs和文件树接口及文档
|
2022-07-15 17:03:18 +08:00 |
|
yystopf
|
63cd6bb0a4
|
merge from develop
|
2022-07-15 14:04:02 +08:00 |
|
yystopf
|
24d83133e7
|
新增: 创建分支接口
|
2022-07-15 14:02:48 +08:00 |
|
yystopf
|
4ed3a9d478
|
修复:cherry pick doorkeeper配置
|
2022-07-14 18:13:06 +08:00 |
|
yystopf
|
d7a970e7d5
|
修复: oauth2 验证统一改为application控制器里的user_setup
|
2022-07-11 18:51:07 +08:00 |
|
xiaoxiaoqiong
|
915e689ef9
|
oauth2 增加client方式
|
2022-07-11 18:19:08 +08:00 |
|
xiaoxiaoqiong
|
e919b03e90
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-07-11 15:52:57 +08:00 |
|
xiaoxiaoqiong
|
4fa1a433fa
|
增加从webhook接收仓库日志记录
|
2022-07-11 15:52:38 +08:00 |
|
yystopf
|
f8b63ff02e
|
merge from develop
|
2022-07-07 13:47:47 +08:00 |
|
xiaoxiaoqiong
|
d1d7ae5b7f
|
fixed oauth2 管理员配置
|
2022-07-06 10:35:32 +08:00 |
|
xiaoxiaoqiong
|
eb0bda81e9
|
fixed oauth2 管理员配置
|
2022-07-06 10:30:23 +08:00 |
|
xiaoxiaoqiong
|
c50913495e
|
fixed oauth2 管理员配置
|
2022-07-06 10:27:35 +08:00 |
|
xiaoxiaoqiong
|
1bc7c48876
|
fixed oauth2 code授权方式登录default_scopes
|
2022-07-05 16:30:11 +08:00 |
|
xiaoxiaoqiong
|
14dd7a3b60
|
fixed oauth2 code授权方式登录
|
2022-07-05 15:27:10 +08:00 |
|
xiaoxiaoqiong
|
959191c8bb
|
fixed oauth2 code授权方式登录
|
2022-07-05 15:19:30 +08:00 |
|
xiaoxiaoqiong
|
abfefdf8eb
|
oauth2 code授权方式登录
|
2022-07-05 14:38:11 +08:00 |
|
yystopf
|
76cc185a1d
|
新增: 合并请求审核model
|
2022-06-29 17:16:29 +08:00 |
|
xiaoxiaoqiong
|
bdaca48fde
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-06-27 18:05:52 +08:00 |
|
xiaoxiaoqiong
|
41eedff819
|
auth token 接入验证登录接口
|
2022-06-27 18:05:46 +08:00 |
|
yystopf
|
fb2e2d9534
|
merge from develop
|
2022-06-24 14:18:53 +08:00 |
|
yystopf
|
fe58175ee0
|
新增: webhooks使用token访问的接口
|
2022-06-23 16:14:00 +08:00 |