test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,506 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

1716 Commits

Author SHA1 Message Date
q4speed b9586a2b5d refactor: 优化 2020-07-16 13:09:40 +08:00
chenjianxing 97cb512ea9 Merge branch 'master' of https://github.com/metersphere/server 2020-07-16 11:41:10 +08:00
chenjianxing 438715a0a5 feat: 常见请求头提示 2020-07-16 11:41:01 +08:00
shiziyuan9527 9641021797 refactor: 删除无用代码 2020-07-16 11:25:50 +08:00
wenyann 4a22ef3224 Merge remote-tracking branch 'origin/master' 2020-07-16 11:20:04 +08:00
wenyann 8fd6cfba4f fix: 修改校验提示 2020-07-16 11:19:19 +08:00
shiziyuan9527 10344e477e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-15 23:23:20 +08:00
shiziyuan9527 0461766d85 fix: 测试用例排序bug 2020-07-15 23:13:51 +08:00
shiziyuan9527 f4e3fccf5b feat: 测试用例按照ID排序 2020-07-15 21:56:13 +08:00
chenjianxing 942707ab64 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 20:45:46 +08:00
chenjianxing bfa01c09e9 fix: 修复接口测试落干bug 2020-07-15 20:45:33 +08:00
shiziyuan9527 b5f471c67d feat: 测试用例列表添加ID展示列 2020-07-15 18:52:46 +08:00
q4speed cbdefab47b Merge remote-tracking branch 'origin/master' 2020-07-15 16:00:48 +08:00
q4speed 73161105f5 refactor: 去掉无用代码 2020-07-15 16:00:37 +08:00
chenjianxing ddf4d7f938 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 15:35:49 +08:00
chenjianxing 685da4ccef feat: Swagger2 导入接口测试 2020-07-15 15:35:36 +08:00
q4speed 323b341113 fix: 修复高级搜索时间控件不能正确重置的bug 2020-07-15 13:40:36 +08:00
q4speed dfde0171dd fix: 修复"reset"其他语种内容 2020-07-15 11:57:28 +08:00
q4speed cac4d74f56 feat: 2020-07-15 11:54:52 +08:00
wenyann b15d35558f Merge remote-tracking branch 'origin/master' 2020-07-15 10:41:12 +08:00
wenyann 1d5fb3f3ff style: 调整代码格式 2020-07-15 10:40:43 +08:00
shiziyuan9527 0c9badda9c fix: LDAP用户登录问题 2020-07-14 17:28:53 +08:00
q4speed 60423f43a6 fix: 修复繁体中文部分创建人没有翻译的bug 2020-07-14 14:04:40 +08:00
wenyann aeeed5a37d Merge remote-tracking branch 'origin/v1.0' into v1.0 2020-07-14 13:33:23 +08:00
wenyann 73ca13550b fix: 修改校验提示 2020-07-14 13:33:02 +08:00
q4speed 99bfca41b4 fix: 修复无效翻译bug 2020-07-14 11:51:03 +08:00
q4speed f19eb2e3dd style: 修复高级搜多个尺寸的样式 2020-07-14 11:42:48 +08:00
q4speed e052927cda chore: 合并代码 2020-07-14 11:24:50 +08:00
q4speed bc74a0a95e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
 2020-07-14 11:19:02 +08:00
q4speed 4b83f68b6a fix: 修复高级搜索国际化bug 2020-07-14 11:17:42 +08:00
q4speed 97bdb3f5e1 style: 修复小屏幕样式 2020-07-14 10:45:24 +08:00
wenyann 686baea129 Merge remote-tracking branch 'origin/master' 2020-07-14 10:15:47 +08:00
wenyann cd60ef9be8 测试用例导出 2020-07-14 10:15:11 +08:00
shiziyuan9527 b9c369ec5c feat: 关联测试用例页面添加高级搜索 2020-07-13 21:25:45 +08:00
shiziyuan9527 b2d036a81b 测试用例查询关联测试添加loading 2020-07-13 16:23:07 +08:00
q4speed c715a96cb7 高级查询 2020-07-13 16:05:01 +08:00
q4speed c98c8bd340 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
 2020-07-13 10:27:06 +08:00
q4speed 8df025f84c Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
 2020-07-13 10:25:17 +08:00
q4speed a975a85d56 i18n 2020-07-13 10:18:05 +08:00
q4speed 79f8ecee6c i18n 2020-07-10 18:14:54 +08:00
shiziyuan9527 d9ab83afa0 i18n 2020-07-10 17:34:33 +08:00
q4speed 8cb07f6ab6 高级查询控件i18n 2020-07-10 16:49:23 +08:00
q4speed 7e40811443 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-10 16:44:03 +08:00
q4speed 37577b76b0 高级查询控件 2020-07-10 16:43:43 +08:00
shiziyuan9527 aca19f6dfa 通过ldap登录的用户不能修改密码和邮箱 2020-07-10 16:27:41 +08:00
Captain.B 96e2d4f98d 登录页面loading 2020-07-10 14:41:35 +08:00
q4speed 5a377843d9 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
 2020-07-10 10:47:56 +08:00
