Commit Graph

437 Commits

Author SHA1 Message Date
xxq250 4ad6b265c7 构建流水线json测试 2024-05-22 16:11:21 +08:00
xxq250 47c4d30cf7 构建流水线节点icon 2024-05-22 15:47:44 +08:00
xxq250 656c446471 构建流水线,项目开发者权限 2024-05-22 14:45:53 +08:00
xxq250 eb5c2a6b8b 构建流水线 2024-05-22 14:35:22 +08:00
yystopf caa7acc654 新增:开源大赛战队同步保存至gitlink 2024-05-22 11:05:40 +08:00
xxq250 6f25498c29 fixed issues_count统计不包含周报 2024-05-20 08:46:33 +08:00
xxq250 785869d48a fixed 图形化流水线构建细节调整 2024-05-17 15:26:58 +08:00
xxq250 ddaa6f7aec fixed 图形化流水线构建 2024-05-16 09:42:48 +08:00
yystopf 697f022ab1 Merge branch 'standalone_develop' into pre_trustie_server 2024-05-15 16:22:06 +08:00
yystopf 4fbf7a52cd 更改:同步记录分支列表取同步时间最新的数据 2024-05-15 15:00:17 +08:00
yystopf 5559330706 新增:获取github、gitee分支接口 2024-05-14 11:05:00 +08:00
xxq250 ddf754485a Merge branch 'standalone_develop' into pm_project_develop 2024-05-13 09:24:27 +08:00
yystopf 6155187550 Merge branch 'standalone_develop' into pre_trustie_server 2024-05-11 16:28:10 +08:00
yystopf 7e654331db 更改:webhook推送action权限访问移除 2024-05-11 16:02:09 +08:00
yystopf ba2e03287d Merge branch 'standalone_develop' into pre_trustie_server 2024-05-11 15:03:14 +08:00
yystopf 362aee1a35 更改:github webhook特殊处理 2024-05-11 11:43:23 +08:00
yystopf 35f1b840a6 Merge branch 'standalone_develop' into pre_trustie_server 2024-05-10 15:11:51 +08:00
yystopf d5c8fe6e56 更改:分支列表排序 2024-05-09 14:13:51 +08:00
yystopf e0b1d6fbb6 新增:历史记录分页 2024-05-09 13:41:46 +08:00
yystopf 2a3f2fb620 新增:历史记录分页 2024-05-09 09:11:51 +08:00
yystopf a98fe05599 新增:加入同步方向逻辑 2024-05-08 11:13:02 +08:00
yystopf 08a5028006 更改:webhook优化 2024-05-08 09:45:04 +08:00
yystopf f0622b6261 更改:触发webhook新加参数以区别不同来源 2024-05-07 14:54:31 +08:00
yystopf 61f893ba0a 更改:解绑操作放在回调里 2024-05-06 13:56:45 +08:00
yystopf 4cacc91130 更改:开始停止同步加一个参数以及webhook触发晚五秒 2024-05-06 10:01:52 +08:00
yystopf db40a21b04 新增:同步仓库绑定webhook 2024-04-29 15:19:07 +08:00
xxq250 9835f4f84f Merge branch 'standalone_develop' into pm_project_develop
# Conflicts:
#	app/models/attachment.rb
#	app/views/api/v1/attachments/_simple_detail.json.jbuilder
2024-04-29 09:11:08 +08:00
yystopf 1c1cceabbe 修复 2024-04-25 17:04:39 +08:00
yystopf d5f841441b 修复:绑定分支变量名更正以及日志排序 2024-04-25 17:00:01 +08:00
yystopf e556e53f54 新增:同步仓库延迟机制移除 2024-04-25 15:46:19 +08:00
yystopf 5af5219f97 新增:同步仓库延迟机制 2024-04-25 15:41:31 +08:00
yystopf ae4ad29821 修复:group by sync repository 2024-04-25 15:14:00 +08:00
yystopf 31ede9c69d 修复:group by sync repository 2024-04-25 14:45:26 +08:00
yystopf 589d2ae2e8 新增:记录external_token 2024-04-24 17:06:45 +08:00
yystopf a273c1cfcf 新增:同步仓库更新信息接口 2024-04-24 16:11:32 +08:00
yystopf 9c32cd8769 新增:exter_token和inter_token 2024-04-24 15:17:13 +08:00
yystopf 81d39588c6 新增:分支列表分支信息以及gitlink admin token 2024-04-23 17:42:26 +08:00
yystopf 946b449d9d 新增:更改同步分支状态首次同步方向 2024-04-22 15:47:20 +08:00
yystopf 0f5066f943 新增:分支同步历史记录以及创建同步分支接口 2024-04-19 17:26:20 +08:00
yystopf 565c1c1cab 新增:分支列表分支查询以及排序等 2024-04-18 16:14:39 +08:00
yystopf 6f458e0e79 新增:解绑和更改状态接口 2024-04-18 15:20:19 +08:00
yystopf 8b1ef7bf15 新增:仓库列表和分支列表 2024-04-17 10:54:23 +08:00
yystopf 7271603248 新增:同步时间和创建数据返回 2024-04-16 17:53:35 +08:00
yystopf e358e3b6f6 新增:绑定仓库和webhook触发地址 2024-04-16 17:15:22 +08:00
yystopf f9b1aac07e Merge branch 'standalone_develop' into pre_trustie_server 2024-04-15 08:52:18 +08:00
yystopf d2d602ab89 新增:根据项目id查询数据集接口 2024-04-12 10:24:05 +08:00
yystopf 493de92920 Merge branch 'standalone_develop' into pre_trustie_server 2024-04-07 17:25:01 +08:00
yystopf 03c9df3f92 更改:访问菜单的权限 2024-04-07 14:38:52 +08:00
yystopf 7440a79cc4 修复:unit不包含dataset正确返回以及字段验证 2024-04-07 14:28:42 +08:00
yystopf 7d560032b0 新增:数据集文件分页 2024-04-03 16:33:07 +08:00
yystopf 47c4af8ea1 新增:数据集新字段license_id和paper_content 2024-04-03 10:15:11 +08:00
yystopf dbfbee78fa 新增:数据集部分接口 2024-04-01 17:23:56 +08:00
yystopf 59a6e3121e Merge branch 'standalone_develop' into pre_trustie_server 2024-03-27 17:19:07 +08:00
yystopf d3b552337e 修复 2024-03-27 16:18:31 +08:00
yystopf a1ba0b596a 更改:issue与我相关可自定义用户 2024-03-27 16:04:02 +08:00
yystopf 9fbd0a470e 新增:issue更新时间筛选 2024-03-26 17:31:47 +08:00
yystopf d7a414aa1f Merge branch 'develop' into standalone_develop 2024-03-26 13:52:34 +08:00
yystopf 2d264bf52b 新增:最新提交加入clone地址 2024-03-26 13:52:21 +08:00
yystopf 51266553f8 Merge branch 'standalone_develop' into pre_trustie_server 2024-03-22 13:44:14 +08:00
yystopf 721116467b Merge branch 'develop' into standalone_develop 2024-03-20 09:13:38 +08:00
yystopf fd6f904f7e 新增:最近提交列表message搜索 2024-03-20 09:13:29 +08:00
yystopf c7bdaa8962 Merge branch 'standalone_develop' into pm_project_develop 2024-03-06 16:44:45 +08:00
yystopf 404abe3b2a Merge branch 'develop' into standalone_develop 2024-03-06 10:47:24 +08:00
yystopf dd96e1e2da 修复:流水线文件不存在报错 2024-03-06 10:46:54 +08:00
yystopf be531eb283 Merge branch 'standalone_develop' into pm_project_develop 2024-03-06 08:56:37 +08:00
yystopf 1894f00a2d Merge branch 'develop' into standalone_develop 2024-03-05 10:26:52 +08:00
yystopf 2d9b97ee78 新增:分页参数 2024-03-05 10:26:36 +08:00
yystopf 5e1c1d8c87 Merge branch 'develop' into standalone_develop 2024-03-05 09:47:48 +08:00
yystopf 8eefb8ca07 新增:流水线接口代码 2024-03-05 09:43:34 +08:00
KingChan 3934b1b8a4 Merge pull request '新增饼图默认值' (#272) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-02-03 15:02:29 +08:00
kingchan 6694ed625f update pie char default 2024-02-03 14:59:43 +08:00
KingChan 8bdad1d1c0 Merge pull request '修复接口数据固定问题' (#271) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-02-02 11:43:29 +08:00
kingchan 9b5fdb5134 fix bug for pm project 2024-02-02 11:40:53 +08:00
xxq250 ecd1cea4e1 Merge remote-tracking branch 'origin/pm_project_develop' into pm_project_develop 2024-02-02 11:20:40 +08:00
xxq250 08e17454d5 fixed issues_count统计增加已分配类型,单独汇总,区分状态 2024-02-02 11:20:33 +08:00
KingChan 92de5dd69d Merge pull request '调整srtring 为数字' (#270) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-02-01 11:51:16 +08:00
呱呱呱 0d815db283 update 2024-02-01 11:48:50 +08:00
xxq250 94b7129257 fixed issues_count统计增加已分配类型,单独汇总 2024-01-31 15:37:09 +08:00
xxq250 c88c64b33b Merge branch 'pm_project_develop' of https://gitlink.org.cn/Trustie/forgeplus into pm_project_develop 2024-01-31 15:13:07 +08:00
xxq250 d477d2cabb fixed issues_count统计增加已分配类型 2024-01-31 15:12:55 +08:00
KingChan 413b90199d Merge pull request '新增 pm issue 变更为关闭时,结束时间为空则自动添加结束时间' (#267) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-31 09:11:50 +08:00
呱呱呱 9b9374c99b add due_date to pm issue batch params 2024-01-31 08:43:10 +08:00
KingChan 34d00a9c6d Merge pull request '调整折线图数据' (#266) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 17:14:48 +08:00
呱呱呱 b456bf99ca update plyline 2024-01-30 17:10:32 +08:00
yystopf 6a4f63d8ea 新增:最新提交列表接口 2024-01-30 14:50:59 +08:00
yystopf feec49d4bd 新增: 查询删除分支与普通分支 2024-01-30 14:50:59 +08:00
yystopf d8eeb8f1b7 新增:恢复分支接口
新增:删除者信息
2024-01-30 14:50:59 +08:00
KingChan ee1b0556ad Merge pull request '调整pm饼图返回值' (#264) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 14:32:56 +08:00
呱呱呱 a5a22f6889 add default pm project statistics 2024-01-30 14:29:37 +08:00
KingChan eb00419eb4 Merge pull request '修复 pm project statistics 问题' (#263) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 14:23:25 +08:00
呱呱呱 9538767167 update pm project statistics 2024-01-30 14:20:16 +08:00
KingChan 932fa04a45 Merge pull request '增加默认返回值' (#262) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 14:06:57 +08:00
呱呱呱 7d8e0d018e add default for project polyline 2024-01-30 14:03:34 +08:00
KingChan 69b9ae0cb0 Merge pull request 'pm 项目统计新增 open data 返回结果' (#261) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 11:44:05 +08:00
呱呱呱 53083d3030 add open data for pm project statistics 2024-01-30 11:40:56 +08:00
KingChan fc007d8f0b Merge pull request '调整返回值' (#260) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 11:18:29 +08:00
呱呱呱 f39b83692b update 2024-01-30 11:16:06 +08:00
KingChan 0c148b0fad Merge pull request '修复bug' (#259) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 11:14:15 +08:00
呱呱呱 3094c81d2c fix bug 2024-01-30 11:07:01 +08:00
KingChan 0e72e11275 Merge pull request '修复数据问题,新增开启中的工作项数量返回' (#258) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 11:00:06 +08:00
呱呱呱 3505d29410 fix 2024-01-30 10:56:46 +08:00
xxq250 b6b81b6092 Merge remote-tracking branch 'origin/pm_project_develop' into pm_project_develop 2024-01-26 15:39:39 +08:00
xxq250 28de064841 issues_count增加我负责的统计 2024-01-26 15:38:32 +08:00
KingChan ea0bdd83d0 Merge pull request '调整燃烬图系数' (#257) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 17:16:30 +08:00
呱呱呱 efef195c27 update burndown_charts base_number -1 2024-01-25 17:13:57 +08:00
KingChan 0ce1b5fd9c Merge pull request '调整燃烬图的数字类型' (#256) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 17:13:16 +08:00
呱呱呱 45e8b4d832 update burndown_charts base_number 2024-01-25 17:10:43 +08:00
xxq250 088bb3d1ac pm中多项目id查询issue 2024-01-25 15:49:03 +08:00
呱呱呱 0d250e0d4e update routes 2024-01-25 14:28:00 +08:00
呱呱呱 406da81ccf add project statistics and project polyline 2024-01-25 14:04:36 +08:00
呱呱呱 27b81a5479 update burndown_charts 2024-01-25 09:01:35 +08:00
kingchan dbdebc6232 update 2024-01-24 16:55:10 +08:00
呱呱呱 f85f9fe4f4 update burndown_charts response 2024-01-23 17:22:58 +08:00
呱呱呱 191153a39e add burndown_charts 2024-01-23 17:08:06 +08:00
呱呱呱 ea6295c888 update pm statistics hour 2024-01-23 11:19:00 +08:00
yystopf 8edc150800 新增:项目信息返回name 2024-01-13 08:26:15 +08:00
yystopf f9ce2a8b26 新增:项目标记创建时不能为空 2024-01-12 16:39:35 +08:00
yystopf 05aeecf67a 新增:项目标记关联组织初始化 2024-01-10 14:03:08 +08:00
yystopf 5fafd8195c 新增:项目标记关联组织接口 2024-01-04 14:25:40 +08:00
xxq250 7d1b4da72c Merge branch 'standalone_develop' into pm_project_develop
# Conflicts:
#	app/controllers/attachments_controller.rb
#	app/services/api/v1/issues/concerns/checkable.rb
#	app/services/api/v1/issues/concerns/loadable.rb
2023-12-15 10:43:54 +08:00
xxq250 d4b46dbf97 Merge branch 'standalone_develop' into pre_trustie_server
# Conflicts:
#	app/controllers/api/v1/issues_controller.rb
#	app/models/identity_verification.rb
#	app/models/issue.rb
#	app/models/journal.rb
#	app/services/api/v1/issues/list_service.rb
2023-12-15 10:40:58 +08:00
yystopf 39aa02ff57 新增:关键词搜索以及排序 2023-12-13 11:05:16 +08:00
yystopf 008d9dda3e 新增:父工作项列表查询类型 2023-12-12 11:23:38 +08:00
yystopf 947117ac5f 新增:父子关系判断以及可设置为父工作项的列表 2023-12-12 09:47:54 +08:00
yystopf 0cb38bce4f 新增:根据id查询疑修 2023-12-11 16:07:24 +08:00
yystopf 60359333f8 Merge branch 'develop' into standalone_develop 2023-12-11 09:15:29 +08:00
yystopf b2250db79a 新增:查看标签详情api 2023-12-11 09:14:47 +08:00
yystopf 48a446662f 新增:print issues status_ids 字段查询 2023-12-07 15:37:02 +08:00
yystopf 648d4189a2 修复:permit query parms 2023-12-07 14:05:33 +08:00
yystopf 6bd2bb7024 修复 2023-12-06 13:59:28 +08:00
yystopf 5fec6b3942 更改:去掉多余数据使用删除 2023-12-06 13:50:20 +08:00
yystopf 67ce9af382 新增: issue列表的pm_issue_types查询 2023-12-05 14:49:21 +08:00
yystopf 63638d4b2e 新增:issue列表新增优先级查询 2023-12-04 15:46:34 +08:00
xxq250 b13f1a681e issue按id集合查询,选择关联issue时排除已选id集合 2023-12-04 10:41:19 +08:00
xxq250 1bdb6dad98 issue按id集合查询,选择关联issue时排除已选id集合 2023-12-04 09:59:25 +08:00
xxq250 fea7c52227 issue按id集合查询,选择关联issue时排除已选id集合 2023-12-04 09:49:59 +08:00
yystopf c63c0cc636 更改:issue status查询不使用where.not方式 2023-12-01 14:59:13 +08:00
yystopf d2402c4103 修复 2023-12-01 10:21:40 +08:00
yystopf 1bbf53279b Merge branch 'standalone_develop' into pm_project_develop 2023-12-01 10:00:38 +08:00
yystopf 21640fe5e6 更改:issue status和priority初始化数据 2023-12-01 09:48:08 +08:00
yystopf 93514e8a73 更改:统计工作项容量以及预估工时 2023-12-01 09:19:08 +08:00
yystopf fe4f56dd36 新增:批量更新迭代中工作项 2023-11-29 14:28:31 +08:00
yystopf f8a6dcb3eb 新增:工作项统计类别统计 2023-11-22 15:36:05 +08:00
yystopf c09c167bdd 更改:移除数据和丰富颜色数据 2023-11-22 14:47:04 +08:00
yystopf 0c48eeb52b 更改:迭代工作项进度和工时容量接口合并 2023-11-21 08:28:49 +08:00
yystopf d6fbdd87d0 新增:迭代中工作项进度和工时容量统计 2023-11-20 16:40:20 +08:00
yystopf 39423ff6ea 新增:项目中所有未关联迭代工作项 2023-11-20 11:32:14 +08:00
yystopf 40c5525e0a 新增:工作项关联项目改查 2023-11-17 17:18:34 +08:00
yystopf cbbd62121c 更改:批量删除数组为空时返回正常 2023-11-17 15:28:29 +08:00
yystopf fe4d563d6b 更改:根据pm_project_id查询issue无法正常展示数据 2023-11-17 09:52:57 +08:00