Commit Graph

2337 Commits

Author SHA1 Message Date
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
Captain.B 052fae882e refactor: 打包的时候保留jmeter的jar 2020-08-18 17:09:54 +08:00
shiziyuan9527 26895e0c57 feat: 修改密码时进行二次确认 2020-08-18 16:53:57 +08:00
Captain.B 0fb9f69d83 refactor: 打包的时候保留jmeter的jar 2020-08-18 16:52:30 +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 ab0790a8a2 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 14:32:38 +08:00
chenjianxing fcb8eeedf2 feat(接口测试): 支持Beanshell脚本 2020-08-18 14:32:24 +08:00
Captain.B c8c53a9030 fix: 删除资源池时检查是否存在关联的性能测试 2020-08-18 13:22:05 +08:00
Captain.B c95afcc29e refactor: 代码调整,不强制电脑上有 /opt/jmeter/ 目录 2020-08-18 12:26:34 +08:00
Captain.B 94c3902c61 Merge remote-tracking branch 'origin/master' into master 2020-08-18 11:39:23 +08:00
Captain.B be18d0b9ab refactor: 代码调整,不强制电脑上有 /opt/jmeter/ 目录 2020-08-18 11:39:00 +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 60ed8a0535 Merge branch 'master' of https://github.com/metersphere/server 2020-08-17 19:23:53 +08:00
chenjianxing 5ec095673c feat(接口测试): 前后置脚本页面 2020-08-17 19:23:29 +08:00
Captain.B 1a9d1e1971 refactor: 单接口调试处理mock数据 2020-08-17 13:31:42 +08:00
Captain.B 32ba381ac0 Merge remote-tracking branch 'origin/master' 2020-08-17 13:13:58 +08:00
Captain.B 90dc63c15e refactor: 后台处理mock参数 2020-08-17 13:13:43 +08:00
chenjianxing 0f92569e22 Merge branch 'master' of https://github.com/metersphere/server 2020-08-17 13:07:09 +08:00
chenjianxing 263aba9b57 fix: 单接口调试 2020-08-17 13:06:41 +08:00
Captain.B d9894309d1 Merge remote-tracking branch 'origin/master' 2020-08-17 12:28:55 +08:00
Captain.B b4ed0a5d61 refactor: 后台处理mock参数 2020-08-17 12:28:37 +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
Captain.B 2eaa93b95c Merge remote-tracking branch 'origin/master' 2020-08-14 15:37:16 +08:00
Captain.B c34fb465d0 refactor: 启动Jmeter容器的时候设置HEAP 2020-08-14 15:36:44 +08:00
shiziyuan9527 5b61ff1f99 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-14 14:50:47 +08:00
shiziyuan9527 ce96ec0a4b feat: 修改sql 2020-08-14 14:50:06 +08:00
wenyann 1cff9c1d02 Merge remote-tracking branch 'origin/master' 2020-08-14 14:33:57 +08:00