q4speed ec5d1fa513 高级查询，未完。。。 2020-07-10 10:43:14 +08:00
Captain.B b2e4a94a35 前端端口指定 2020-07-09 17:04:34 +08:00
shiziyuan9527 019933d4d2 i18n 2020-07-09 16:35:29 +08:00
wenyann 1a66b69da0 ， 2020-07-09 16:26:27 +08:00
wenyann fc39278cae 在提交Case结论时增加防呆处理 2020-07-09 16:22:51 +08:00
shiziyuan9527 6cf137f777 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-09 15:09:32 +08:00
shiziyuan9527 e71e866827 测试计划关联用例页增加按用例名称搜索 2020-07-09 15:09:05 +08:00
chenjianxing cf9cffb114 Merge branch 'master' of https://github.com/metersphere/server 2020-07-09 15:09:01 +08:00
chenjianxing 23c8f9a8ea merge v1.0 2020-07-09 15:08:37 +08:00
shiziyuan9527 0228043184 测试计划关联用例增加优先级和类型并支持筛选 2020-07-09 14:17:05 +08:00
chenjianxing beba2650eb Merge branch 'v1.0' of https://github.com/metersphere/server into v1.0 2020-07-09 14:13:03 +08:00
chenjianxing 3c797c645e fix post请求url参数问题 2020-07-09 14:12:42 +08:00
chenjianxing 93b011a4ac Merge branch 'master' of https://github.com/metersphere/server 2020-07-08 17:56:17 +08:00
chenjianxing 5318537e12 支持 postman 导入 2020-07-08 17:56:05 +08:00
shiziyuan9527 5c4ce18486 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-08 15:47:57 +08:00
shiziyuan9527 e45810701d ldap 2020-07-08 15:47:44 +08:00
chenjianxing 901cbfdaf4 Merge branch 'master' of https://github.com/metersphere/server 2020-07-08 11:57:55 +08:00
chenjianxing 3dcf2f0f2a 接口测试导入- Metersphere(json) 2020-07-08 11:57:45 +08:00
shiziyuan9527 fbb6fc0277 ldap 2020-07-08 01:02:16 +08:00
Captain.B 712154dd8a ws or wss 2020-07-07 18:23:37 +08:00
wenyann 024304d018 密码框刷新修改 2020-07-07 17:52:37 +08:00
wenyann b852fe7457 Merge remote-tracking branch 'origin/v1.0' into v1.0 2020-07-07 16:31:56 +08:00
wenyann a0483661bd smtp修改 2020-07-07 16:29:01 +08:00
chenjianxing 1ab097bc29 优化断言和提取页面 2020-07-07 10:32:47 +08:00
chenjianxing 86077b91e2 Merge branch 'master' of https://github.com/metersphere/server 2020-07-07 09:13:56 +08:00
chenjianxing 3341602733 i18n 2020-07-07 09:13:32 +08:00
shiziyuan9527 d38cffe952 ldap 2020-07-06 18:17:31 +08:00
q4speed 00dafd93ce 统一格式 2020-07-06 16:05:32 +08:00
shiziyuan9527 0652e2906d 修改更新用户时的对话框宽度 2020-07-06 15:32:05 +08:00
shiziyuan9527 44dd7ca653 请求统计数据显示优化 2020-07-06 15:26:44 +08:00
chenjianxing 76b68b2214 Merge branch 'master' of https://github.com/metersphere/server 2020-07-06 11:53:45 +08:00
chenjianxing 785705e69e api测试环境配置 2020-07-06 11:53:36 +08:00
shiziyuan9527 9cfaa9ab73 fix 新建用例勾选保存并继续创建后，新的用例内容没有清空 2020-07-03 15:31:10 +08:00
Captain.B 9f9109fbe2 rpsLimitEnable 2020-07-03 13:38:32 +08:00
shiziyuan9527 6ea6725356 fix 编辑项目信息时，存在上一次显示的校验提示 2020-07-02 18:21:28 +08:00
shiziyuan9527 74417e6bec Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-02 17:35:26 +08:00
shiziyuan9527 f9c9709fd3 i18n 2020-07-02 17:34:36 +08:00
chenjianxing 1e5433e0e4 Merge branch 'master' of https://github.com/metersphere/server 2020-07-02 17:00:40 +08:00
chenjianxing 08c689a72d 环境配置相关操作 2020-07-02 17:00:26 +08:00
Captain.B b35a9540d7 Merge remote-tracking branch 'origin/master' 2020-07-02 16:44:37 +08:00
Captain.B 48c0299ca8 再次执行测试功能 2020-07-02 16:43:49 +08:00
shiziyuan9527 fa59db4418 LDAP 测试登录 2020-07-02 15:51:26 +08:00
wenyann 6a1168a187 残留提示 2020-07-02 11:42:52 +08:00
shiziyuan9527 4730a63a13 修改系统参数设置样式 2020-07-02 11:02:57 +08:00
shiziyuan9527 62f6dd634c LDAP 测试连接 2020-07-01 18:38:48 +08:00
shiziyuan9527 89aaf0396b 系统参数LDAP设置 2020-07-01 14:57:15 +08:00
wenyann 25f7063b37 smtp 2020-07-01 14:38:59 +08:00
shiziyuan9527 d592b687ff 删除无用代码 2020-07-01 14:04:31 +08:00
wenyann f569412165 名称 2020-07-01 13:56:21 +08:00
chenjianxing d21b7282d0 merge v1.0 2020-06-30 17:39:52 +08:00
chenjianxing 1434d96aed Merge branch 'master' of https://github.com/metersphere/server 2020-06-30 17:29:29 +08:00
chenjianxing e7a180f442 环境配置前端组件 2020-06-30 17:29:07 +08:00
Captain.B e0306f2d0c 实时报告通知前端 2020-06-30 15:17:36 +08:00
chenjianxing 19430cc6a4 Merge branch 'v1.0' of https://github.com/metersphere/server into v1.0 2020-06-30 09:34:09 +08:00
chenjianxing 3667587e39 支持从响应头等对象中提取 2020-06-30 09:23:04 +08:00
chenjianxing 56d25dfcd8 支持从响应头等对象中提取 2020-06-29 21:11:36 +08:00
chenjianxing ef724bdccb 回退接口测试相关 2020-06-29 16:42:20 +08:00
Captain.B dfb1eb0224 Merge remote-tracking branch 'origin/master' 2020-06-29 13:40:37 +08:00
Captain.B 910ce17270 立即停止测试功能 2020-06-29 13:40:02 +08:00
chenjianxing 62c720f0a9 fix 接口测试-主机和端口支持变量 2020-06-29 11:28:06 +08:00
Captain.B 3f00363e6f 实时报告初版 2020-06-28 16:20:14 +08:00
chenjianxing 0ed718c214 定时任务校验 2020-06-28 14:02:31 +08:00
chenjianxing 22c1858846 测试报告添加触发方式 2020-06-28 10:34:50 +08:00
chenjianxing fdfac7f038 性能测试-定时任务 2020-06-24 17:33:42 +08:00
chenjianxing a5bfd41bee fix schedule 2020-06-24 13:48:56 +08:00
chenjianxing c0faacae36 应用启动时启动任务调度 2020-06-24 13:06:57 +08:00
chenjianxing 2afce7f966 接口测试-定时任务 2020-06-24 11:17:31 +08:00
shiziyuan9527 aabfd2a38d fix 对用例模块进行相关操作之后树组件自动折叠问题 2020-06-23 14:58:40 +08:00
q4speed 5cc1ff291a 修复请求内容为乱码bug 2020-06-23 13:24:15 +08:00
wenyann e39ce8f87b ' 2020-06-23 13:23:40 +08:00
wenyann a29fd908f6 '删除提示' 2020-06-23 13:23:40 +08:00
shiziyuan9527 23ca13b278 fix 连续创建用例时用例列表不刷新问题 2020-06-23 13:23:40 +08:00
chenjianxing 4972b11b4b Merge branch 'v1.0' of https://github.com/metersphere/server into v1.0 2020-06-23 13:09:58 +08:00
q4speed b853206b98 修复请求内容为乱码bug 2020-06-23 10:45:14 +08:00
Captain.B 7f6a2e0e41 Merge remote-tracking branch 'origin/master' 2020-06-23 09:31:33 +08:00
Captain.B 4055ef2f83 点击显示 secretkey i18n 2020-06-23 09:31:03 +08:00
wenyann c3fc3010b6 Merge branches 'master' and 'v1.0' of https://github.com/metersphere/metersphere into v1.0 2020-06-22 18:29:29 +08:00
shiziyuan9527 8bcf1ebc4c Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/pom.xml
 2020-06-22 18:26:02 +08:00
