Commit Graph

411 Commits

Author SHA1 Message Date
q4speed 8cb07f6ab6 高级查询控件i18n 2020-07-10 16:49:23 +08:00
q4speed 37577b76b0 高级查询控件 2020-07-10 16:43:43 +08:00
shiziyuan9527 019933d4d2 i18n 2020-07-09 16:35:29 +08:00
wenyann fc39278cae 在提交Case结论时增加防呆处理 2020-07-09 16:22:51 +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 e45810701d ldap 2020-07-08 15:47:44 +08:00
chenjianxing 3341602733 i18n 2020-07-07 09:13:32 +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
Captain.B 48c0299ca8 再次执行测试功能 2020-07-02 16:43:49 +08:00
Captain.B 910ce17270 立即停止测试功能 2020-06-29 13:40:02 +08:00
wenyann a29fd908f6 '删除提示' 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
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
Captain.B 78b0f4a4d9 用户添加apikey 2020-06-22 18:22:58 +08:00
wenyann 20f59cad3a '删除提示' 2020-06-19 14:03:16 +08:00
chenjianxing 26a450de6d merge v1.0 2020-06-17 18:03:48 +08:00
wenyann 47fc83bcc3 '用户创建密码框提示' 2020-06-16 15:47:34 +08:00
shiziyuan9527 5f1ff0753f 性能测试压力配置添加参数校验 2020-06-16 15:29:33 +08:00
q4speed 5ae9522282 接口测试增加导出配置 2020-06-16 11:01:35 +08:00
wenyann 02a5c99a8b '用户创建密码框提示' 2020-06-16 10:49:39 +08:00
chenjianxing a3bd0a7be5 测试报告失败用例列表i18n 2020-06-15 18:59:55 +08:00
shiziyuan9527 f675a8fa82 i18n 2020-06-11 15:41:50 +08:00
chenjianxing 115e545181 只读用户权限问题 2020-06-10 19:04:48 +08:00
chenjianxing 247bb88666 资源池启用校验优化 2020-06-10 11:11:38 +08:00
王振 82c0d658f2 update i18n 2020-06-08 17:49:42 +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
chenjianxing 5c2fb3fca1 删除测试计划确认 2020-06-08 11:55:10 +08:00
chenjianxing d07676e678 i18n 2020-06-05 17:37:27 +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 076e0b657f i18n 2020-06-04 14:32:43 +08:00
wenyann ff0d49fb6f 'session国际化' 2020-06-02 19:39:31 +08:00
wenyann 1a562ef255 '修改测试报告展示' 2020-06-02 18:14:03 +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
chenjianxing 96e3111768 i18n 2020-06-02 15:24:43 +08:00
shiziyuan9527 fbcd87f7ca 性能测试名称校验 2020-06-02 11:35:39 +08:00
q4speed f4d3e95170 1.增加URL验证
2.URL不填不能保存或运行
2020-05-29 18:44:00 +08:00
shiziyuan9527 c03656f5ad 性能测试报告添加创建人 2020-05-29 17:21:50 +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 d97eacd5e4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 16:46:58 +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 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
shiziyuan9527 a3f97c8362 项目描述添加长度限制 2020-05-29 11:05:49 +08:00
chenjianxing 5cd7841004 测试计划-测试用例关联测试 2020-05-28 14:27:11 +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
shiziyuan9527 65a54d9286 i18n 2020-05-27 10:38:19 +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 c8be28e2aa i18n 2020-05-26 16:35:33 +08:00
q4speed 12b4aae62c 完成follow_redirects,展示子请求内容 2020-05-26 14:32:20 +08:00
wenyann 57c8150a5d 修改组织成员提示 2020-05-25 19:13:59 +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
q4speed 063e3ec03d 增加失败场景 2020-05-22 17:49:48 +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 647f3eac34 修改节点时填充原名称 2020-05-21 14:51:24 +08:00
chenjianxing d031adf090 模版名称校验 2020-05-21 14:41:08 +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
chenjianxing a64c63cc7d 备注长度限制 2020-05-21 09:13:44 +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 b3724c0fe2 修复标题bug 2020-05-20 15:25:42 +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 f5bdeb1695 增加场景的按钮,修复复制后id重复问题 2020-05-19 19:07:25 +08:00
Captain.B f91f0cc91a role 去掉下划线 2020-05-19 15:21:19 +08:00
Captain.B f0853e4c4d label width 2020-05-19 15:17:21 +08:00
shiziyuan9527 037e75053c 系统用户列表修改 2020-05-19 14:34:11 +08:00
q4speed cc4b5015d1 所属测试 2020-05-19 14:26:18 +08:00
Captain.B ba3fe5a1ab i18n 2020-05-18 15:51:13 +08:00
Captain.B 7638513556 heatmap 2020-05-18 14:45:11 +08:00
q4speed 78aaf1ebf3 跳转链接 2020-05-18 14:14:23 +08:00
chenjianxing be6d48f497 修改缺陷字段名称 2020-05-18 09:34:16 +08:00
chenjianxing 71dd8d531d 前端国际化 2020-05-17 16:31:01 +08:00
chenjianxing a4ab4e238b 批量删除测试用例 2020-05-16 15:06:24 +08:00
q4speed b4f300d275 i18n 2020-05-14 15:03:44 +08:00
Captain.B 6f76bbfe9f i18n 2020-05-14 14:52:16 +08:00
q4speed 96a70308e3 默认加载所有语言文件 2020-05-14 14:33:38 +08:00
Captain.B d082ebc7d2 zh-tw 2020-05-14 11:34:15 +08:00
shiziyuan9527 a8dd83b3cc i18n 2020-05-13 18:12:15 +08:00
shiziyuan9527 96e275c095 用户角色国际化 2020-05-13 17:58:26 +08:00
q4speed 709c207fcc 场景公用变量和Header 2020-05-13 12:59:41 +08:00
q4speed 80a50999a7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:27:10 +08:00
q4speed eddc19fa75 增加提取功能的JMX内容 2020-05-12 15:26:55 +08:00
shiziyuan9527 17be7deb21 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/business/components/settings/system/User.vue
2020-05-12 15:23:42 +08:00
shiziyuan9527 a05782e6c1 设置系统管理员入口 2020-05-12 15:19:40 +08:00
Captain.B 34ef1be442 i18n 2020-05-12 14:44:56 +08:00
q4speed bc294c354c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/zh-CN.js
2020-05-12 11:27:36 +08:00
q4speed 796f00f403 增加提取功能的页面 2020-05-12 11:25:04 +08:00
Captain.B 101401d6fc 样式 2020-05-12 11:24:38 +08:00
BugKing 5719f67c04
Update zh-CN.js 2020-05-11 18:25:22 +08:00
shiziyuan9527 d183914eff i18n 2020-05-11 18:08:00 +08:00
wenyann 4a958d6f44 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 14:13:16 +08:00
wenyann 8880599f29 修改密码 2020-05-11 14:12:29 +08:00
q4speed f07078fdf6 修复element ui国际化文件加载失败的bug 2020-05-11 11:48:52 +08:00
wenyann a690ffecde Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/i18n/en-US.js
2020-05-09 17:40:17 +08:00
wenyann 6924832fee demo 2020-05-09 17:38:30 +08:00
q4speed 29a78a42c7 API翻译同步 2020-05-09 16:03:30 +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
wenyann 998134b1f1 修改用户密码 2020-05-09 12:06:09 +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 62ee448245 demo 2020-05-08 17:19:28 +08:00
q4speed 6745d8b5fc 修复key value不能正确显示的问题 2020-05-08 11:04:04 +08:00
q4speed b5e7b74633 Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 00:00:05 +08:00
q4speed 39aed31aa5 生成report 2020-05-07 23:59:51 +08:00
Captain.B 02ab2f230a Merge remote-tracking branch 'origin/dev' into dev 2020-05-07 13:37:22 +08:00
Captain.B 17c8a98f56 修改资源池状态 2020-05-07 13:37:05 +08:00
shiziyuan9527 dee5790ae7 i18n 2020-05-07 11:37:39 +08:00
shiziyuan9527 6f7848ee0d i18n 2020-05-06 18:04:56 +08:00
shiziyuan9527 b0c5bd52ec 组织,工作空间相关资源关联删除 2020-05-06 14:12:03 +08:00
q4speed 1cae0333f9 Merge remote-tracking branch 'origin/dev' into dev 2020-04-30 16:50:59 +08:00
q4speed d97f72315c 生成jmx 2020-04-30 16:50:43 +08:00
shiziyuan9527 e5ead937d7 修改消息提示 2020-04-27 18:20:23 +08:00
chenjianxing e4b02ec997 删除计划前校验 2020-04-27 09:43:08 +08:00
chenjianxing 6854a6f5d3 测试用例批量移动 2020-04-26 16:55:50 +08:00
chenjianxing bc518448a6 fix 测试用例 2020-04-26 14:25:22 +08:00
chenjianxing 288dd65b70 修改测试计划阶段 2020-04-24 17:00:24 +08:00
q4speed 5c40ea5327 Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 14:09:22 +08:00
q4speed 290532224a NaN 2020-04-24 14:09:10 +08:00
chenjianxing 6e3ec26fc0 克隆测试用例 2020-04-24 13:56:32 +08:00
q4speed 1294739df6 run button 2020-04-23 17:08:48 +08:00
q4speed b2d0e0cf3b Merge remote-tracking branch 'origin/dev' into dev 2020-04-22 17:30:07 +08:00
q4speed 6aa69cee66 api测试,未完待续 2020-04-22 17:29:54 +08:00
chenjianxing b32a6f1377 测试用例面包屑 2020-04-21 23:07:36 +08:00
chenjianxing fcddbfcb48 fix 我的实例 2020-04-21 13:56:10 +08:00
chenjianxing eb61f51fd0 国际化 2020-04-21 13:19:46 +08:00
chenjianxing 3fd4e2ee6c 样式 2020-04-21 10:05:51 +08:00
q4speed 98a5ede3f6 api测试界面,未完待续 2020-04-20 18:40:02 +08:00
q4speed d2817334b7 Merge remote-tracking branch 'origin/dev' into dev 2020-04-17 18:38:57 +08:00
q4speed f7a11e9405 api界面,未完待续 2020-04-17 18:38:38 +08:00
Captain.B de742839a8 use _ instead of - 2020-04-17 09:50:15 +08:00
q4speed f9f1809f3e api界面,未完待续 2020-04-15 18:25:34 +08:00
chenjianxing b8296dbff9 修改样式 2020-04-10 12:00:15 +08:00
chenjianxing 9b34bb2819 国际化 2020-04-09 14:47:53 +08:00
Captain.B 0f6607cdc2 loading 2020-04-07 19:12:12 +08:00
Captain.B 35a5c3c13e 资源池国际化0.2 2020-04-07 18:46:44 +08:00
Captain.B 0b8e26e77b 资源池国际化0.1 2020-04-07 18:34:29 +08:00
chenjianxing f80190dc01 国际化 2020-04-07 11:40:42 +08:00
chenjianxing 83fe299506 测试计划关联测试用例 2020-04-06 17:54:11 +08:00
chenjianxing d421965476 功能测试->接口测试 2020-04-03 11:25:23 +08:00
Captain.B e572201bcc report 页面 2020-04-02 10:40:04 +08:00
chenjianxing 82aa04f935 修复模块树bug 2020-03-31 11:53:35 +08:00
chenjianxing 49883ba4c2 测试计划增删改 2020-03-30 16:40:58 +08:00
chenjianxing 8b1e4f2a79 用例管理国际化 2020-03-30 00:18:36 +08:00
chenjianxing 536d16991f 模块树相关操作 2020-03-26 16:54:32 +08:00
chenjianxing 6b8c059f99 merge 2020-03-24 10:48:02 +08:00
chenjianxing a9845bf8d4 添加用例跟踪相关 2020-03-24 10:35:07 +08:00
Captain.B 8652b0566d 配置资源池 2020-03-23 17:11:07 +08:00
Captain.B 86113caae1 多文件上传修改 2020-03-19 18:53:41 +08:00
chenjianxing 147fba84ed 功能测试测试报告同步和展示 2020-03-18 18:34:29 +08:00
chenjianxing a950c03a5b 完善功能测试前后端 2020-03-13 21:01:03 +08:00
chenjianxing d16839ec68 解决冲突 2020-03-12 15:57:02 +08:00
chenjianxing c3ed99f330 重构性能测试和功能测试页面 2020-03-12 10:44:15 +08:00
shiziyuan9527 ceb8d200c5 添加测试报告相关组件 2020-03-09 16:12:06 +08:00
Captain.B ea2c192d15 i18n 2020-03-06 16:24:27 +08:00
Captain.B 10346366cd i18n 2020-03-06 16:19:12 +08:00
shiziyuan9527 90109ade6a 测试报告页面 2020-03-05 17:55:21 +08:00
shiziyuan9527 70ccc8f0b4 新建和编辑项目时去掉所属工作空间选项 2020-03-05 13:53:54 +08:00
Captain.B 695d1a9932 i18n 2020-03-05 11:23:32 +08:00
shiziyuan9527 20ed80bf3f 项目编辑时可选择所属工作空间 2020-03-04 18:10:43 +08:00
shiziyuan9527 a1ba010375 菜单国际化 2020-03-03 17:05:22 +08:00
shiziyuan9527 f5e102d9f1 系统菜单下组织页国际化 2020-03-03 10:48:15 +08:00
shiziyuan9527 4a27a0aeb6 系统菜单下组织增加成员列 2020-03-02 17:55:27 +08:00
Captain.B 605aa9c782 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-02 13:13:49 +08:00
Captain.B f43a4b9678 AdvancedConfig 2020-03-02 13:11:15 +08:00
shiziyuan9527 9e11452ebd 系统菜单下工作空间的创建和修改 2020-03-02 10:49:09 +08:00
Captain.B a7d27e8668 高级设置 +1 2020-02-28 17:27:31 +08:00
Captain.B 17679bb9f7 高级设置 i18n 2020-02-28 15:17:58 +08:00
Captain.B 52337f63a2 高级设置 2020-02-28 15:06:59 +08:00
Captain.B 5038933cc3 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-27 17:59:07 +08:00
Captain.B 4d0efc25ac i18n load_test 2020-02-27 17:59:00 +08:00
q4speed fb215cd2e6 代码规范 2020-02-27 17:47:44 +08:00
Captain.B a24d15f6ae i18n 2020-02-27 17:23:06 +08:00
Captain.B 54963b2fa0 project 2020-02-27 16:18:35 +08:00
Captain.B da2513e038 login i18n 2020-02-27 14:10:38 +08:00
Captain.B cde78be5cb i18n 2020-02-27 11:00:18 +08:00
q4speed 25044d1e35 格式化翻译示例 2020-02-27 10:54:50 +08:00
Captain.B be37974388 Merge remote-tracking branch 'origin/dev' into dev 2020-02-26 18:48:18 +08:00
Captain.B 2576b9c035 ms project 2020-02-26 18:47:51 +08:00
shiziyuan9527 e1d8323604 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/en_US.js
#	frontend/src/i18n/zh_CN.js
2020-02-26 18:43:13 +08:00
shiziyuan9527 a7ea334005 组织菜单国际化 2020-02-26 18:38:57 +08:00
Captain.B 9c7b776a37 ms project 2020-02-26 18:31:07 +08:00
shiziyuan9527 31389167bc 新建工作空间时选择组织 2020-02-26 17:22:32 +08:00
shiziyuan9527 0132219336 系统管理员工作空间管理增加组织列 2020-02-26 16:18:12 +08:00
q4speed 947a5db82e add zh_TW 2020-02-26 16:02:46 +08:00
Captain.B 32df172547 最近的项目 2020-02-26 13:30:50 +08:00
Captain.B 3923aca94f 工作空间国际化 0.2 2020-02-26 11:24:52 +08:00
Captain.B 194f8fa372 工作空间国际化 0.1 2020-02-26 10:35:46 +08:00
q4speed 62c778741d 异步加载语言文件 2020-02-25 11:36:15 +08:00
Captain.B c27167a3ba frontend backend 2020-02-03 14:04:27 +08:00