Commit Graph

1724 Commits

Author SHA1 Message Date
viletyy 77ec7e5a69 Merge branch 'develop' into standalone_develop 2022-10-17 10:25:47 +08:00
“xxq250” 4e02dbe06b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	app/controllers/attachments_controller.rb
2022-10-17 10:14:13 +08:00
“xxq250” 620ddff9bb fixed issue评论附件权限 2022-10-17 10:13:30 +08:00
viletyy 6b6c0791cd Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-10-14 15:02:59 +08:00
viletyy 2df259c927 Merge branch 'develop' into standalone_develop 2022-10-14 15:02:53 +08:00
yystopf 83f1263f85 修复:更改查询项目判断条件 2022-10-14 14:52:25 +08:00
“xxq250” 8b1f06f010 cloudIDE saas定制api 2022-10-12 15:58:46 +08:00
“xxq250” c668fd3530 cloudIDE saas定制api 2022-10-12 15:38:40 +08:00
“xxq250” e7bbe252de cloudIDE saas定制api 2022-10-12 15:37:22 +08:00
viletyy a516363763 Merge branch 'develop' into standalone_develop 2022-10-08 18:44:28 +08:00
yystopf a7384bc1c3 修复:代码详情页报错 2022-10-08 18:44:04 +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
yystopf d68e7f38a3 新增:更改邮箱service逻辑 2022-09-29 09:30:33 +08:00
yystopf 649d9c4ea6 新增:更改邮箱控制器方法 2022-09-28 16:09:10 +08:00
“xxq250” c08868b26a fixed 用户活跃数 2022-09-26 16:12:12 +08:00
“xxq250” fce8166ba7 fixed 用户活跃数 2022-09-26 16:11:34 +08:00
“xxq250” ae0efc1115 Merge remote-tracking branch 'origin/develop' into develop 2022-09-26 10:38:32 +08:00
“xxq250” dfc2edd62d fixed注册gitea错误信息 2022-09-26 10:38:28 +08:00
yystopf af7a779af6 merge from develop 2022-09-23 10:09:51 +08:00
yystopf cc42683316 新增:活跃度计算访问量限制 2022-09-23 10:07:52 +08:00
“xxq250” b832a8ecc6 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-09-21 16:00:19 +08:00
“xxq250” 5c123fba17 头歌接口更换密钥 2022-09-21 16:00:13 +08:00
yystopf b7193aa768 Merge branch 'develop' into standalone_develop 2022-09-21 10:06:39 +08:00
yystopf 70f1e6827f 更改:项目已设置语言,则不重新设置语言 2022-09-21 10:06:29 +08:00
yystopf b4e0cc6dc1 Merge branch 'develop' into standalone_develop 2022-09-21 09:55:05 +08:00
yystopf b5188e3272 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-09-21 09:54:53 +08:00
yystopf ff881732d2 更改:项目已设置语言,则不重新设置语言 2022-09-21 09:54:49 +08:00
“xxq250” b07e5d6993 Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-09-20 09:43:20 +08:00
“xxq250” bb8e6aeaf8 nps数据统计 2022-09-20 09:41:27 +08:00
“xxq250” ac8959f36f fixed 修改密码接口 2022-09-19 15:51:59 +08:00
“xxq250” 6d7b7dd058 fixed 修改密码接口 2022-09-19 10:06:49 +08:00
yystopf 4994179a33 Merge branch 'develop' into standalone_develop 2022-09-15 09:57:34 +08:00
yystopf 481d1b7db0 修复:commit log统计触发规则 2022-09-15 09:57:28 +08:00
yystopf a1b2bdd048 Merge branch 'develop' into standalone_develop 2022-09-15 09:49:51 +08:00
yystopf 383660c778 更改:组织缓存信息方式改在控制器里面 2022-09-15 09:38:28 +08:00
yystopf ecd43dbd12 Merge branch 'develop' into standalone_develop 2022-09-08 14:19:16 +08:00
yystopf 4bd77a870b 更改:webhook创建数量限制为50个 2022-09-08 14:19:08 +08:00
yystopf 9022fdcb80 Merge branch 'develop' into standalone_develop 2022-09-08 10:41:02 +08:00
yystopf b1f460d760 更改:webhook创建数量限制为50个 2022-09-08 10:40:52 +08:00
“xxq250” 925b05e004 nps已打分区分 2022-09-06 10:29:49 +08:00
“xxq250” fd66a3149d nps已打分区分 2022-09-05 13:44:23 +08:00
“xxq250” eb1a3f8e23 调整nps用户调研接口,需要登录 2022-08-31 10:40:25 +08:00
“xxq250” a7c24dea64 调整nps用户调研接口 2022-08-31 10:40:24 +08:00
“xxq250” 32a9d762d8 调整nps用户调研接口,需要登录 2022-08-31 10:39:52 +08:00
“xxq250” 0a79950046 调整nps用户调研接口 2022-08-31 10:38:21 +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 1613cf7376 Merge branch 'develop' into standalone_develop 2022-08-30 10:40:37 +08:00
yystopf aa50c50254 修复 2022-08-30 10:40:27 +08:00
yystopf 43a41399ac 新增:添加全部或者移除全部团队项目 2022-08-30 10:35:43 +08:00
yystopf 0f41cabe71 新增:添加全部或者移除全部团队项目 2022-08-30 10:23:35 +08:00
“xxq250” 8f4cb2667f fixed 组织成员列表查询优化 2022-08-29 10:08:25 +08:00
“xxq250” d04ed7e008 fixed 组织成员列表查询优化 2022-08-29 10:05:56 +08:00
yystopf 5c5b4b5d92 新增:分页数量限制修改 2022-08-24 10:30:23 +08:00
“xxq250” dbdb860bb7 fixed commit日志同时更新项目时间 2022-08-16 15:33:46 +08:00
“xxq250” 217ab920a9 fixed commit日志同时更新项目时间 2022-08-16 15:33:15 +08:00
yystopf 63cdaed3ac 更改:代码溯源status改为code 2022-08-15 15:56:07 +08:00
yystopf ee29c6be5c Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-08-15 15:55:37 +08:00
yystopf c0ee0a694c 更改:代码溯源status改为code 2022-08-15 15:55:33 +08:00
“xxq250” e5989b219f fixed reposyncer job任务增加分页 2022-08-15 14:04:06 +08:00
“xxq250” 467d722d25 fixed reposyncer job任务增加分页 2022-08-15 14:03:27 +08:00
yystopf 04cd427c5f 新增:代码溯源需提前获取服务器是否在维护 2022-08-12 18:15:59 +08:00
viletyy 71b42e462e merge from develop 2022-08-11 09:52:43 +08:00
“xxq250” bdddd655bf Merge remote-tracking branch 'origin/develop' into develop 2022-08-11 09:31:49 +08:00
“xxq250” 6ec7a13293 fixed reposyncer 分支组合已配置,不能重复 2022-08-11 09:31:40 +08:00
“xxq250” 716b29c25f fixed 消息模板配置type 2022-08-11 09:29:37 +08:00
“xxq250” 5c4930a362 fixed 消息模板配置type 2022-08-11 09:29:36 +08:00
“xxq250” 964bef7896 fixed 消息模板配置type 2022-08-11 09:29:34 +08:00
“xxq250” 7e48e5e8b8 fixed 消息模板配置 2022-08-11 09:29:34 +08:00
“xxq250” 48846a7e31 fixed 已读未读标记优化 2022-08-11 09:29:33 +08:00
yystopf 32db15aad5 新增: commit找不到返回404 2022-08-11 09:29:12 +08:00
“xxq250” c167c39050 fixed 消息模板配置type 2022-08-10 17:43:27 +08:00
“xxq250” 58368277c0 fixed 消息模板配置type 2022-08-10 17:25:55 +08:00
“xxq250” 9ce7cdf0c3 fixed 消息模板配置type 2022-08-10 17:20:29 +08:00
“xxq250” e46c934b2c fixed 消息模板配置 2022-08-10 16:54:00 +08:00
“xxq250” b949ee260d fixed 已读未读标记优化 2022-08-10 16:07:20 +08:00
“xxq250” 1efff8a97a Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-08-09 10:23:01 +08:00
“xxq250” 4199f4097c fixed reposyncer gitlink地址配置文件取 2022-08-09 10:22:55 +08:00
yystopf a0dcc289c8 Merge branch 'develop' into standalone_develop 2022-08-09 09:48:14 +08:00
yystopf 4b05838498 新增:合并请求评论新增path参数筛选以及去掉分页最多返回200数据 2022-08-09 09:48:02 +08:00
yystopf 0699c768a5 新增:fork仓库不支持代码溯源 2022-08-08 14:17:45 +08:00
“xxq250” e7aa05b535 fixed reposyncer 删除job任务 2022-08-05 13:48:40 +08:00
“xxq250” 14f4b290cb fixed reposyncer job_logs 2022-08-05 11:42:40 +08:00
yystopf 65e1cd2c01 Merge branch 'develop' into standalone_develop 2022-08-05 11:05:37 +08:00
yystopf b8be0c23cb 修复 2022-08-05 11:05:29 +08:00
yystopf d4405b8827 Merge branch 'develop' into standalone_develop 2022-08-05 10:50:52 +08:00
yystopf d20a7b1318 修复:项目协作者添加组织成员问题 2022-08-05 10:50:41 +08:00
yystopf 0993e5a3ae Merge branch 'develop' into standalone_develop 2022-08-04 17:28:29 +08:00
yystopf f8268accc0 新增: 组织下项目协作者添加当前用户 2022-08-04 17:28:14 +08:00
“xxq250” 690ddcb4a7 fixed reposyncer 分支组合已配置,不能重复 2022-08-04 17:20:24 +08:00
“xxq250” 72a4549fe9 fixed reposyncer jobs 分组 2022-08-04 17:02:25 +08:00
“xxq250” 4fb2003f64 fixed reposyncer 分支组合已配置,不能重复 2022-08-04 16:50:01 +08:00
“xxq250” 4941e08684 fixed reposyncer job_type 2022-08-04 16:24:19 +08:00
“xxq250” ebe8df8221 fixed reposyncer delete 2022-08-04 11:24:15 +08:00
“xxq250” 1b3a4bc146 fixed reposyncer gitlink地址 2022-08-04 10:37:28 +08:00
“xxq250” 7332e4a58b Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-08-04 10:03:34 +08:00
“xxq250” 1a2352c535 fixed reposyncer gitlink地址 2022-08-04 10:03:29 +08:00
yystopf 958ee42fa2 Merge branch 'develop' into standalone_develop 2022-08-03 17:13:53 +08:00