KingChan
/
forgeplus
forked from Trustie/forgeplus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并sonar #1

Merged
KingChan merged 531 commits from sonar_pm into docker_file 2024-06-06 17:26:49 +08:00
Conversation 0 Commits 531 Files Changed 291 +6839 -555

531 Commits

Author SHA1 Message Date
kingChan 69568cf626 新增sonar action文件生成 2024-06-06 14:31:28 +08:00
kingChan 4438b11c51 新增接口 measures_component 2024-06-05 16:54:57 +08:00
kingChan 1449064b64 新增接口 2024-06-05 16:22:44 +08:00
kingChan fc8c31ec66 调整参数 2024-06-05 14:09:28 +08:00
kingChan c98c7d5ac5 sonar 转发接口 2024-06-04 17:25:08 +08:00
kingChan 9c84856f99 调整自动更新 无需重启rails s 服务 2024-05-30 17:33:09 +08:00
kingChan ff1e85cad5 Merge branch 'sonar_pm' of https://gitlink.org.cn/KingChan/forgeplus into sonar_pm 2024-05-30 15:12:36 +08:00
kingChan 983edca9a3 add sonarqube for projects 2024-05-30 15:10:19 +08:00
KingChan ed4b4062e0 Merge pull request '调整pm issue获取时的逻辑 获取总数' (#290) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-05-30 12:25:14 +08:00
kingChan c590c29f29 调整pm issue获取时的逻辑 获取总数 2024-05-30 12:22:04 +08:00
kingChan 97d1e9466b add sonarqube for projects 2024-05-30 11:50:08 +08:00
xxq250 c87da2947f 联调图形设计化-返回文件sha 2024-05-28 18:04:53 +08:00
xxq250 fe6c821a69 Merge remote-tracking branch 'origin/pm_project_develop' into pm_project_develop 2024-05-28 17:31:12 +08:00
xxq250 541815fb03 联调图形设计化-返回文件sha 2024-05-28 17:31:07 +08:00
yystopf e812f07a14 Merge branch 'standalone_develop' into pm_project_develop 2024-05-28 15:56:33 +08:00
yystopf 572a6de2ad 新增：actions重新运行接口 2024-05-28 15:55:22 +08:00
yystopf c88479a8ec 修复 2024-05-27 11:56:30 +08:00
yystopf 4d3e33a4e8 新增：root_subject参数 2024-05-27 11:51:51 +08:00
xxq250 8325fa7367 联调图形设计化-构建流水线yaml 2024-05-24 15:31:29 +08:00
xxq250 15fc5b84fe Merge remote-tracking branch 'origin/pm_project_develop' into pm_project_develop 2024-05-24 13:53:02 +08:00
xxq250 3b389480f4 构建流水线yaml, base64 2024-05-24 13:52:41 +08:00
KingChan f610d35213 Merge pull request '解决合并问题' (#286) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-05-23 17:59:49 +08:00
kingChan 10b404f750 解决合并问题 2024-05-23 17:56:27 +08:00
kingChan 52aeb9ec07 merge 
修复issue删除失败问题
 2024-05-23 17:54:46 +08:00
kingChan 907098619b 修复issue删除失败问题 2024-05-23 17:39:42 +08:00
KingChan 5edd492343 Merge pull request '修复pm工作项被删除后 关联项依然还存在的问题' (#283) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-05-23 17:24:07 +08:00
kingChan 0d0f25777a 新增issue 关联 修复pm工作项被删除后 关联项依然还存在的问题 2024-05-23 17:20:30 +08:00
xxq250 a6343d5442 构建流水线yaml, 返回json 2024-05-23 16:40:43 +08:00
xxq250 d2c44ed163 构建流水线yaml, 返回json 2024-05-23 16:26:09 +08:00
xxq250 8c077ef9a8 构建流水线yaml, 返回json 2024-05-23 16:25:20 +08:00
xxq250 790a7eeb8c 构建流水线yaml, 中文文件名 2024-05-23 11:26:59 +08:00
xxq250 da831ec6e7 构建流水线yaml 更新文件需要sha 2024-05-23 10:56:35 +08:00
xxq250 8760e46c4b 构建流水线yaml base64 2024-05-23 10:44:48 +08:00
xxq250 15513718f9 构建流水线yaml，保存和更新 log 2024-05-23 09:51:04 +08:00
xxq250 2b7414c2fc 构建流水线yaml，保存和更新 log 2024-05-23 09:23:21 +08:00
xxq250 f55d69d5cf 构建流水线yaml，保存和更新,分支参数 2024-05-23 09:20:48 +08:00
xxq250 4c956e48ae 构建流水线yaml，保存和更新,分支参数 2024-05-22 17:34:18 +08:00
xxq250 08fe69ca37 构建流水线yaml，保存和更新 2024-05-22 17:29:02 +08:00
xxq250 801dbd3f2f 构建流水线yaml，保存和更新 2024-05-22 17:24:15 +08:00
xxq250 87604a1dea 构建流水线json测试 2024-05-22 16:22:43 +08:00
xxq250 329511ac4b 构建流水线json测试 2024-05-22 16:19:56 +08:00
xxq250 6ba2394c16 构建流水线json测试 2024-05-22 16:17:01 +08:00
xxq250 4ad6b265c7 构建流水线json测试 2024-05-22 16:11:21 +08:00
xxq250 47c4d30cf7 构建流水线节点icon 2024-05-22 15:47:44 +08:00
xxq250 b078501460 构建流水线节点icon 2024-05-22 15:10:35 +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
yystopf c6ae30f2cd 更改：readme特殊处理斜杠 2024-05-16 14:33:14 +08:00
xxq250 ddaa6f7aec fixed 图形化流水线构建 2024-05-16 09:42:48 +08:00
yystopf e9587ff322 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2024-05-15 15:00:25 +08:00
yystopf 4fbf7a52cd 更改：同步记录分支列表取同步时间最新的数据 2024-05-15 15:00:17 +08:00
yystopf 871904fb9c 更改：创建同步不需要验证分支是否存在 2024-05-14 15:01:04 +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
xxq250 9462e14628 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2024-05-13 08:54:28 +08:00
xxq250 c5ec05ea77 fixed utf8mb4字符索引处理 2024-05-13 08:54:22 +08:00
yystopf 7e654331db 更改：webhook推送action权限访问移除 2024-05-11 16:02:09 +08:00
yystopf 362aee1a35 更改：github webhook特殊处理 2024-05-11 11:43:23 +08:00
yystopf 28ed60da16 Merge pull request '代码仓库同步部分代码' (#282) from reposync_feature into standalone_develop 2024-05-10 15:05:04 +08:00
yystopf 20e8561815 更改：回调异常处理 2024-05-09 17:32:43 +08:00
yystopf d5c8fe6e56 更改：分支列表排序 2024-05-09 14:13:51 +08:00
yystopf e0b1d6fbb6 新增：历史记录分页 2024-05-09 13:41:46 +08:00
yystopf fd48f00097 修复 2024-05-09 09:16:35 +08:00
yystopf 2a3f2fb620 新增：历史记录分页 2024-05-09 09:11:51 +08:00
xxq250 81b8255a54 fork报错日志跟踪 2024-05-08 17:15:04 +08:00
yystopf d385319764 修复 2024-05-08 11:15:15 +08:00
yystopf a98fe05599 新增：加入同步方向逻辑 2024-05-08 11:13:02 +08:00
yystopf b3a51f2f74 新增：同步历史记录同步状态 2024-05-08 10:34:40 +08:00
yystopf 08a5028006 更改：webhook优化 2024-05-08 09:45:04 +08:00
yystopf ff57561aad 更改：传至reposyncer仓库名称中使用id区分 2024-05-07 15:45:05 +08:00
yystopf f0622b6261 更改：触发webhook新加参数以区别不同来源 2024-05-07 14:54:31 +08:00
xxq250 2f880fe068 流水线节点管理和模板管理,is_required 2024-05-07 14:38:19 +08:00
xxq250 d8dbea60eb Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2024-05-07 14:08:56 +08:00
xxq250 8ae91ff558 流水线节点管理和模板管理 2024-05-07 14:08:46 +08:00
yystopf ba228a7e93 更改：创建项目默认不开启数据集 2024-05-07 10:07:45 +08:00
yystopf 60857ed357 更改：触发任务判断为失败条件 2024-05-06 17:29:47 +08:00
yystopf 61f893ba0a 更改：解绑操作放在回调里 2024-05-06 13:56:45 +08:00
yystopf 4cacc91130 更改：开始停止同步加一个参数以及webhook触发晚五秒 2024-05-06 10:01:52 +08:00
yystopf a3b31ee67a 修复：区分分支不存在与文件列表为空两种情况的文件列表 2024-04-30 16:13:39 +08:00
xxq250 cb0ecc4194 fixed 多浏览器退出账号时，token不存在处理 2024-04-30 15:35:35 +08:00
yystopf db40a21b04 新增：同步仓库绑定webhook 2024-04-29 15:19:07 +08:00
xxq250 0a2ab5eddc Merge branch 'standalone_develop' into pm_project_develop 2024-04-29 11:11:18 +08:00
xxq250 b236733637 fixed 解散团队中成员在其他组织其他团队不存在的成员需清除组织 2024-04-29 11:11:01 +08:00
xxq250 f0b9765462 fixed 后台项目可查询标识 2024-04-29 09:22:47 +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
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 9f8d0e4aac 修复 2024-04-24 13:48:08 +08:00
yystopf af9436622c Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2024-04-24 12:51:42 +08:00
yystopf dd4eab1c9d 新增：创建项目错误返回 2024-04-24 12:41:28 +08:00
yystopf e9237d7789 修复 2024-04-23 17:44:56 +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 f28f1a5c55 新增：项目加载排除id=0 2024-04-22 14:55:16 +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
xxq250 edfc540469 竞赛banner跳转链接 setting中配置 2024-04-18 11:19:32 +08:00
yystopf eeb0994961 新增：token鉴权repo地址 2024-04-17 16:37:01 +08:00
yystopf 831d314ebd 新增：返回branch_id保存 2024-04-17 11:15:14 +08:00
xxq250 63db6624e1 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2024-04-17 11:11:48 +08:00
xxq250 d88b8cbb8a 竞赛banner setting中配置 2024-04-17 11:11:41 +08:00
yystopf 8b1ef7bf15 新增：仓库列表和分支列表 2024-04-17 10:54:23 +08:00
KingChan 804d369de2 Merge pull request 'static files 改为 gh-pages' (#281) from KingChan/forgeplus:chenjing into standalone_develop 2024-04-17 10:23:15 +08:00
呱呱呱 9654cc280e change static_files to gh-pages 2024-04-17 10:19:48 +08:00
KingChan d79f6e2dfa Merge pull request '调整部署方式' (#280) from KingChan/forgeplus:chenjing into standalone_develop 2024-04-17 09:37:14 +08:00
呱呱呱 74d7875552 update scrip 2024-04-17 09:34:07 +08:00
KingChan 2605b6eda8 Merge pull request '更换建站工具名字' (#279) from KingChan/forgeplus:chenjing into standalone_develop 2024-04-17 09:16:45 +08:00
呱呱呱 d37ce50c40 rename page site category name 2024-04-17 09:12:54 +08:00
yystopf 7271603248 新增：同步时间和创建数据返回 2024-04-16 17:53:35 +08:00
yystopf e358e3b6f6 新增：绑定仓库和webhook触发地址 2024-04-16 17:15:22 +08:00
KingChan 91cb0ea036 Merge pull request '调整个人建站模板类型的筛选' (#278) from KingChan/forgeplus:chenjing into standalone_develop 2024-04-16 15:36:09 +08:00
呱呱呱 a1941fb594 update thems 2024-04-16 15:32:36 +08:00
KingChan 05f83bca6c Merge pull request '个人建站调整模型名称' (#277) from KingChan/forgeplus:chenjing into standalone_develop 2024-04-16 15:22:56 +08:00
呱呱呱 d5fb8587ee change public to static_file 2024-04-16 15:18:15 +08:00
KingChan 6d70bc6aa9 Merge pull request '个人建站新增public模式' (#276) from KingChan/forgeplus:chenjing into standalone_develop 2024-04-16 15:09:57 +08:00
呱呱呱 21fb916c90 site page add public build 2024-04-16 15:06:45 +08:00
xxq250 3a81c0e859 仓库releases文件下载链接构建,文件后缀路由，直接下载,tag_name 2024-04-16 13:38:56 +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 5e9621d8d7 仓库releases文件下载链接构建,文件后缀路由 2024-04-16 09:56:35 +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 04e70b3b34 新增：接口service构建 2024-04-13 21:09:08 +08:00
yystopf ad9345badb 更改：项目列表total_count 2024-04-12 16:26:33 +08:00
xxq250 5a61933857 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2024-04-12 16:03:40 +08:00
xxq250 1e8dba9050 项目中是否有数据集 2024-04-12 16:03:21 +08:00
yystopf d2d602ab89 新增：根据项目id查询数据集接口 2024-04-12 10:24:05 +08:00
xxq250 b227250020 项目中是否有数据集 2024-04-11 14:12:02 +08:00
xxq250 99fd459bd6 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2024-04-10 09:18:15 +08:00
xxq250 bc58efa397 附件为视频时，点击播放 2024-04-10 09:18:08 +08:00
yystopf 870b09f5d5 更改：附件描述长度为255 2024-04-08 09:27:12 +08:00
yystopf 0d03ef88b4 更改：附件描述长度为255 2024-04-08 09:26:46 +08:00
yystopf 69e611c427 Merge pull request '数据集相关内容' (#273) from dev_dataset into standalone_develop 2024-04-07 17:26:47 +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 8ac9592195 新增：项目详情has_dataset 2024-04-03 15:34:49 +08:00
yystopf c8b37448d5 新增：前端配置文件 2024-04-03 14:51:24 +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
xxq250 9b0581831f 允许跨域请求白名单IP 2024-04-01 14:01:17 +08:00
xxq250 5519c9c51a 克隆地址不需要限制ip 2024-03-28 09:46:28 +08:00
xxq250 81e916889e 克隆地址不需要限制ip 2024-03-28 09:45:10 +08:00
yystopf 7880ec1779 修复：更新禅道数据脚本 2024-03-28 09:40:15 +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 d4055bbe75 Merge branch 'develop' into standalone_develop 2024-03-25 11:22:42 +08:00
yystopf 15b8f1e068 更改：编辑issue描述不发消息 2024-03-25 11:22:31 +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 d6acce86a7 更改：marked.min.js文件替换 2024-03-21 10:28:01 +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 444c57c237 更改：marked.min.js文件替换 2024-03-19 10:03:39 +08:00
yystopf 531611c9df Merge branch 'develop' into standalone_develop 2024-03-18 16:31:22 +08:00
yystopf c88d0c2712 新增：最近提交列表返回距离现在时间 2024-03-18 16:31:05 +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 cc66f99d64 Merge branch 'standalone_develop' into pm_project_develop 2024-03-15 17:08:15 +08:00
yystopf b051213278 Merge branch 'develop' into standalone_develop 2024-03-14 14:15:04 +08:00
yystopf c1fbea8453 修复：删除特殊符号分支、标签失败 2024-03-14 14:14:50 +08:00
yystopf 28dfce0247 Merge branch 'develop' into standalone_develop 2024-03-13 16:11:25 +08:00
yystopf 7d769ad118 更改：readme href替换 2024-03-13 16:10:43 +08:00
yystopf ea29f4c673 Merge branch 'develop' into standalone_develop 2024-03-13 15:12:58 +08:00
yystopf 370a565a7c 新增：readme href匹配 2024-03-13 15:10:05 +08:00
yystopf 597d77ba85 Merge branch 'develop' into standalone_develop 2024-03-12 15:23:12 +08:00
yystopf f3f63e3dd3 新增：里程碑提醒配置化 2024-03-12 15:22:24 +08:00
xxq250 780ba6c103 重新计算组织成员数量 2024-03-11 09:45:13 +08:00
xxq250 d96a33fca4 重新计算组织成员数量 2024-03-11 09:39:18 +08:00
xxq250 41e9f00138 Merge branch 'standalone_develop' into pm_project_develop 2024-03-11 09:23:22 +08:00
xxq250 1e70d93a83 重新计算组织成员数量 2024-03-11 09:22:07 +08:00
yystopf c6152aaca8 Merge branch 'develop' into standalone_develop 2024-03-07 16:00:17 +08:00
yystopf 48c5aa732f 更改：时间取值 2024-03-07 16:00:09 +08:00
yystopf a7b6dbc1a0 Merge branch 'develop' into standalone_develop 2024-03-07 15:49:23 +08:00
yystopf a8997ae160 更改：时间取值 2024-03-07 15:49:14 +08:00
yystopf f422350895 Merge branch 'develop' into standalone_develop 2024-03-07 15:40:50 +08:00
yystopf 69754d5c11 更改：时间取值 2024-03-07 15:40:40 +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 d20a7b65c2 fix 2024-03-06 09:02:25 +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 f35dddbbf7 fix 2024-03-01 17:36:58 +08:00
yystopf 59e8ce206f merge from develop 2024-03-01 16:58:29 +08:00
xxq250 5aab575b36 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2024-03-01 15:17:26 +08:00
xxq250 6e41605cbc fixed 删除文件失败，参数sha不匹配提示 2024-03-01 15:17:20 +08:00
yystopf 8760a8234f 更改：获取专区文章使用简要信息接口 2024-03-01 10:36:57 +08:00
yystopf 13e58392dc 修复：脚本中status找不到的情况 2024-02-19 11:14:07 +08:00
yystopf a247ac0d3a 修复 2024-02-03 17:18:01 +08:00
yystopf 4e05be3176 修复 2024-02-03 17:14:51 +08:00
yystopf c5af356f34 Merge branch 'pm_project_develop' of https://gitlink.org.cn/Trustie/forgeplus into pm_project_develop 2024-02-03 17:12:42 +08:00
yystopf 4ca1e2e85a 新增：禅道数据导入任务脚本 2024-02-03 17:12:33 +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
yystopf 7f6c6383bc 更改：禅道脚本中数据为空处理 2024-02-03 14:47:59 +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
yystopf d0bc8e4378 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2024-01-31 15:36:21 +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 725226e930 Merge pull request '修复bug check_pm_and_update_due_date' (#269) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-31 10:24:40 +08:00
呱呱呱 f3dd40515a fix bug check_pm_and_update_due_date 2024-01-31 10:21:31 +08:00
KingChan 5fa1edb434 Merge pull request '调整check_pm_and_update_due_date' (#268) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-31 09:21:49 +08:00
呱呱呱 9e90b2cef3 update check_pm_and_update_due_date for issue 2024-01-31 09:19:20 +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
呱呱呱 65d2387931 update 2024-01-31 09:08:38 +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 a644a65493 更新：gitea client版本 2024-01-30 14:50:59 +08:00
yystopf d8eeb8f1b7 新增：恢复分支接口 
新增：删除者信息
 2024-01-30 14:50:59 +08:00
yystopf c94bffd844 更改：重置gitea token规则 2024-01-30 14:50:59 +08:00
yystopf 096941ea9e 更改：重置gitea token规则 2024-01-30 14:50:59 +08:00
yystopf 026d58c347 更改：compare接口 2024-01-30 14:50:59 +08:00
yystopf a0265d4808 更改：tree返回结构体适配以及生成token需新增scopes参数 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 036acfc43d fixed 组织成员数取组织内成员和组织所有仓库成员组合,加入时间 2024-01-29 17:35:08 +08:00
xxq250 627332e93a fixed 组织成员数取组织内成员和组织所有仓库成员组合,加入时间 2024-01-29 17:32:46 +08:00
xxq250 c957617263 fixed 取消仓库增加成员时同时加进组织操作,仅增加 2024-01-29 16:54:52 +08:00
xxq250 6ff89d7929 fixed 取消仓库增加成员时同时加进组织操作 2024-01-29 16:05:22 +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
yystopf 1f07833de9 Merge pull request '里程碑过期相关系统通知' (#255) from yystopf/forgeplus:develop into develop 2024-01-25 16:12:57 +08:00
yystopf dbf41c04b3 Merge branch 'develop' into standalone_develop 2024-01-25 16:11:58 +08:00
yystopf 604e3eeba1 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2024-01-25 16:11:45 +08:00
yystopf 299978833d 新增：里程碑过期相关系统通知 2024-01-25 16:09:52 +08:00
xxq250 088bb3d1ac pm中多项目id查询issue 2024-01-25 15:49:03 +08:00
xxq250 3986b86852 pm中多项目id查询issue 2024-01-25 15:44:55 +08:00
KingChan b33c4bf78b Merge pull request '调整请求路由' (#254) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 14:30:26 +08:00
呱呱呱 0d250e0d4e update routes 2024-01-25 14:28:00 +08:00
KingChan 5649f5b67a Merge pull request '新增获取饼图 折线图数据接口' (#253) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 14:08:33 +08:00
呱呱呱 406da81ccf add project statistics and project polyline 2024-01-25 14:04:36 +08:00
KingChan 5a0c7cddcf Merge pull request '调整燃烬图' (#252) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 09:04:04 +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
KingChan 4889eb8554 Merge pull request '调整燃烬图返回值' (#251) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-23 17:26:23 +08:00
呱呱呱 f85f9fe4f4 update burndown_charts response 2024-01-23 17:22:58 +08:00
KingChan c9b6484b66 Merge pull request '燃烬图接口' (#250) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-23 17:18:18 +08:00
呱呱呱 191153a39e add burndown_charts 2024-01-23 17:08:06 +08:00
KingChan 07a563f769 Merge pull request '新增 typoe 工时解析' (#249) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-23 11:21:36 +08:00
呱呱呱 ea6295c888 update pm statistics hour 2024-01-23 11:19:00 +08:00
xxq250 90ea1804e9 后台概览增加缓存，增加上周统计数据，百分号 2024-01-22 13:02:48 +08:00
xxq250 f98c044715 后台概览增加缓存，增加上周统计数据 2024-01-22 12:57:04 +08:00
xxq250 9ef255f3b6 接入百度统计部分数据，缓存总数据 2024-01-22 12:07:46 +08:00
xxq250 e4faee134a 接入百度统计部分数据，按天存储,refresh_access_token 2024-01-22 11:39:16 +08:00
yystopf 354242a290 修复 2024-01-18 09:58:30 +08:00
yystopf f468f0cf67 更改：统计issue数量不应该统计pr关联的issue数量 2024-01-17 17:39:51 +08:00
yystopf 65abdda8f9 更改：文案修改 2024-01-17 16:37:55 +08:00
KingChan 3c33ef7709 Merge pull request '拒绝实名认证需要实名理由' (#248) from KingChan/forgeplus:chenjing into standalone_develop 2024-01-17 15:36:58 +08:00
呱呱呱 afe4a66c2b update identity_verifications_controller update 2024-01-17 15:34:08 +08:00
KingChan d6229b62bf Merge pull request '修改文字' (#247) from KingChan/forgeplus:chenjing into standalone_develop 2024-01-17 15:20:12 +08:00
呱呱呱 539bf58e0d update identity_verifications/edit 2024-01-17 15:17:47 +08:00
yystopf ed81ce5927 更改：活跃度查询时间区间 2024-01-16 16:27:18 +08:00
yystopf 1c8811fda6 新增：项目疑修排行榜 2024-01-16 10:19:02 +08:00
yystopf 7d813c0ebe 新增：项目缓存加入关闭issue数量 2024-01-15 16:41:54 +08:00
yystopf ccdacb641f 新增：导入禅道需求数据脚本 2024-01-15 14:53:29 +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 ebdfbbf420 新增：导入禅道数据脚本 2024-01-13 14:31:35 +08:00
yystopf 8edc150800 新增：项目信息返回name 2024-01-13 08:26:15 +08:00
yystopf f9ce2a8b26 新增：项目标记创建时不能为空 2024-01-12 16:39:35 +08:00
xxq250 bf3f25972e Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2024-01-11 14:15:29 +08:00
xxq250 6756687c07 附件表uuid增加索引 2024-01-11 14:14:56 +08:00
yystopf c89c394374 Merge branch 'develop' into standalone_develop 2024-01-11 13:40:04 +08:00
yystopf 35e6d945dd 更改：组织标识正则 2024-01-11 13:39:13 +08:00
KingChan 3ceefc33f8 Merge pull request '新增身份认证操作日志功能' (#246) from KingChan/forgeplus:chenjing into standalone_develop 2024-01-10 15:00:19 +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
KingChan 515bf4663d Merge pull request '新增关闭站点时必须填写理由' (#245) from KingChan/forgeplus:chenjing into standalone_develop 2024-01-10 10:23:30 +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
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 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 48a446662f 新增：print issues status_ids 字段查询 2023-12-07 15:37:02 +08:00
yystopf f9753c948e 更改：附件返回绝对地址 2023-12-07 14:45:31 +08:00
yystopf 648d4189a2 修复：permit query parms 2023-12-07 14:05:33 +08:00
yystopf 09942caa3b 新增：print issues pm_issue_types字段查询 2023-12-07 13:58:41 +08:00
yystopf 6bd2bb7024 修复 2023-12-06 13:59:28 +08:00
yystopf 5fec6b3942 更改：去掉多余数据使用删除 2023-12-06 13:50:20 +08:00
yystopf b15bddea49 修复：排序字段失效 2023-12-06 09:30:49 +08:00
yystopf 67ce9af382 新增： issue列表的pm_issue_types查询 2023-12-05 14:49:21 +08:00
yystopf 50986035e2 新增： issue列表的pm_issue_types查询 2023-12-05 14:46:59 +08:00
yystopf b08c1763ac Merge pull request 'issue列表新增优先级查询' (#236) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-12-04 15:49:16 +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 65590bd33e 修复: issues查询使用distinct去重 2023-12-01 10:42:16 +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 c97d5f9fdf Merge pull request '已完成/已关闭统计更改' (#234) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-12-01 09:22:37 +08:00
yystopf 93514e8a73 更改：统计工作项容量以及预估工时 2023-12-01 09:19:08 +08:00
yystopf fe4f56dd36 新增：批量更新迭代中工作项 2023-11-29 14:28:31 +08:00
yystopf 9c4bc3f37c 更改：未关联工作项需包含外键为0的数据 2023-11-24 09:42:25 +08:00
yystopf 0adff52355 Merge pull request 'child_count使用count_cache' (#232) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-23 08:55:20 +08:00
yystopf 1a067d0607 更改：child_count使用count_cache 2023-11-23 08:53:02 +08:00
yystopf bd5f4057f6 Merge pull request '工作项统计类别统计' (#231) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-22 15:38:07 +08:00
yystopf f8a6dcb3eb 新增：工作项统计类别统计 2023-11-22 15:36:05 +08:00
yystopf fe137443f8 Merge pull request '丰富数据和移除数据' (#230) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-22 14:49:46 +08:00
yystopf c09c167bdd 更改：移除数据和丰富颜色数据 2023-11-22 14:47:04 +08:00
xxq250 778f9563f3 fixed 解决安全问题访问附件id改为uuid，统一处理，issue不单独处理 2023-11-22 11:38:34 +08:00
xxq250 168f5bf7d1 fixed 解决安全问题访问附件，id改为uuid，issue关联附件 2023-11-22 11:34:48 +08:00
xxq250 9526d1b896 fixed 解决安全问题访问附件，id改为uuid，检测附件 2023-11-22 11:28:35 +08:00
xxq250 d26dcb5b9a fixed 解决安全问题访问附件，id改为uuid，评论 2023-11-22 11:20:03 +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 3a693b88c0 Merge pull request '迭代中工作项进度和工时容量统计' (#228) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-20 16:42:38 +08:00
yystopf d6fbdd87d0 新增：迭代中工作项进度和工时容量统计 2023-11-20 16:40:20 +08:00
yystopf ed8ec15eda Merge pull request '项目中未关联迭代工作项接口' (#227) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-20 11:35:26 +08:00
yystopf 39423ff6ea 新增：项目中所有未关联迭代工作项 2023-11-20 11:32:14 +08:00
yystopf e683dddcaf Merge pull request '工作项部分修改' (#226) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-20 09:42:14 +08:00
yystopf 8030d7db1a 更改：删除工作项需删除子工作项放到回调中 2023-11-20 09:38:52 +08:00
yystopf b305b22a8a 更改：项目id为0时查询全部 2023-11-20 09:11:28 +08:00
yystopf f48ad14411 修复 2023-11-20 08:32:53 +08:00
yystopf 924406d59f Merge branch 'pm_project_develop' of https://gitlink.org.cn/Trustie/forgeplus into pm_project_develop 2023-11-20 08:29:28 +08:00
yystopf 6d90cbed81 新增：工作项关联项目查询 2023-11-20 08:29:18 +08:00
yystopf c27aa16699 Merge pull request '工作项关联项目改查以及删除子工作项逻辑修复' (#225) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-17 17:21:19 +08:00
yystopf 40c5525e0a 新增：工作项关联项目改查 2023-11-17 17:18:34 +08:00
yystopf 252cfcd353 Merge branch 'pm_project_develop' of https://gitlink.org.cn/Trustie/forgeplus into pm_project_develop 2023-11-17 16:42:58 +08:00
yystopf a3f0cf87e1 更改：删除工作项需删除子工作项 2023-11-17 16:29:40 +08:00
yystopf 7994839d96 Merge pull request '工作项部分修改' (#224) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-17 15:32:02 +08:00
yystopf fbad9859e6 新增：删除工作项同时删除子工作项 2023-11-17 15:29:19 +08:00
yystopf cbbd62121c 更改：批量删除数组为空时返回正常 2023-11-17 15:28:29 +08:00
yystopf 0e35a997f2 Merge pull request 'issue列表新增id返回' (#223) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-17 11:44:02 +08:00
yystopf d84b32f4f6 新增：issue列表新增id返回 2023-11-17 11:39:08 +08:00
yystopf 74d9e34187 Merge pull request '根据pm_project_id查询issue无法正常展示数据' (#222) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-17 09:55:20 +08:00
yystopf fe4d563d6b 更改：根据pm_project_id查询issue无法正常展示数据 2023-11-17 09:52:57 +08:00
yystopf a0e34c9ddd Merge pull request '组织项目列表返回仓库url' (#221) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-17 09:36:49 +08:00
yystopf c2f64adf17 新增：组织项目列表返回仓库url 2023-11-17 09:32:30 +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
呱呱呱 776533be8c fix bugs 2023-11-16 15:30:16 +08:00
KingChan 14d9ca760d Merge pull request 'pm link_index 增加倒序排序' (#217) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 15:15:33 +08:00
呱呱呱 aa9d45dc91 pm link_index 增加倒序排序 2023-11-16 15:13:45 +08:00
KingChan c92c86b65f Merge pull request '调整未关联issue 和设定组织搜索空间范围' (#216) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 15:09:59 +08:00
呱呱呱 84895231dc 调整未关联issue 和设定组织搜索空间范围 2023-11-16 15:08:04 +08:00
KingChan 5ea904b2aa Merge pull request '新增 topic返回' (#215) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 14:39:24 +08:00
呱呱呱 bbc3717737 add topic 2023-11-16 14:37:30 +08:00
KingChan 252b132a4a Merge pull request '新增 categroy 和 language 返回' (#214) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 14:30:47 +08:00
呱呱呱 b3252ddf85 add organizations/projects/index.json language category 2023-11-16 14:28:37 +08:00
KingChan 35556c0cd4 Merge pull request '修复 issue count 接口报错' (#213) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 14:17:52 +08:00
呱呱呱 23a1be8ce3 fix issue count error 2023-11-16 14:15:37 +08:00
yystopf ee5c8b4b9e Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into pm_project_develop 2023-11-16 13:55:14 +08:00
KingChan c428c29042 Merge pull request 'issue project 为nil时的特殊处理' (#211) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 10:47:56 +08:00
呱呱呱 f9f0485e50 issue project 为nil时的特殊处理 2023-11-16 10:46:00 +08:00
KingChan e9318d38f9 Merge pull request 'issue 删除当project 为0时不处理' (#210) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 10:37:30 +08:00
呱呱呱 a303f3d01b issue 删除当project 为0时不处理 2023-11-16 10:35:27 +08:00
KingChan 63cb83b1d9 Merge pull request '调整 issue中 rootid 修改逻辑' (#209) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 10:28:37 +08:00
呱呱呱 c70e43d19b update issue update root id 2023-11-16 10:26:16 +08:00
KingChan fa7e24b580 Merge pull request '修复bug' (#208) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-16 10:12:31 +08:00
呱呱呱 ad30b56b26 fix issue update bug 2023-11-16 10:10:45 +08:00
KingChan da1f1b9c8c Merge pull request '调整create issue 中的PmLink创建' (#207) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-15 16:58:29 +08:00
呱呱呱 7ed4d12e95 调整create issue 中的PmLink创建 2023-11-15 16:56:37 +08:00
KingChan 1d4dae4202 Merge pull request '调整 pm issue link_index' (#206) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-15 14:21:04 +08:00
呱呱呱 dddc4f9752 update issue link index 2023-11-15 14:18:36 +08:00
KingChan a1c58b7a78 Merge pull request 'issue link_issues' (#205) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-15 11:49:10 +08:00
呱呱呱 0fda6721de issue link_issues 2023-11-15 11:47:17 +08:00
KingChan 9c76a6171a Merge pull request '调整links 返回，调整links删除查询' (#204) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-15 11:13:42 +08:00
呱呱呱 b0ecc0a30b 根据需求调整links 返回，调整links删除查询 2023-11-15 11:11:00 +08:00
KingChan 404f2fb671 Merge pull request '修复 issue list bug' (#203) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-15 10:31:31 +08:00
呱呱呱 d758b367b1 fix bug 2023-11-15 10:29:41 +08:00
KingChan 2f7e92092e Merge pull request '调整 issues 的 root id 判定' (#202) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-15 10:27:49 +08:00
呱呱呱 19458ac963 调整 issues 的 root id 判定 2023-11-15 10:25:59 +08:00
yystopf a61996bdc3 Merge pull request '项目管理-工作项部分接口补充' (#201) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-15 09:38:26 +08:00
KingChan ef18964ad1 Merge pull request '调整 pm issue journal返回值' (#200) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-15 09:37:49 +08:00
呱呱呱 6dda3ef6b9 add pm isssue jornal render 2023-11-15 09:35:35 +08:00
yystopf efa9ecfcb0 新增：status_ids数组查询 2023-11-15 09:27:06 +08:00
yystopf 030d76e276 Merge branch 'pm_project_develop' of https://gitlink.org.cn/Trustie/forgeplus into pm_project_develop 2023-11-14 16:56:19 +08:00
yystopf 40ec406a19 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into pm_project_develop 2023-11-14 16:55:50 +08:00
KingChan ee25d7b477 Merge pull request '创建issue时的工作项关联' (#199) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-14 16:51:57 +08:00
呱呱呱 a644bfee25 创建issue时加上工作项关联 2023-11-14 16:50:00 +08:00
KingChan cd25b78625 Merge pull request '将issue_links接口改为支持数组类型' (#198) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-14 16:04:28 +08:00
呱呱呱 be45e45dbc 将issue_links接口改为支持数组类型 2023-11-14 16:02:26 +08:00
KingChan 4020fc3515 Merge pull request '调整更新接口中 chaner 的取值' (#197) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-14 14:41:05 +08:00
呱呱呱 a474934391 更新issue update中的 changer取值 2023-11-14 14:39:00 +08:00
yystopf e19eae7733 Merge pull request '项目管理-项目工作项接口补充' (#196) from yystopf/forgeplus:pm_project_develop into pm_project_develop 2023-11-14 11:10:17 +08:00
yystopf 8532281904 新增：上传文件新增字段返回 2023-11-14 11:03:58 +08:00
yystopf 7080b74ebe 更改：头像返回绝对地址 2023-11-14 10:56:44 +08:00
yystopf 0c553203c1 新增：issue更新者字段 2023-11-14 10:52:15 +08:00
yystopf 32386c2f66 新增：批量删除ids为空删除全部 2023-11-14 10:37:16 +08:00
yystopf 2437bda410 修复：无法根据root_id查询到对应issue 2023-11-14 10:17:30 +08:00
xxq250 71305d7304 pm issue 查询取消关联，防止关联保存 2023-11-10 10:14:15 +08:00
xxq250 df201d74e0 pm issue修改保存锁释放 2023-11-10 09:44:36 +08:00
KingChan 75a18c1fe4 Merge pull request 'pm issue 信息更新新增 rule' (#195) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-09 14:34:03 +08:00
呱呱呱 e4c4518e8b add rule for update pm 2023-11-09 14:31:55 +08:00
KingChan ea852a8ea6 Merge pull request '调整批量更新' (#194) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-09 14:22:32 +08:00
呱呱呱 6267217c4b update Api::V1::Issues::UpdateService 2023-11-09 14:20:34 +08:00
KingChan af97483873 Merge pull request 'Pm issue 调整更新参数' (#193) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-09 14:03:35 +08:00
呱呱呱 b1d8245a22 update 2023-11-09 14:01:12 +08:00
呱呱呱 12bf781c8b remote pm for routes 2023-11-09 11:24:35 +08:00
KingChan c2424d4633 Merge pull request '新增开始时间和结束时间排序' (#192) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-09 11:11:59 +08:00
呱呱呱 ed5bf51821 add issues.start_date and issues.due_date to issue_list service 2023-11-09 11:07:03 +08:00
KingChan 2cb7a1cf7e Merge pull request '调整方法名 mp_color - pm_color' (#191) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 16:30:48 +08:00
呱呱呱 7fb462d2db change name 2023-11-08 16:28:45 +08:00
KingChan 130024677f Merge pull request '返回issue状态和优先级颜色 PM' (#190) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 16:27:21 +08:00
呱呱呱 fcea1193b9 issue status and priority color 2023-11-08 16:24:10 +08:00
KingChan 4bc7b65726 Merge pull request 'pm issue link index返回结果移除issue本身' (#189) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 14:59:47 +08:00
呱呱呱 e66ae562b7 fix 2023-11-08 14:57:22 +08:00
KingChan 601d058edf Merge pull request '调整link_index' (#188) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 14:53:33 +08:00
呱呱呱 086b66d51d update pm link_index 2023-11-08 14:45:40 +08:00
KingChan cffd930d68 Merge pull request '修复mp issue bug' (#187) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 14:32:54 +08:00
呱呱呱 778f564e8b fix bug for pm issue 2023-11-08 14:31:03 +08:00
KingChan c4d181f887 Merge pull request '调整方法名字' (#186) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 11:01:28 +08:00
KingChan 8d44597916 Merge pull request '调整刷新顺序' (#185) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 10:59:46 +08:00
呱呱呱 a572554102 rename 2023-11-08 10:59:30 +08:00
呱呱呱 3fa3f3a7cc issue refresh aftercreate change to aftersave 2023-11-08 10:57:31 +08:00
KingChan 80ed1c5b8a Merge pull request '新增 issue child count' (#184) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 10:56:29 +08:00
呱呱呱 43be8d1724 update 2023-11-08 10:54:09 +08:00
KingChan 2f61c0963b Merge pull request 'pm issue link_index 增加 pm_issues_type 筛选' (#183) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 09:19:06 +08:00
呱呱呱 452890f825 pm issue link_index add pm_issues_type 2023-11-08 09:17:13 +08:00
KingChan 8af3613200 Merge pull request 'Pm issue新增 link_index 接口' (#182) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-08 09:09:27 +08:00
呱呱呱 ec43b9e97d add Pm issues link_index 2023-11-08 09:07:16 +08:00
KingChan 3aa4d6a33a Merge pull request 'PM link issue' (#181) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-07 17:19:30 +08:00
呱呱呱 c752671453 issue links 2023-11-07 17:16:25 +08:00
KingChan e83bad4df1 Merge pull request 'PM issue 中 parent_id 改为 root_id' (#180) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-07 14:32:43 +08:00
呱呱呱 00448f0f01 change parent_id to root_id 2023-11-07 14:30:28 +08:00
KingChan 084a5d0506 Merge pull request '获取pm issuet统计' (#179) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-07 11:50:20 +08:00
呱呱呱 8329cc113b add issue count to pm projects 2023-11-07 11:44:36 +08:00
KingChan f7ef709b71 Merge pull request 'issue 工时' (#178) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-07 09:56:31 +08:00
呱呱呱 005f1d4aa5 update issue index render 2023-11-07 09:54:50 +08:00
呱呱呱 289cb08ccd issue time_scale 2023-11-07 09:40:50 +08:00
KingChan a5da06b7b3 Merge pull request '同步代码' (#177) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-03 10:44:49 +08:00
xxq250 9c7ad15e38 fixed issue和评论里的附件解析关联，增强附件访问权限控制,切换到 项目保护 2023-11-03 10:38:22 +08:00
xxq250 5646aadfd6 fixed issue评论里的附件解析关联，增强附件访问权限控制 2023-11-03 10:38:22 +08:00
xxq250 3362c78765 fixed issue描述里的附件解析关联，增强附件访问权限控制 2023-11-03 10:37:53 +08:00
呱呱呱 b40fcf5d63 update project pm 2023-11-02 17:04:33 +08:00
KingChan b06785dd54 Merge pull request '新增Pm project' (#176) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-02 15:06:39 +08:00
呱呱呱 840bbff88a add project pm 2023-11-02 15:04:43 +08:00
KingChan cf26f7b51b Merge pull request '修复bug' (#175) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-02 14:43:31 +08:00
呱呱呱 dd30341f6e fix bug 2023-11-02 14:41:33 +08:00
呱呱呱 468c5a3c41 add pm issue 的 pm_project_id 判定 2023-11-02 11:38:52 +08:00
KingChan 99fbd4c04d Merge pull request '调整pm webhook 逻辑' (#174) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-02 11:00:53 +08:00
呱呱呱 8e658d4d12 调整Pm webhook逻辑 2023-11-02 10:57:09 +08:00
KingChan 767b232ed4 Merge pull request '关闭Pm的webhook推送' (#173) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-02 10:49:34 +08:00
呱呱呱 af002c731d close pm webhook 2023-11-02 10:46:31 +08:00
KingChan 32251e8a7b Merge pull request 'Pm项目关闭grimoirelab推送事件' (#172) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-02 10:29:22 +08:00
呱呱呱 061b71955f pm 关闭grimoirelab推送事件 2023-11-02 10:26:47 +08:00
KingChan 44d6de067d Merge pull request '项目管理-调整issue tags' (#171) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-02 09:20:09 +08:00
呱呱呱 f00c3931a8 update issue tags for pm 2023-11-02 09:17:32 +08:00
KingChan 8fd38c0638 Merge pull request 'Pm issue 改造' (#170) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-01 16:53:04 +08:00
呱呱呱 5c72feb705 pm issue and journal 2023-11-01 16:49:00 +08:00
KingChan 41bdbd9531 Merge pull request '调整Pm Issue相关接口' (#169) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-01 10:47:32 +08:00
呱呱呱 36a659678d gm issue 2023-11-01 10:45:06 +08:00
呱呱呱 770f743750 issue pm 2023-10-31 17:03:35 +08:00
KingChan 99cab85b54 Merge pull request 'issue index 改造' (#168) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-10-31 09:18:02 +08:00
呱呱呱 51648e52b3 issue index for pm 2023-10-31 09:11:54 +08:00
呱呱呱 92cefd34b2 stash 2023-10-31 08:19:41 +08:00
xxq250 e4bf925905 fixed issue和评论里的附件解析关联，增强附件访问权限控制,切换到 项目保护 2023-10-31 08:19:41 +08:00
xxq250 34a7add47c fixed issue评论里的附件解析关联，增强附件访问权限控制 2023-10-31 08:19:41 +08:00
xxq250 da5972698f fixed issue描述里的附件解析关联，增强附件访问权限控制 2023-10-31 08:19:41 +08:00
呱呱呱 2e43bab1b5 mp_issues 新增对product id 处理 2023-10-18 16:37:35 +08:00
呱呱呱 f6ffaa82a6 根据pm管理需求新增issue接口 2023-10-18 16:13:20 +08:00