Captain.B 78b0f4a4d9 用户添加apikey 2020-06-22 18:22:58 +08:00
shiziyuan9527 5ee182ac19 fix 对用例模块进行相关操作之后树组件自动折叠问题 2020-06-22 15:20:57 +08:00
shiziyuan9527 b66c3765ef ldap 2020-06-22 14:13:34 +08:00
chenjianxing f8cb40cb10 接口测试 shcedule 业务逻辑 2020-06-22 12:49:20 +08:00
chenjianxing 268b03dac6 Scheduler 前端组件 2020-06-19 15:18:59 +08:00
wenyann d970d1ccf8 ' 2020-06-19 14:23:15 +08:00
wenyann 20f59cad3a '删除提示' 2020-06-19 14:03:16 +08:00
shiziyuan9527 9ccba51057 fix 连续创建用例时用例列表不刷新问题 2020-06-19 11:05:13 +08:00
chenjianxing 32ddafa8b1 cron组件 2020-06-18 16:27:24 +08:00
chenjianxing 26a450de6d merge v1.0 2020-06-17 18:03:48 +08:00
chenjianxing d0af80d3f0 fix 测试用例点保存后状态更新不及时 2020-06-17 17:40:44 +08:00
q4speed 7a7bb861ad 修复URL替换变量转义bug 2020-06-17 12:27:55 +08:00
chenjianxing 12cc7da26b fix 测试执行人等过滤只读用户 2020-06-16 19:49:00 +08:00
chenjianxing d855dca091 Merge branch 'v1.0' of https://github.com/metersphere/server into v1.0 2020-06-16 19:16:24 +08:00
chenjianxing a7f15275cd fix 多角色测试状态显示问题 2020-06-16 19:09:13 +08:00
wenyann 685a36f169 Merge remote-tracking branch 'origin/v1.0' into v1.0 2020-06-16 16:31:52 +08:00
wenyann bf3051cfe7 '去掉原密码复杂度校验' 2020-06-16 16:31:29 +08:00
chenjianxing 879f0f8644 接口测试请求url长度限制 2020-06-16 16:30:04 +08:00
q4speed 19666312ae 请求参数长度限制改为500 2020-06-16 15:57:09 +08:00
wenyann 47fc83bcc3 '用户创建密码框提示' 2020-06-16 15:47:34 +08:00
shiziyuan9527 5f1ff0753f 性能测试压力配置添加参数校验 2020-06-16 15:29:33 +08:00
q4speed 74eacb1bd4 增加导出接口测试配置标识和版本。 2020-06-16 11:32:15 +08:00
q4speed ec44a1d373 减少warn 2020-06-16 11:14:29 +08:00
q4speed 5964527509 只导出场景配置 2020-06-16 11:08:12 +08:00
q4speed 5ae9522282 接口测试增加导出配置 2020-06-16 11:01:35 +08:00
wenyann 02a5c99a8b '用户创建密码框提示' 2020-06-16 10:49:39 +08:00
q4speed 8bd1a34131 增加一个日志 2020-06-16 10:42:59 +08:00
wenyann 284a6adda1 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-16 10:37:37 +08:00
chenjianxing 1e99e83ea4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-15 19:00:42 +08:00
chenjianxing a3bd0a7be5 测试报告失败用例列表i18n 2020-06-15 18:59:55 +08:00
chenjianxing 5006919f91 重构测试报告 2020-06-15 18:31:51 +08:00
q4speed 07d59ed2bd Merge remote-tracking branch 'origin/dev' into dev 2020-06-15 18:06:03 +08:00
q4speed 42f99a0154 修复复制接口测试重名bug 
增加后端model以便未来支持导入
修改响应时间断言名称，跟jmeter保持一致
 2020-06-15 18:05:48 +08:00
