Commit Graph

871 Commits

Author SHA1 Message Date
q4speed a1b7d214b0 Merge remote-tracking branch 'origin/dev' into dev 2020-05-10 11:54:48 +08:00
q4speed 81b888b2a2 调整JMeter Home目录 2020-05-10 11:54:35 +08:00
chenjianxing 4c10f521fa Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 20:06:57 +08:00
chenjianxing 7883b6ff43 用例导入时显示导入中 2020-05-09 20:06:32 +08:00
chenjianxing b941ffebf5 测试用例执行人显示名称 2020-05-09 19:26:42 +08:00
王振 c316b279c1 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 19:05:02 +08:00
王振 870595b6a2 fix 导入用例模块树层级问题 2020-05-09 19:04:35 +08:00
chenjianxing e50241158f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 19:03:35 +08:00
chenjianxing 08d3ec19ef 测试详筛选排序 2020-05-09 18:39:47 +08:00
chenjianxing f014d5267d fix 测试用例查询 2020-05-09 18:07:23 +08:00
chenjianxing 4df45d190c 测试用例筛选排序 2020-05-09 17:55:13 +08:00
Captain.B c62bf4c960 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 16:51:56 +08:00
Captain.B 2a686f5133 lombok 2020-05-09 16:49:43 +08:00
q4speed 4131aac4a1 删除jmeter 2020-05-09 16:48:53 +08:00
q4speed 615ecbed49 简化 2020-05-09 16:10:57 +08:00
q4speed 7854c999c9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 16:03:44 +08:00
q4speed 29a78a42c7 API翻译同步 2020-05-09 16:03:30 +08:00
Captain.B 02b1f1f80b 使用operator button 2020-05-09 16:03:07 +08:00
Captain.B 3cfc37a2f7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:58:36 +08:00
Captain.B 7ad65837fb 使用operator button 2020-05-09 15:44:33 +08:00
shiziyuan9527 f0427d4705 组织,工作空间管理员无法移除自身 2020-05-09 15:40:57 +08:00
q4speed c1035e00ae Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:33:00 +08:00
q4speed ac6235d334 修改JMeter Home位置 2020-05-09 15:32:43 +08:00
q4speed 85bf0d0ba1 修正指针形状 2020-05-09 15:31:49 +08:00
Captain.B 1a685ab202 删除不用的代码 2020-05-09 15:28:58 +08:00
q4speed efec984b90 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 14:51:51 +08:00
q4speed 2a7be35de1 API报告页面 2020-05-09 14:51:37 +08:00
Captain.B 642dd588f3 md5 2020-05-09 13:43:12 +08:00
Captain.B f3c04ce4eb Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-09 13:23:37 +08:00
chenjianxing 7c9004aaaa 测试用例,继续创建下一个 2020-05-09 13:01:32 +08:00
wenyann 6012004200 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 12:08:06 +08:00
wenyann 998134b1f1 修改用户密码 2020-05-09 12:06:09 +08:00
chenjianxing 18e2cc8960 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 11:36:19 +08:00
chenjianxing de3faf3ca5 用例模块等允许带空格 2020-05-09 11:36:01 +08:00
shiziyuan9527 0752a0c54b 修改个人信息 2020-05-09 11:05:03 +08:00
Captain.B 74075ddefc 样式 2020-05-09 11:01:09 +08:00
wenyann 43e5381a22 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 10:52:10 +08:00
chenjianxing 366ae5e95c 更新最近计划 2020-05-09 10:44:15 +08:00
chenjianxing e20f091f7a fix 模版编辑 2020-05-09 09:33:53 +08:00
chenjianxing 7dbd070736 浏览器回退,遮罩层无法关闭 2020-05-08 19:25:05 +08:00
wenyann b5760cd2b4 性能测试样式修改 2020-05-08 19:09:09 +08:00
chenjianxing 90c2e0d1f5 测试报告模版 2020-05-08 18:54:47 +08:00
chenjianxing 845439661e date picker 2020-05-08 18:43:12 +08:00
Captain.B 841019d4a7 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/i18n/zh-CN.js
2020-05-08 18:03:34 +08:00
Captain.B 843d7ed3b1 日志下载 2020-05-08 18:02:58 +08:00
wenyann b8f10e2ea0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 17:42:03 +08:00
shiziyuan9527 bd023c1f27 修改Dialog按钮 2020-05-08 17:21:58 +08:00
wenyann 62ee448245 demo 2020-05-08 17:19:28 +08:00
chenjianxing 45ac65da59 报告图表 2020-05-08 17:06:29 +08:00
shiziyuan9527 6dc6cc8459 修改方法命名 2020-05-08 16:05:01 +08:00