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

1568 Commits

Author SHA1 Message Date
chenjianxing cc7c5b9e23 fix: swagger 导入后无法保存 2020-07-21 19:09:05 +08:00
q4speed 1db793a11b fix(接口测试): 
场景的Dubbo配置自动赋值给空的请求配置;
Interface配置中提供getProviderList功能
 2020-07-21 17:49:08 +08:00
shiziyuan9527 deff09ac54 fix: 用户名称限制长度的问题 2020-07-21 15:21:19 +08:00
Captain.B b196e88014 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 14:55:29 +08:00
Captain.B 9a5c02827b feat: 增加测试用例和测试计划的高级搜索 2020-07-21 14:53:42 +08:00
shiziyuan9527 2acc7e586a fix: 系统菜单用户列表能修改LDAP来源用户的邮箱 2020-07-21 14:10:21 +08:00
shiziyuan9527 7bd9f429c2 fix: 系统菜单用户列表能修改LDAP来源用户的密码 2020-07-21 13:52:12 +08:00
shiziyuan9527 459c15db23 fix: 测试计划关联测试用例弹框的按钮可以触发多次 2020-07-21 11:43:05 +08:00
q4speed 382087086f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
 2020-07-21 11:37:21 +08:00
q4speed 390384c6a4 feat(接口测试): 增加Dubbo支持 2020-07-21 11:34:30 +08:00
wangzhen-fit2cloud 6c93ed6b27 Merge branch 'v1.1' of github.com:metersphere/metersphere into v1.1 2020-07-21 10:47:24 +08:00
wangzhen-fit2cloud 09dd4a0064 refactor: 修改接口测试导入页面文字描述 2020-07-21 10:47:11 +08:00
Captain.B a2022f8cf0 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 10:22:34 +08:00
Captain.B cfac8dfe6c fix: 修复登录页面浏览器标签页上的图标在firefox上不显示的问题 2020-07-21 10:22:19 +08:00
wenyann 9ca7fdf576 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 10:16:35 +08:00
wenyann e4cb8647d5 fix: 1.导入用例维护人信息错误 2关联用例后更新用例优先级 
3系统参数默认显示错误
 2020-07-21 10:15:47 +08:00
chenjianxing e88983ecb3 fix: cron表达式输入提示优化 2020-07-21 01:50:44 +08:00
chenjianxing b7c0acb837 fix: 关闭定时任务，不显示下次执行时间 2020-07-21 01:42:25 +08:00
chenjianxing 4fffe246ed fix: 导入用例页面项目实时更新 2020-07-21 01:38:12 +08:00
chenjianxing 466ce4e790 fix: 导入用例文件上传提示 2020-07-21 01:30:42 +08:00
chenjianxing a52e45cc20 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 00:48:24 +08:00
chenjianxing c052d1ea95 fix: 保存环境 2020-07-21 00:47:58 +08:00
shiziyuan9527 29b1aabe0b fix: 执行测试用例关联的测试生成的报告触发方式为空 2020-07-20 22:37:45 +08:00
shiziyuan9527 777027da3b fix: 接口测试转性能测试时测试名称无法编辑的问题 2020-07-20 21:29:22 +08:00
chenjianxing 6ed20d81d6 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-20 18:38:02 +08:00
chenjianxing 98a04271cb fix: 导入文件上传样式与提示 2020-07-20 18:37:53 +08:00
Captain.B fadc24275a Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-20 17:58:48 +08:00
Captain.B 77fd705ace refactor: 修改性能测试默认超时时间 2020-07-20 17:58:25 +08:00
wenyann 193f807f94 fix: 测试用例去掉实际结果非空判断 2020-07-20 17:57:28 +08:00
Captain.B 7845317ff6 fix: 修复没有选择执行结果通过按钮可以点击的bug 2020-07-20 17:36:56 +08:00
Captain.B feb6aeeb8b fix: 修复浏览器标签页上的图标在firefox上不显示的问题 2020-07-20 16:31:24 +08:00
AgAngle 2860b91508 refactor: 接口测试保存提示 2020-07-19 22:35:53 +08:00
AgAngle e24ab7a2ad refactor: 优化定时任务页面 2020-07-19 16:17:16 +08:00
chenjianxing f9723d6da7 refactor: 合并 v1.0 2020-07-17 18:38:05 +08:00
chenjianxing f20c9ca591 Merge branch 'master' of https://github.com/metersphere/server 2020-07-17 18:26:00 +08:00
chenjianxing 985385aba2 refactor: 优化接口测试导入 2020-07-17 18:25:09 +08:00
wenyann 5f8d2a7374 fix: 测试用例保存判断 2020-07-17 15:41:14 +08:00
wenyann 0c5404b0e4 fix: 测试用例保存判断 2020-07-17 15:33:54 +08:00
wenyann 9e0653947c Merge branch 'v1.0' 2020-07-17 14:42:02 +08:00
wenyann cf216d1d84 Merge remote-tracking branch 'origin/master' 2020-07-17 14:05:56 +08:00
wenyann b5dc9ff8ff fix: 导入导出图标交换，jenkins按计划查询，模块全部查询 2020-07-17 14:05:19 +08:00
shiziyuan9527 8312f13a66 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-17 13:57:05 +08:00
shiziyuan9527 95abc82d44 fix: 测试计划编辑用例时因为用例关联的测试不存在而产生的bug 2020-07-17 13:54:28 +08:00
q4speed 55c0a4be65 Merge remote-tracking branch 'origin/master' 2020-07-17 10:59:51 +08:00
q4speed ff42d6c96e fix: 修复高级搜索输入框无法输入的bug 2020-07-17 10:59:26 +08:00
chenjianxing b29a4f9109 fix: 导入用户不校验名称 2020-07-16 18:50:45 +08:00
chenjianxing c16f60e87d fix: 保存环境设置 2020-07-16 18:04:11 +08:00
chenjianxing dc25e0fe63 fix: 接口测试保存 2020-07-16 17:26:23 +08:00
chenjianxing 04e27d27c8 fix: 优化环境编辑 2020-07-16 16:57:33 +08:00
chenjianxing cb3fa9dfa1 fix: 环境编辑请求头添加提示 2020-07-16 14:19:18 +08:00
chenjianxing 042b97b838 refactor: 环境编辑添加取消按钮 2020-07-16 13:20:37 +08:00
chenjianxing 82cc66dbcd feat: 接口测试支持导入插件录制json格式 2020-07-16 13:10:52 +08:00
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