wenyann b1237654ff '密码框提示' 2020-06-15 17:28:12 +08:00
shiziyuan9527 df313fb05c fix 描述输入框 2020-06-15 15:58:53 +08:00
shiziyuan9527 4e04c0a1ab 系统工作空间描述 添加字符限制 2020-06-15 15:05:26 +08:00
chenjianxing 200522d184 Merge branch 'dev' into jianxing 2020-06-15 11:39:36 +08:00
chenjianxing 1253796664 性能测试添加创建测试按钮 2020-06-15 11:28:56 +08:00
chenjianxing cc4e72906e 测试报告失败列表 2020-06-15 10:59:10 +08:00
chenjianxing 3e31004632 项目描述宽度自适应 2020-06-12 18:04:39 +08:00
chenjianxing f5d91992a3 fix 测试计划状态修改权限 2020-06-12 11:08:04 +08:00
chenjianxing e00aac7bee 代码优化 2020-06-12 10:07:18 +08:00
chenjianxing d96578f305 切换组织时自动选取工作空间 2020-06-12 09:49:27 +08:00
chenjianxing 2971c41290 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-11 16:45:05 +08:00
chenjianxing 999d3baa89 修改权限指令 2020-06-11 16:44:48 +08:00
shiziyuan9527 f675a8fa82 i18n 2020-06-11 15:41:50 +08:00
shiziyuan9527 3ab0ef54b5 用户ID校验 2020-06-11 15:26:09 +08:00
chenjianxing 6944f99814 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-11 11:54:56 +08:00
shiziyuan9527 20a0fa0fcc 删除资源池前进行检查 2020-06-11 11:44:52 +08:00
chenjianxing 0d27c0610a 菜单栏样式 2020-06-11 11:43:39 +08:00
shiziyuan9527 781effee73 下拉选择用户时，显示用户ID和邮箱 2020-06-11 10:52:33 +08:00
Captain.B e8d2ca6f33 Merge remote-tracking branch 'origin/dev' into dev 2020-06-11 10:41:27 +08:00
Captain.B 6560a87bd6 去掉dns cache 2020-06-11 10:39:09 +08:00
wenyann 3ef9d6bdd4 '' 2020-06-11 10:12:27 +08:00
chenjianxing 181c843367 删除无用代码 2020-06-10 19:06:14 +08:00
chenjianxing 49b2feea40 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-10 19:05:13 +08:00
chenjianxing 115e545181 只读用户权限问题 2020-06-10 19:04:48 +08:00
Captain.B 6694f45c17 rollback 2020-06-10 16:47:33 +08:00
wenyann 772e2b108c '接口测试，性能测试首页报告状态' 2020-06-10 16:37:01 +08:00
shiziyuan9527 c2f91a140e 校验资源池服务器是否可用时，添加超时限制 2020-06-10 16:21:40 +08:00
Captain.B 302d4ea5a3 每次刷新页面的时候重新put session user 2020-06-10 16:17:29 +08:00
chenjianxing 5fd03f1f54 测试日历显示问题 2020-06-10 13:47:05 +08:00
chenjianxing 3a9763ed82 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-10 11:12:32 +08:00
chenjianxing 247bb88666 资源池启用校验优化 2020-06-10 11:11:38 +08:00
wenyann 259031831d Merge remote-tracking branch 'origin/dev' into dev 2020-06-10 11:00:34 +08:00
wenyann be8ab4681f '' 2020-06-10 11:00:12 +08:00
chenjianxing 4f13120d31 测试计划详情添加报告按钮 2020-06-10 10:31:01 +08:00
chenjianxing 7e6fecc09f 性能测试跳转刷新 2020-06-10 10:01:04 +08:00
chenjianxing 354e3f9907 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-10 09:22:24 +08:00
shiziyuan9527 bf7bedef9c fix Safari 表格字段错位 2020-06-09 16:52:55 +08:00
王振 2b681f396f 更换 logo 图片 2020-06-09 15:26:19 +08:00
q4speed 129a602e00 Merge remote-tracking branch 'origin/dev' into dev 2020-06-09 15:18:26 +08:00
q4speed bc5f527364 修复响应时间断言输入框在删光字符后消失的bug 2020-06-09 15:18:12 +08:00
shiziyuan9527 990076e74f Safari下字段名称显示过长问题 2020-06-09 14:59:15 +08:00
q4speed 868e3316b0 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-09 10:46:26 +08:00
chenjianxing 5bb2e223a8 接口测试首页刷新 2020-06-09 10:16:50 +08:00
wenyann e7d0ab6479 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 19:02:43 +08:00
wenyann 5d8581eac6 '默认设置' 2020-06-08 19:02:18 +08:00
王振 f1e4cb8d92 Merge branch 'dev' of github.com:metersphere/metersphere into dev 2020-06-08 17:50:16 +08:00
王振 82c0d658f2 update i18n 2020-06-08 17:49:42 +08:00
wenyann b53f07cae6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 17:45:59 +08:00
wenyann 2181ef42ae '去除弹出保存用户名密码弹框' 2020-06-08 17:45:32 +08:00
shiziyuan9527 016e20ba60 性能测试首页，测试和报告交换位置 2020-06-08 17:12:33 +08:00
chenjianxing 8333367ca0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 16:34:23 +08:00
chenjianxing af481eb14a 用例导入对话框大小 2020-06-08 16:34:01 +08:00
Captain.B 2a8fab75f0 去掉没有用到的代码 2020-06-08 16:15:13 +08:00
Captain.B cc7efe9497 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 16:10:25 +08:00
Captain.B b130c1ffa4 修复sql报错 2020-06-08 16:08:59 +08:00
chenjianxing 66ecbc26f0 解决富文本框link显示问题 2020-06-08 16:00:20 +08:00
chenjianxing 05af9a0f3d 阻止测试用例状态点击事件冒泡 2020-06-08 15:21:34 +08:00
Captain.B 4ef02281ce 去掉没有实现的按钮 2020-06-08 14:33:04 +08:00
chenjianxing 5ab8c54f93 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 13:23:17 +08:00
chenjianxing f247cab1f1 删除组织提示 2020-06-08 13:22:46 +08:00
chenjianxing bd320ff002 删除工作空间提示 2020-06-08 13:17:14 +08:00
chenjianxing ad2f41f07a 删除项目确认 2020-06-08 12:58:38 +08:00
shiziyuan9527 cbbfd79e62 项目名长度限制 2020-06-08 12:11:06 +08:00
chenjianxing 8896c0730f 删除测试计划确认 2020-06-08 12:11:06 +08:00
chenjianxing 88df2d6950 i18n 2020-06-08 12:11:06 +08:00
Captain.B 66b60dbbc6 删除无用的代码 2020-06-08 11:56:31 +08:00
chenjianxing 1b35fa2b5f Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 11:55:50 +08:00
chenjianxing 5c2fb3fca1 删除测试计划确认 2020-06-08 11:55:10 +08:00
shiziyuan9527 c45659a9de 项目名长度限制 2020-06-08 11:33:00 +08:00
shiziyuan9527 050a48fa73 fix ajax.js 2020-06-05 18:15:05 +08:00
chenjianxing d07676e678 i18n 2020-06-05 17:37:27 +08:00
q4speed c02c4b865c 简化 2020-06-05 17:18:17 +08:00
wenyann b4634994bf 'checked' 2020-06-05 17:15:50 +08:00
wenyann d42f399a49 Merge remote-tracking branch 'origin/dev' into dev 2020-06-05 16:03:18 +08:00
wenyann 8fa8a86912 '修复smtp设置取消保存成功' 2020-06-05 16:02:56 +08:00
chenjianxing ed556adc59 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-05 15:31:13 +08:00
wenyann 1477e6961a Merge remote-tracking branch 'origin/dev' into dev 2020-06-05 15:30:11 +08:00
wenyann 2caa6637d7 '资源池url和token默认填充' 2020-06-05 15:28:57 +08:00
chenjianxing 5df638d51c 统一首页跳转样式 2020-06-05 14:49:47 +08:00
chenjianxing d74f2e5b01 接口性能测试跳转只读用户 2020-06-05 14:40:58 +08:00
chenjianxing 9d2da8f7f9 最近测试只读用户 2020-06-05 14:27:19 +08:00
chenjianxing 2ee269c533 最近测试只读用户 2020-06-05 14:19:05 +08:00
chenjianxing b4e5dbc382 性能测试点击一行只读 2020-06-05 11:20:40 +08:00
chenjianxing 8af9a73d9a api测试点击一行只读 2020-06-05 10:59:53 +08:00
chenjianxing cb3b90a033 网站链接 2020-06-05 09:52:17 +08:00
chenjianxing ba7f600b8c 关于页宽度 2020-06-05 09:50:29 +08:00
wenyann 285037e475 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/metersphere/controller/SystemParameterController.java
#	backend/src/main/java/io/metersphere/service/SystemParameterService.java
 2020-06-04 18:34:32 +08:00
