Commit Graph

2537 Commits

Author SHA1 Message Date
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
xxq250 5f899d8706 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2024-04-29 09:07:44 +08:00
xxq250 c591a445f0 fixed 解散团队中成员在其他组织其他团队不存在的成员需清除组织 2024-04-29 09:07:36 +08:00
yystopf 03f1c59391 修复:错误信息和code共同返回 2024-04-26 17:12:50 +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
xxq250 c58880a4d3 项目列表默认查询时count性能问题处理, not_category_count 2024-04-22 08:44:20 +08:00
yystopf 0f5066f943 新增:分支同步历史记录以及创建同步分支接口 2024-04-19 17:26:20 +08:00
xxq250 643fb163d9 项目列表默认查询时count性能问题处理 2024-04-19 17:21:01 +08:00
yystopf 240e086232 更改:debug参数回退 2024-04-18 16:31:09 +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
xxq250 07a43120f2 仓库releases文件下载链接构建,文件后缀路由,直接下载 2024-04-16 10:02:07 +08:00
xxq250 0dc4ecbfb8 仓库releases文件下载链接构建,文件后缀路由,直接下载 2024-04-16 10:00:44 +08:00
xxq250 d84ebe0f42 仓库releases文件下载链接构建 2024-04-16 09:46:58 +08:00
xxq250 6feb3369c2 仓库releases文件下载链接构建 2024-04-16 09:46:45 +08:00
xxq250 89565acd13 仓库releases文件下载链接构建 2024-04-16 09:41:48 +08:00
yystopf ad9345badb 更改:项目列表total_count 2024-04-12 16:26:33 +08:00
yystopf d2d602ab89 新增:根据项目id查询数据集接口 2024-04-12 10:24:05 +08:00
xxq250 bc58efa397 附件为视频时,点击播放 2024-04-10 09:18:08 +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 0a13387c1c 新增:项目数据集模型 2024-04-01 15:24:34 +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 d8ddde617f 更改:使用uid作为创建用户标识 2024-03-26 13:39:44 +08:00
yystopf cb125dc85f Merge branch 'develop' into standalone_develop 2024-03-22 08:49:36 +08:00
yystopf b91358a7fe 新增:查询用户需传type值 2024-03-22 08:49:26 +08:00
yystopf 68348f1fc3 更改:csv写入模式 2024-03-21 17:38:57 +08:00
yystopf c999d37f7e 新增:同步acge用户记录在册 2024-03-21 16:58:27 +08:00
yystopf 6e2816af75 新增:同步acge用户并同时创建平台账号 2024-03-21 14:58:35 +08:00
yystopf bf7289032a 更改:private传值问题 2024-03-21 11:25:05 +08:00
yystopf 7bdab0bc53 更改:binduser type类型新增acge 2024-03-21 10:16:04 +08:00
yystopf e891d52c32 新增:acge 第三方登录回调地址 2024-03-21 10:11:58 +08:00
yystopf d78bd895d1 Merge branch 'develop' into standalone_develop 2024-03-20 10:48:21 +08:00
yystopf b8b5828a7c 更改:更新项目private参数默认为项目is_public的值 2024-03-20 10:47:36 +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 62ff6dd1d7 Merge branch 'develop' into standalone_develop 2024-03-16 16:03:43 +08:00
yystopf a0f1679f03 新增:合并请求合并接口冲突文件提示 2024-03-16 16:03:31 +08:00
xxq250 41e9f00138 Merge branch 'standalone_develop' into pm_project_develop 2024-03-11 09:23:22 +08:00
yystopf 0f546bc316 Merge branch 'develop' into standalone_develop 2024-03-07 11:19:53 +08:00
yystopf 847e501dee 新增:开启流水线模块接口 2024-03-07 11:18:39 +08:00
yystopf c7bdaa8962 Merge branch 'standalone_develop' into pm_project_develop 2024-03-06 16:44:45 +08:00
yystopf d95fefe589 Merge branch 'develop' into standalone_develop 2024-03-06 16:28:47 +08:00
yystopf 0e31daf9a8 修复:恢复auto_init 2024-03-06 16:27:43 +08:00
xxq250 1ed41b93d8 是否开启百度统计 2024-03-06 15:30:23 +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 d2b6f4189a Merge pull request '新版gitea升级同步更改' (#265) from feature_gitea_upgrade into develop 2024-03-05 09:48:28 +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
yystopf 59e8ce206f merge from develop 2024-03-01 16:58:29 +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
yystopf 447429a663 新增:创建项目auto_init参数 2024-01-31 16:47:00 +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 8ca9ced360 fixed 组织成员数取组织内成员和组织所有仓库成员组合,排序加入时间 2024-01-30 08:27:49 +08:00
xxq250 d2663eb7b7 fixed 组织成员数取组织内成员和组织所有仓库成员组合 2024-01-29 16:05:04 +08:00
yystopf 0e8a3ddb79 Merge branch 'develop' into standalone_develop 2024-01-27 14:53:12 +08:00
yystopf f61393f34a Merge branch 'develop' of https://gitlink.org.cn/yystopf/forgeplus into develop 2024-01-27 14:52:52 +08:00
yystopf df0ef313f6 更改:仓库无文件跳转404 2024-01-26 16:15:14 +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
xxq250 f98c044715 后台概览增加缓存,增加上周统计数据 2024-01-22 12:57:04 +08:00
呱呱呱 afe4a66c2b update identity_verifications_controller update 2024-01-17 15:34:08 +08:00
yystopf ed81ce5927 更改:活跃度查询时间区间 2024-01-16 16:27:18 +08:00
yystopf 1c8811fda6 新增:项目疑修排行榜 2024-01-16 10:19:02 +08:00
xxq250 e2374676c3 接入百度统计部分数据,按天存储 2024-01-15 11:23:59 +08:00
yystopf d55ff07296 新增:排除组织项目ID参数 2024-01-15 10:59:01 +08:00
yystopf f893ce41d0 新增:排除组织项目ID参数 2024-01-15 10:52:30 +08:00
yystopf 8edc150800 新增:项目信息返回name 2024-01-13 08:26:15 +08:00
yystopf f9ce2a8b26 新增:项目标记创建时不能为空 2024-01-12 16:39:35 +08:00
呱呱呱 f2b732b8e7 add log for identity_verifications 2024-01-10 14:58:02 +08:00
yystopf 05aeecf67a 新增:项目标记关联组织初始化 2024-01-10 14:03:08 +08:00
呱呱呱 1cd25c188c add page site close description rule 2024-01-10 10:19:45 +08:00
yystopf 5fafd8195c 新增:项目标记关联组织接口 2024-01-04 14:25:40 +08:00
yystopf 93ab86e363 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2023-12-20 09:52:02 +08:00
yystopf 3f621bd5b5 更改:项目活跃度排行默认统计一周内的数据 2023-12-20 09:51:51 +08:00
yystopf ae8b86ef02 更改:后台管理模块文案 2023-12-20 09:43:57 +08:00
KingChan 1195a7a339 Merge pull request '调整建站服务功能' (#240) from KingChan/forgeplus:chenjing into standalone_develop 2023-12-20 09:38:40 +08:00
呱呱呱 d590e1165e website update 2023-12-20 09:22:10 +08:00
yystopf 883542dfe8 Merge pull request '项目名称显示不全' (#239) from gitlink_admin_feature into standalone_develop 2023-12-19 15:39:48 +08:00
yystopf 3b5b78faed 更改:删除数据处理以及昵称获取规则处理 2023-12-19 15:36:57 +08:00
yystopf 1d48af015e Merge pull request '后台管理更新' (#238) from gitlink_admin_feature into standalone_develop 2023-12-19 15:26:05 +08:00
yystopf 26461f3a44 更改:防止sql注入 2023-12-19 15:05:00 +08:00
yystopf 21f559f254 更改:项目排行榜使用数据存储以及数据导出的功能 2023-12-19 14:57:54 +08:00
yystopf 75fff13550 更改:项目排行榜查询丰富 2023-12-18 15:49:41 +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
yystopf d98ad8a3f4 Merge branch 'develop' into standalone_develop 2023-12-15 09:42:30 +08:00
yystopf ad96991730 更改:提示语逗号为中文逗号 2023-12-15 09:01:11 +08:00
xxq250 835f2db759 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2023-12-14 16:45:36 +08:00
xxq250 c972d538ee fixed 用户搜索按昵称和登录时间倒排序 2023-12-14 16:45:29 +08:00
yystopf a2ca6bd91b Merge branch 'develop' into standalone_develop 2023-12-14 11:47:48 +08:00
yystopf 129970a525 更改:提示语 2023-12-14 11:47:32 +08:00
yystopf 8be254710e Merge branch 'develop' into standalone_develop 2023-12-14 11:44:18 +08:00
yystopf 062e654d45 新增:更改密码须验证两次密码 2023-12-14 11:43:42 +08:00
yystopf 39aa02ff57 新增:关键词搜索以及排序 2023-12-13 11:05:16 +08:00
xxq250 60c8b25075 fixed 解决安全问题访问附件,id改为uuid,查看附件 2023-12-12 16:57:39 +08:00
xxq250 de1266ba6c fixed 解决安全问题访问附件,id改为uuid,关联功能修改 2023-12-12 16:41:02 +08:00
xxq250 9a0809e45b fixed 发行版附件关联 2023-12-12 15:33:48 +08:00
xxq250 d74901cffa fixed 解决安全问题访问附件,id改为uuid 2023-12-12 14:31:21 +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
xxq250 2ea41d0100 fixed 解决安全问题访问附件,id改为uuid 2023-11-22 11:17:22 +08:00
KingChan 6ae4aded65 Merge pull request '新增 uuid' (#229) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-21 17:11:51 +08:00
呱呱呱 2985dc7902 add uuid 2023-11-21 17:06:43 +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
KingChan 7da8102782 Merge pull request '修复jurnal 更新 product问题' (#220) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 17:02:58 +08:00
呱呱呱 3f8a7c7cee fix journal更新时的错误 2023-11-16 16:59:20 +08:00
KingChan 0eea1c7d65 Merge pull request 'pm issue journal 返回bug修复' (#219) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 16:47:24 +08:00
呱呱呱 d45dab31cb fix pm journal render error 2023-11-16 16:45:15 +08:00
KingChan 5e192db530 Merge pull request '修复bug' (#218) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 15:32:08 +08:00