Commit Graph

1604 Commits

Author SHA1 Message Date
shiziyuan9527 1038f50c3f fix: 修改缺陷描述 2020-08-20 15:00:18 +08:00
chenjianxing 3ebee20b90 Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 14:37:25 +08:00
chenjianxing 84e9c23486 feat(接口测试): 添加超时设置 2020-08-20 14:37:05 +08:00
Captain.B a50666f1d6 Updating the submodule to the latest version 2020-08-20 12:12:20 +08:00
chenjianxing fbed4ecda4 fix: 解决冲突 2020-08-19 18:10:31 +08:00
chenjianxing 948e489626 fix(接口调试): 接口调试响应不更新问题 2020-08-19 18:04:42 +08:00
shiziyuan9527 7445f06d58 refactor: i18n 2020-08-19 17:05:31 +08:00
Captain.B 4c0ca40b1a Merge remote-tracking branch 'origin/master' into master 2020-08-19 16:36:05 +08:00
Captain.B e3ce7c0db2 fix: 修复删除测试和报告的时候没有及时刷新 recent 列表的问题 2020-08-19 16:35:37 +08:00
shiziyuan9527 4efcd10bae refactor: 修改服务集成样式 2020-08-19 15:56:57 +08:00
chenjianxing 83c21a33b5 Merge branch 'master' of https://github.com/metersphere/server 2020-08-19 15:41:24 +08:00
chenjianxing 478d6db83b feat(接口测试): 场景和接口支持禁用和启用 2020-08-19 15:41:14 +08:00
shiziyuan9527 fabba9a364 refactor: i18n 2020-08-19 11:55:00 +08:00
Captain.B b5fab0f8a6 refactor: Api Keys 前端页面修改 2020-08-19 11:50:08 +08:00
Captain.B a435a5194d refactor: Api Keys 前端页面修改 2020-08-19 11:46:01 +08:00
Captain.B 759fd8cadd Merge remote-tracking branch 'origin/master' into master 2020-08-19 11:00:09 +08:00
Captain.B 4b4b3d92dc refactor: 系统设置前端页面修改 2020-08-19 10:58:35 +08:00
wenyann dea1884cc2 Merge remote-tracking branch 'origin/master' 2020-08-19 10:46:08 +08:00
wenyann 88429985c6 style(LDAP): 删掉无用代码 2020-08-19 10:45:40 +08:00
q4speed 0197515077 chore: 子模块 2020-08-19 10:22:04 +08:00
wenyann b60d296c85 feat(测试跟踪): 新增缺陷列表,缺陷数 2020-08-19 10:03:15 +08:00
wenyann 29f5e772a1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-19 10:02:22 +08:00
wenyann d9b3831b3e feat(测试跟踪): 新增缺陷列表,缺陷数 2020-08-19 10:02:02 +08:00
chenjianxing b04c573362 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 19:02:10 +08:00
chenjianxing d820bf400c feat(接口测试): dubbo BeanShell 2020-08-18 19:01:49 +08:00
shiziyuan9527 744e1fd7c2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 18:47:32 +08:00
shiziyuan9527 ae151e4535 refactor: 修改样式 2020-08-18 18:47:24 +08:00
chenjianxing 65a033ce3a Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 18:43:28 +08:00
chenjianxing f60e06d4c0 feat(接口测试): BeanShell 代码提示 2020-08-18 18:42:55 +08:00
q4speed cadcf9eb7b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-08-18 18:10:02 +08:00
q4speed a26a12fb17 fix: 修复保存工作控件配额时超出组织的配额的bug 2020-08-18 18:08:50 +08:00
shiziyuan9527 26895e0c57 feat: 修改密码时进行二次确认 2020-08-18 16:53:57 +08:00
shiziyuan9527 ea8445a676 fix: 关联用例时首次加载全部用例 2020-08-18 16:30:29 +08:00
wenyann 6e8f7f4796 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 16:10:29 +08:00
wenyann 509e5c9fbb feat(LDAP): 测试报告导出 2020-08-18 15:56:19 +08:00
shiziyuan9527 7ffb6812cf fix: 取消集成后,解除项目关联 2020-08-18 15:44:41 +08:00
shiziyuan9527 ab07bc3de8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 14:34:43 +08:00
shiziyuan9527 46d52334bf feat: 测试计划测试用例列表显示缺陷数 2020-08-18 14:33:52 +08:00
chenjianxing fcb8eeedf2 feat(接口测试): 支持Beanshell脚本 2020-08-18 14:32:24 +08:00
chenjianxing 163fae2e51 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 10:21:13 +08:00
chenjianxing a3bc670b44 fix: 修改sso名称 2020-08-18 10:20:39 +08:00
shiziyuan9527 240ac7ab26 feat: 集成Jira 2020-08-17 22:01:15 +08:00
chenjianxing 5ec095673c feat(接口测试): 前后置脚本页面 2020-08-17 19:23:29 +08:00
chenjianxing 263aba9b57 fix: 单接口调试 2020-08-17 13:06:41 +08:00
chenjianxing 064304ba28 refactor: 适配cas 2020-08-17 10:09:19 +08:00
Captain.B 6e7fe725a1 Merge remote-tracking branch 'origin/master' 2020-08-14 19:20:11 +08:00
Captain.B fa23fcdfcd feat(接口测试): 代码调整 2020-08-14 19:19:53 +08:00
shiziyuan9527 f52a5cc078 feat: 集成Tapd 2020-08-14 18:07:42 +08:00
Captain.B b86fbafa00 feat(接口测试): Jmeter 函数说明 2020-08-14 16:51:36 +08:00
Captain.B ea872b5f79 feat(接口测试): Jmeter 函数说明 2020-08-14 16:50:12 +08:00