wenyann fc8cad2679 '添加查询默认smtp设置' 2020-06-04 18:32:06 +08:00
q4speed 3e126e7f3e 新页面打开链接 2020-06-04 18:10:38 +08:00
q4speed 79c7ac49a6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 16:41:14 +08:00
q4speed 7d95c69637 修改标题等内容 2020-06-04 16:40:43 +08:00
chenjianxing 5833c3b902 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-04 15:56:47 +08:00
chenjianxing 8e8dbf5259 关于页 2020-06-04 15:56:22 +08:00
shiziyuan9527 03787d12c8 修改成员时角色项为必填 2020-06-04 15:27:14 +08:00
q4speed 430c15f742 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 15:13:55 +08:00
q4speed 29417d246a 修复enable值为readOnly的bug 2020-06-04 15:13:42 +08:00
shiziyuan9527 076e0b657f i18n 2020-06-04 14:32:43 +08:00
shiziyuan9527 dcdda0b3b8 fix 创建用户时密码自动填充 2020-06-04 14:25:43 +08:00
wenyann db0d13d438 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 10:52:08 +08:00
wenyann 19b400b1c6 '修复个人信息提示不全' 2020-06-04 10:48:05 +08:00
q4speed 22fb6855ab 修复复制成功提示bug 2020-06-03 18:16:38 +08:00
q4speed f83e2a69cc 修复复制成功提示bug 2020-06-03 18:15:21 +08:00
chenjianxing f83550044f Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-03 17:37:54 +08:00
chenjianxing 9569be7d1f 测试报告修改至测试计划 2020-06-03 17:37:32 +08:00
shiziyuan9527 1ee3dd09b0 fix 性能、接口测试 测试跳转方式 2020-06-03 16:49:40 +08:00
chenjianxing c7a927c78c 测试跟踪项目跳转 2020-06-03 16:24:18 +08:00
chenjianxing 1df3bb49c1 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-03 16:00:09 +08:00
chenjianxing 445a075744 去掉调试打印 2020-06-03 15:59:57 +08:00
q4speed 75803d6c2b Merge remote-tracking branch 'origin/dev' into dev 2020-06-03 15:51:04 +08:00
q4speed 47c8ba45b5 显示字符长度限制 2020-06-03 15:50:21 +08:00
q4speed 0778f3c230 修复提前器特殊字符bug 2020-06-03 15:46:18 +08:00
chenjianxing 389f356012 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-03 15:38:40 +08:00
chenjianxing 4e7d42c272 fix 快捷创建用例 2020-06-03 15:38:26 +08:00
shiziyuan9527 16159a02ea 去掉无用代码 2020-06-03 14:32:34 +08:00
q4speed 366213d2a5 修复菜单触发方式 2020-06-03 13:26:53 +08:00
chenjianxing 6f4d91102f 接口测试结果刷新 2020-06-03 11:58:26 +08:00
chenjianxing 572f53d1d4 解决localStorage清空，cookie没失效导致的卡死问题 2020-06-03 11:07:13 +08:00
wenyann 8ba58d1a70 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 19:39:51 +08:00
wenyann ff0d49fb6f 'session国际化' 2020-06-02 19:39:31 +08:00
shiziyuan9527 7205b02a8f 去掉性能测试名称特殊字符校验 2020-06-02 18:52:49 +08:00
wenyann 1a562ef255 '修改测试报告展示' 2020-06-02 18:14:03 +08:00
shiziyuan9527 1a15ebae4e Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-02 16:48:35 +08:00
wenyann 89eaebebdd Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 16:48:11 +08:00
shiziyuan9527 ffdd3ebd40 资源池为空时跳转到压力配置Tab 2020-06-02 16:48:02 +08:00
wenyann 6e57757d61 '' 2020-06-02 16:47:24 +08:00
chenjianxing 17b10751a8 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-02 16:16:55 +08:00
chenjianxing 35aee1f213 fix 快捷创建用例 2020-06-02 16:16:37 +08:00
q4speed 8e3af5ad68 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 16:12:30 +08:00
q4speed 2d118712a2 创建接口测试时，带入最后选择的项目 2020-06-02 16:12:20 +08:00
q4speed 74a49ae13f 去掉无用代码 2020-06-02 16:09:35 +08:00
wenyann 03c39aee90 '' 2020-06-02 15:46:46 +08:00
wenyann 9ab8e749c5 '' 2020-06-02 15:44:07 +08:00
chenjianxing 1b6cdb648d Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-02 15:25:07 +08:00
chenjianxing 96e3111768 i18n 2020-06-02 15:24:43 +08:00
wenyann ffaefb3985 修改API测试判断名称不能重复 2020-06-02 15:20:39 +08:00
chenjianxing 2f6c95d137 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-02 14:58:08 +08:00
chenjianxing aa60ed59fd 接口测试只读 2020-06-02 14:57:57 +08:00
shiziyuan9527 4f3aa4b8ae 项目排序 2020-06-02 14:50:39 +08:00
chenjianxing 445d90c955 性能测试只读页面 2020-06-02 14:09:24 +08:00
q4speed 989c07280a keepalive 2020-06-02 14:06:45 +08:00
q4speed 1a67407155 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 12:43:05 +08:00
q4speed 9a97f53ae4 修复oom问题，查看报告获取日志改为滚动分页，不再一次获取 2020-06-02 12:42:52 +08:00
chenjianxing 91ffab8c30 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-02 11:51:05 +08:00
chenjianxing a94f648d6d session 过期报错提示 2020-06-02 11:50:48 +08:00
chenjianxing c9ceaa3c8c 测试用例只读页面 2020-06-02 11:39:56 +08:00
shiziyuan9527 fbcd87f7ca 性能测试名称校验 2020-06-02 11:35:39 +08:00
wenyann cb11ae8646 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 10:38:29 +08:00
wenyann d140acb522 接口测试报告和测试排序 2020-06-02 10:38:04 +08:00
shiziyuan9527 b5c220f9a6 性能测试报告 筛选排序 2020-06-01 21:34:49 +08:00
shiziyuan9527 9f3a21756a fix 筛选,排序 2020-06-01 21:16:18 +08:00
wenyann 2dbc79eadd 接口测试状态筛选更新 2020-06-01 19:53:11 +08:00
wenyann 59a645edd2 接口测试逻辑跳转 2020-06-01 19:07:47 +08:00
chenjianxing db9d5643aa Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 18:37:11 +08:00
chenjianxing e1da61a846 报错提示 2020-06-01 18:36:48 +08:00
chenjianxing 6db8c62171 测试计划备注长度校验 2020-06-01 18:28:33 +08:00
shiziyuan9527 32b77b5e2f 性能测试报告筛选排序 2020-06-01 18:13:18 +08:00
shiziyuan9527 2ac559519a 筛选测试，最近报告增加时间 2020-06-01 18:06:38 +08:00
chenjianxing 6554685c37 测试计划排序筛选 2020-06-01 18:02:05 +08:00
chenjianxing e3f364c0b0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 17:26:20 +08:00
chenjianxing 54000e2f31 测试用例关联性能测试 2020-06-01 17:25:55 +08:00
shiziyuan9527 42db0a44d3 性能测试-全部测试-点击名称跳转 2020-06-01 17:25:19 +08:00
shiziyuan9527 8abae1024d 性能测试-全部测试-排序 2020-06-01 16:43:51 +08:00
shiziyuan9527 12c6acef77 性能测试-全部项目-点击项目名跳转 2020-06-01 15:15:16 +08:00
shiziyuan9527 194326b11e 性能测试 复制 2020-06-01 14:29:00 +08:00
chenjianxing 903c81c93b Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 13:43:10 +08:00
chenjianxing 6035750d74 测试计划状态快捷修改 2020-06-01 13:42:48 +08:00
chenjianxing 107abf98b0 测试计划-测试用例快捷修改状态 2020-06-01 13:37:13 +08:00
wenyann df8984d7ca Merge remote-tracking branch 'origin/dev' into dev 2020-06-01 12:11:37 +08:00
q4speed 00c60388f1 Merge remote-tracking branch 'origin/dev' into dev 2020-06-01 11:48:54 +08:00
q4speed 806fe04fa1 修复lang为空报错问题 2020-06-01 11:46:31 +08:00
chenjianxing c7f0d842ef Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 11:17:55 +08:00
chenjianxing c4537726a0 添加创建用例快捷按钮 2020-06-01 11:17:42 +08:00
wenyann 057ae3406b '' 2020-05-29 19:00:17 +08:00
q4speed f4d3e95170 1.增加URL验证 
2.URL不填不能保存或运行
 2020-05-29 18:44:00 +08:00
q4speed e403e7bc6e Merge remote-tracking branch 'origin/dev' into dev 2020-05-29 18:13:27 +08:00
q4speed f01bbf0f3f 修复响应时间断言更新bug 2020-05-29 18:13:13 +08:00
q4speed f30c30325e 场景clone 2020-05-29 18:12:48 +08:00
q4speed 2a5c5815e2 修复场景名称被改变的bug 2020-05-29 18:08:30 +08:00
shiziyuan9527 be67e74603 fix 性能测试报告面包屑跳转 2020-05-29 17:30:27 +08:00
chenjianxing a646d41ef4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 17:24:11 +08:00
shiziyuan9527 c03656f5ad 性能测试报告添加创建人 2020-05-29 17:21:50 +08:00
q4speed aad9d64a7a Merge remote-tracking branch 'origin/dev' into dev 2020-05-29 17:11:08 +08:00
q4speed 082dd21cd3 去掉场景名称和请求名称输入字符限制，只设长度限制。 2020-05-29 17:03:06 +08:00
shiziyuan9527 ab19dc0627 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 17:02:49 +08:00
shiziyuan9527 464fd7abb0 添加性能测试创建人 2020-05-29 17:02:39 +08:00
chenjianxing ee23eff3e9 fix 下一个测试用例获取关联测试 2020-05-29 16:56:10 +08:00
q4speed 8611d153f9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-29 16:53:55 +08:00
q4speed ddaed4f2f7 自定义变量等key value输入显示输入字符限制 2020-05-29 16:53:42 +08:00
chenjianxing d97eacd5e4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 16:46:58 +08:00
chenjianxing 1f84e55ce7 解决全屏对话框浏览器回退问题 2020-05-29 16:46:32 +08:00
shiziyuan9527 b602eae04c Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 16:42:54 +08:00
shiziyuan9527 3fc0f46f35 性能测试修改文件上传个数 2020-05-29 16:42:28 +08:00
q4speed 34d2fac553 复制接口测试 2020-05-29 16:29:57 +08:00
q4speed 9472430209 修改按钮禁用 2020-05-29 15:28:12 +08:00
q4speed b116516af1 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 14:57:32 +08:00
q4speed 11979fd663 从接口测试 创建 性能测试 2020-05-29 14:57:19 +08:00
shiziyuan9527 3dbd617ded i18n 2020-05-29 14:15:32 +08:00
chenjianxing 18eee8c2a6 没有模块时，提示先创建模块 2020-05-29 14:15:20 +08:00
chenjianxing 9f7baf6dfb fix 2020-05-29 13:32:46 +08:00
chenjianxing 5cf20ef27d Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 13:27:22 +08:00
chenjianxing dc0ab3b22a 测试用例关联性能测试页面 2020-05-29 13:27:07 +08:00
shiziyuan9527 50c362adf9 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 11:06:44 +08:00
wenyann 353338b7c2 Merge remote-tracking branch 'origin/dev' into dev 2020-05-29 11:05:57 +08:00
shiziyuan9527 a3f97c8362 项目描述添加长度限制 2020-05-29 11:05:49 +08:00
wenyann 670a7dfd11 '' 2020-05-29 11:05:08 +08:00
chenjianxing 093ac790f0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-28 23:51:46 +08:00
chenjianxing 1293137541 测试用例关联接口测试 2020-05-28 23:51:27 +08:00
shiziyuan9527 dd9b03c206 性能测试-点击测试或报告会刷新页面问题 2020-05-28 23:07:53 +08:00
q4speed edea4644ce Merge remote-tracking branch 'origin/dev' into dev 2020-05-28 17:23:09 +08:00
q4speed 08253e818e 修复空字符串替换bug 2020-05-28 17:22:42 +08:00
chenjianxing cb34d921bd Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-28 14:27:27 +08:00
chenjianxing 5cd7841004 测试计划-测试用例关联测试 2020-05-28 14:27:11 +08:00
shiziyuan9527 3f74d5d138 i18n 2020-05-28 13:51:40 +08:00
chenjianxing bceade43a9 创建用例绑定测试 2020-05-28 09:47:24 +08:00
shiziyuan9527 fd4854d4ab bug fix 资源池创建未检查同名 2020-05-27 19:02:42 +08:00
shiziyuan9527 2b6e4ee958 bug fix 创建工作空间时对名称和描述长度限制 2020-05-27 18:30:23 +08:00
shiziyuan9527 448dccdcbd bug fix 创建工作空间时对名称和描述长度限制 2020-05-27 17:05:01 +08:00
chenjianxing 48eafa2be0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-27 16:30:33 +08:00
chenjianxing 30500115fb 性能测试只读 2020-05-27 16:30:21 +08:00
chenjianxing 40da3d46c0 接口测试只读 2020-05-27 16:15:56 +08:00
chenjianxing 06aecf4425 测试跟踪只读 2020-05-27 16:07:46 +08:00
shiziyuan9527 eeb6dd0a70 bug fix 禁用用户后仍可登录 2020-05-27 14:42:54 +08:00
shiziyuan9527 ab23a3d5f3 管理员添加成员时提示问题 2020-05-27 14:06:30 +08:00
chenjianxing 660035b1a8 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-27 12:25:18 +08:00
chenjianxing 74827189bc fix 删除项目 2020-05-27 12:25:02 +08:00
wenyann 1288f6ecf9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-27 12:05:43 +08:00
wenyann dd21945dae '' 2020-05-27 12:05:16 +08:00
q4speed de13d7866a Merge remote-tracking branch 'origin/dev' into dev 2020-05-27 11:56:16 +08:00
q4speed 9718c6ece6 修复断言名称为null的bug 2020-05-27 11:55:59 +08:00
chenjianxing dfd6aaeeee 自动更新测试计划状态 2020-05-27 10:47:30 +08:00
wenyann 42d1b1ece1 '' 2020-05-27 10:46:53 +08:00
shiziyuan9527 65a54d9286 i18n 2020-05-27 10:38:19 +08:00
chenjianxing a7a5086816 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-26 21:45:03 +08:00
chenjianxing ee83169911 测试计划-测试用例取消自动保存 2020-05-26 21:44:42 +08:00
chenjianxing ff4d2f0da5 前置条件长度限制 2020-05-26 19:50:14 +08:00
chenjianxing bae5d95371 测试用例默认按更新时间排序 2020-05-26 19:45:08 +08:00
wenyann 7760fbea72 修改session过期提示 2020-05-26 18:45:22 +08:00
wenyann 499ddca4c3 Merge remote-tracking branch 'origin/dev' into dev 2020-05-26 17:29:16 +08:00
wenyann 0511cfedb7 .. 2020-05-26 17:27:37 +08:00
shiziyuan9527 a882fa0afc 修改按钮和提示 2020-05-26 17:06:28 +08:00
shiziyuan9527 c8be28e2aa i18n 2020-05-26 16:35:33 +08:00
shiziyuan9527 b61dbfe107 修改工作空间管理员添加成员的方式 2020-05-26 16:13:27 +08:00
shiziyuan9527 b34c209257 修改组织管理员添加成员的方式 2020-05-26 15:52:57 +08:00
chenjianxing da32ae5a84 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-26 14:58:05 +08:00
chenjianxing ccb6bfc95d 首页测试计划添加表头 2020-05-26 14:57:43 +08:00
q4speed 12b4aae62c 完成follow_redirects，展示子请求内容 2020-05-26 14:32:20 +08:00
q4speed e4acd3cdf6 修复post body encode bug， 
修复响应时间断言未加上bug
 2020-05-26 13:00:58 +08:00
wenyann def79b1de0 .. 2020-05-26 09:49:38 +08:00
wenyann 66b12adc03 Merge remote-tracking branch 'origin/dev' into dev 2020-05-25 19:14:30 +08:00
wenyann 57c8150a5d 修改组织成员提示 2020-05-25 19:13:59 +08:00
chenjianxing 0821c307b2 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-25 19:09:40 +08:00
chenjianxing 4a270ceba2 测试计划项目不能修改 2020-05-25 18:22:28 +08:00
shiziyuan9527 a0c878bb63 bug fix 上传jmx文件数量检查问题 2020-05-25 18:21:00 +08:00
wenyann 05bd3a1353 修改 2020-05-25 17:46:29 +08:00
wenyann 98f955a74e 测试 2020-05-25 17:33:34 +08:00
chenjianxing cf0f35eba3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-25 17:26:06 +08:00
chenjianxing b7b33ad2bb 删除项目提示并删除测试跟踪资源 2020-05-25 17:25:49 +08:00
shiziyuan9527 a16c0be406 i18n 2020-05-25 17:00:54 +08:00
shiziyuan9527 7dce48c7bb bug fix 系统设置中重复进入相同路由刷新数据 2020-05-25 16:20:58 +08:00
q4speed b6fef27f69 Merge remote-tracking branch 'origin/dev' into dev 2020-05-25 15:24:27 +08:00
q4speed e736019e8f 改为后台增加BackendListener，保证前端生成的jmx独立性 2020-05-25 15:22:05 +08:00
chenjianxing df7f4c18da Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 19:56:30 +08:00
chenjianxing f9ff75fe36 测试跟踪-只读用户 2020-05-22 19:56:09 +08:00
q4speed af47f8d950 避免异常状态导致无限循环 2020-05-22 18:07:19 +08:00
q4speed 2f1a299f27 避免异常状态导致无限循环 2020-05-22 17:56:19 +08:00
q4speed 907da39d8d Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 17:50:03 +08:00
q4speed 063e3ec03d 增加失败场景 2020-05-22 17:49:48 +08:00
shiziyuan9527 ca3a38ab1a 修复编辑用户角色出现的问题 2020-05-22 17:47:30 +08:00
q4speed b2f6866237 Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 16:45:34 +08:00
q4speed a5bc32ff57 修改多个脚本并行运行的处理方式 2020-05-22 16:45:08 +08:00
chenjianxing 21d7beb82f 编辑用例去掉继续创建选项 2020-05-22 16:39:31 +08:00
chenjianxing 6ae916a191 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 16:32:33 +08:00
chenjianxing 1f3ca6f5f2 文件下载方法 2020-05-22 16:31:55 +08:00
chenjianxing bdac9282fc 项目列表去掉工作空间字段 2020-05-22 16:17:54 +08:00
chenjianxing 6977ee496b excel导入导出国际化 2020-05-22 16:08:22 +08:00
shiziyuan9527 9b0a2f1f3a 校验特殊字符 2020-05-22 15:52:42 +08:00
shiziyuan9527 9ec6dd2170 创建编辑工作空间时校验特殊字符 2020-05-22 15:49:59 +08:00
q4speed 4896115c1c Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 13:25:44 +08:00
q4speed 44cfaf811a 增加创建人列 2020-05-22 13:25:16 +08:00
chenjianxing f415a121a5 无项目时创建模块报错 2020-05-22 10:39:30 +08:00
chenjianxing 0ace484dd0 fix 多个tag下不同项目下用例保存 2020-05-22 10:28:17 +08:00
chenjianxing 8574b1467f 创建用例有刷新保留查询条件 2020-05-22 10:07:04 +08:00
chenjianxing 5270f9de65 筛选条件天加进行中 2020-05-22 09:37:54 +08:00
chenjianxing 9b091fbf00 用例详情不显示创建下一个选项 2020-05-22 09:34:34 +08:00
chenjianxing cf83d9efae Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 09:25:39 +08:00
chenjianxing 3981cc8741 国际化 2020-05-22 09:24:00 +08:00
shiziyuan9527 e07dadd9be bug fix 2020-05-21 23:18:25 +08:00
shiziyuan9527 37648bb560 用户角色选择时优化细节 2020-05-21 22:40:01 +08:00
shiziyuan9527 d3b3b6e1fb 新建/编辑用户角色选择时，校验必填项 2020-05-21 22:26:17 +08:00
shiziyuan9527 3323d6f8c3 修改新建用户时角色选择项 2020-05-21 18:45:47 +08:00
q4speed 601e329f0d 测试运行后自动跳转到报告 2020-05-21 18:10:16 +08:00
q4speed 2eee9e2617 修复饼图样式，不需要显示name 2020-05-21 18:09:23 +08:00
q4speed 7f8707391b 添加后恢复初始状态 2020-05-21 16:20:18 +08:00
q4speed d6da86b7b5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 15:56:43 +08:00
q4speed 162bc3d418 拖拽 2020-05-21 15:56:29 +08:00
chenjianxing e0a0bbffef 添加子节点时名称为空 2020-05-21 14:52:52 +08:00
chenjianxing 647f3eac34 修改节点时填充原名称 2020-05-21 14:51:24 +08:00
chenjianxing 18b4250dbf Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 14:42:34 +08:00
q4speed 1f4e2e14da 修复参数key 和 value填反了的bug 2020-05-21 14:41:47 +08:00
chenjianxing d031adf090 模版名称校验 2020-05-21 14:41:08 +08:00
q4speed 77db7f8464 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 14:18:13 +08:00
q4speed e342112b6f 修复特殊字符问题 2020-05-21 14:17:55 +08:00
wenyann 96ee2a6caf 修改 2020-05-21 14:06:15 +08:00
wenyann d72c5c833f Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 14:05:02 +08:00
wenyann 9887cf5904 修改 2020-05-21 14:04:34 +08:00
chenjianxing 0b0e8f69d8 fix 测试步骤长度限制 2020-05-21 12:08:18 +08:00
chenjianxing f456f9a8e0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 12:01:55 +08:00
chenjianxing 72229c3f15 过滤条件添加p3 2020-05-21 12:01:35 +08:00
wenyann 94dd8372a4 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 12:00:06 +08:00
wenyann 0560f85bf4 修改 2020-05-21 11:59:36 +08:00
wenyann 5ce5b89e89 修改 2020-05-21 11:59:29 +08:00
wenyann 71b3657833 修改 2020-05-21 11:59:16 +08:00
chenjianxing 6a78349954 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 11:55:29 +08:00
chenjianxing ff9bbd9d69 fix 添加步骤顺序 2020-05-21 11:55:05 +08:00
Captain.B 5fe5ba8822 i18n key 2020-05-21 11:35:54 +08:00
chenjianxing 750f09d53b 测试步骤长度限制 2020-05-21 11:08:15 +08:00
chenjianxing a64c63cc7d 备注长度限制 2020-05-21 09:13:44 +08:00
shiziyuan9527 abf1135a7a 新建/编辑用户时增加角色选择项 2020-05-20 21:55:01 +08:00
Captain.B 159d94abfb download log 2020-05-20 20:30:04 +08:00
wenyann 2f1c847e87 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
 2020-05-20 17:27:03 +08:00
wenyann 7f06194cff 邮件服务设置 2020-05-20 17:22:45 +08:00
q4speed 5a0863e9a8 修复请求失败数显示错误的bug，修改断言显示格式 2020-05-20 16:28:12 +08:00
q4speed df9f21d270 修复断言显示错误 2020-05-20 15:33:44 +08:00
q4speed 385bd44b77 修复失败率bug 2020-05-20 15:31:03 +08:00
q4speed b3724c0fe2 修复标题bug 2020-05-20 15:25:42 +08:00
q4speed c082e68290 文本断限制在200字符 2020-05-20 15:21:39 +08:00
q4speed ce1203b426 修复保存后无法重新创建的问题 2020-05-20 14:50:03 +08:00
q4speed d1a4686993 Merge remote-tracking branch 'origin/dev' into dev 2020-05-20 14:21:48 +08:00
q4speed d769d79c5e 最近测试报告增加时间 2020-05-20 14:21:34 +08:00
Captain.B 5142f5bf37 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-20 14:17:18 +08:00
q4speed 55e6ab076f 修复特殊字符造成脚本错误的bug 2020-05-20 12:09:38 +08:00
q4speed 1096b6bef0 修复测试名称超长问题 2020-05-20 11:25:15 +08:00
q4speed f5bdeb1695 增加场景的按钮，修复复制后id重复问题 2020-05-19 19:07:25 +08:00
q4speed 7ab5fa1987 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 18:49:13 +08:00
q4speed d8d79cd2ee 修复响应时间断言添加不成功的bug 2020-05-19 18:49:02 +08:00
chenjianxing ef4f372c08 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-19 18:20:57 +08:00
q4speed b377d398ab 修复场景名显示null的bug 2020-05-19 18:10:00 +08:00
chenjianxing 8c4afc465b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-19 18:09:57 +08:00
chenjianxing 4cbed26f30 fix 节点拖拽 2020-05-19 18:09:44 +08:00
q4speed d94f031a12 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 17:48:28 +08:00
q4speed c1eb7cc3fe 名字做链接 2020-05-19 17:47:50 +08:00
Captain.B fcc35cccbf Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-19 16:44:20 +08:00