Commit Graph

1811 Commits

Author SHA1 Message Date
wenyann 7f0f245609 Merge remote-tracking branch 'origin/master' 2020-08-25 16:06:47 +08:00
wenyann 8a60a57102 fix: 修复一键运行uuid重复 2020-08-25 16:05:58 +08:00
chenjianxing ae8389bb90 fix: body json 格式化大数字异常 2020-08-25 16:03:14 +08:00
chenjianxing 19224b367d Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 15:48:44 +08:00
shiziyuan9527 3c482f4840 refactor: 修改系统组织菜单下成员列表的表格样式 2020-08-25 15:48:16 +08:00
chenjianxing b055fac758 Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 15:44:26 +08:00
chenjianxing 52049d61d4 refacotr: 合并v1.1 2020-08-25 15:44:07 +08:00
shiziyuan9527 75ae9f6ce4 fix: 修改缺陷预览样式 2020-08-25 15:42:20 +08:00
chenjianxing 1e870fd04e fix(接口测试): 首次提取失败问题 2020-08-25 15:24:49 +08:00
chenjianxing 7ed2d30acd refactor(接口测试): 前后置脚本排版优化 2020-08-25 14:22:19 +08:00
chenjianxing dc64026250 Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 14:15:24 +08:00
chenjianxing 51fb3466ae refactor: 用例名称长度限制改为50 2020-08-25 14:15:06 +08:00
wenyann e93622d8ec Merge remote-tracking branch 'origin/master' 2020-08-25 14:08:36 +08:00
wenyann e743be130c fix: 修复一键运行报错 2020-08-25 14:08:12 +08:00
chenjianxing 050a519d54 refactor: 解决冲突 2020-08-25 13:44:50 +08:00
chenjianxing d54b32ced3 feat(接口测试): 接口测试支持文件上传 2020-08-25 13:42:31 +08:00
Captain.B ea9378c81d style: 格式化vue代码 2020-08-25 10:17:55 +08:00
q4speed abd9bad78b Merge remote-tracking branch 'origin/master' 2020-08-24 18:42:49 +08:00
q4speed 62899cbd22 perf: 路由懒加载 2020-08-24 18:42:35 +08:00
q4speed cc3f2a68e1 refactor: 优化代码 2020-08-24 18:41:53 +08:00
shiziyuan9527 cbf1bc09e2 fix: 测试计划可以关联多个模块下的用例 2020-08-24 18:09:08 +08:00
wenyann 9f76a15120 Merge remote-tracking branch 'origin/master' 2020-08-24 16:51:57 +08:00
wenyann e33ffa6542 fix: 缺陷列表按时间排序 2020-08-24 16:51:33 +08:00
shiziyuan9527 f1846943be fix: 提交缺陷后隐藏输入框 2020-08-24 16:48:02 +08:00
shiziyuan9527 88b1cfd71a refactor: 修改搜索框的提示 2020-08-24 16:35:52 +08:00
shiziyuan9527 694f712f52 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-24 16:14:10 +08:00
wenyann e0de47e1cc fix: 缺陷列表当前处理人修改 2020-08-24 16:11:37 +08:00
shiziyuan9527 8fcf7aea75 fix: 缺陷添加创建时间 2020-08-24 16:10:12 +08:00
wenyann e8918c08c4 fix: 修改模块显示路径,时间排序 2020-08-24 16:08:52 +08:00
shiziyuan9527 9ad4da05cd fix: 修改缺陷标题长度 2020-08-24 14:11:08 +08:00
shiziyuan9527 e00c3ddab0 fix: 测试计划切换用例时更新缺陷信息 2020-08-21 17:44:42 +08:00
wenyann 001e275a83 Merge remote-tracking branch 'origin/master' 2020-08-21 16:37:51 +08:00
wenyann ff955209b2 fix: 修改关联其他测试提示 2020-08-21 16:37:19 +08:00
shiziyuan9527 8572956083 refactor: i18n 2020-08-21 14:46:50 +08:00
q4speed be574b1b40 chore: update submodule 2020-08-21 14:29:00 +08:00
q4speed cb8b73d9ad feat(性能测试): 增加资源池限额过滤 2020-08-21 11:14:47 +08:00
wenyann 83f90d7d12 Merge remote-tracking branch 'origin/master' 2020-08-20 19:11:09 +08:00
wenyann 0a39e34b37 fix: 修改时间 2020-08-20 19:10:23 +08:00
Captain.B ae7d030577 Merge remote-tracking branch 'origin/master' into master 2020-08-20 18:58:35 +08:00
Captain.B 246b63d432 fix: 修复jmeter内置函数的提示 2020-08-20 18:58:20 +08:00
chenjianxing 9a9d702aca Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 18:16:45 +08:00
chenjianxing eceb099545 feactor: 用户ID支持特殊字符 2020-08-20 18:16:28 +08:00
q4speed 22b6fb25c4 chore: update submodule 2020-08-20 18:08:08 +08:00
wenyann 56914fa834 style:禁掉导出按钮 2020-08-20 17:41:52 +08:00
wenyann a722d6419e Merge remote-tracking branch 'origin/master' 2020-08-20 16:51:06 +08:00
wenyann ad808590e7 fix: 修复接口报告不更新问题 2020-08-20 16:50:34 +08:00
chenjianxing c4d4284957 fix(接口测试): 只读用户单接口调试 2020-08-20 16:02:14 +08:00
chenjianxing 72010207ea Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 15:53:52 +08:00
chenjianxing 53b2833ee4 fix(测试跟踪): 只读用户创建用户测试报告 2020-08-20 15:53:16 +08:00
shiziyuan9527 1038f50c3f fix: 修改缺陷描述 2020-08-20 15:00:18 +08:00
chenjianxing 3ebee20b90 Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 14:37:25 +08:00
chenjianxing 84e9c23486 feat(接口测试): 添加超时设置 2020-08-20 14:37:05 +08:00
Captain.B a50666f1d6 Updating the submodule to the latest version 2020-08-20 12:12:20 +08:00
chenjianxing fbed4ecda4 fix: 解决冲突 2020-08-19 18:10:31 +08:00
chenjianxing 948e489626 fix(接口调试): 接口调试响应不更新问题 2020-08-19 18:04:42 +08:00
shiziyuan9527 7445f06d58 refactor: i18n 2020-08-19 17:05:31 +08:00
Captain.B 4c0ca40b1a Merge remote-tracking branch 'origin/master' into master 2020-08-19 16:36:05 +08:00
Captain.B e3ce7c0db2 fix: 修复删除测试和报告的时候没有及时刷新 recent 列表的问题 2020-08-19 16:35:37 +08:00
shiziyuan9527 4efcd10bae refactor: 修改服务集成样式 2020-08-19 15:56:57 +08:00
chenjianxing 83c21a33b5 Merge branch 'master' of https://github.com/metersphere/server 2020-08-19 15:41:24 +08:00
chenjianxing 478d6db83b feat(接口测试): 场景和接口支持禁用和启用 2020-08-19 15:41:14 +08:00
shiziyuan9527 fabba9a364 refactor: i18n 2020-08-19 11:55:00 +08:00
Captain.B b5fab0f8a6 refactor: Api Keys 前端页面修改 2020-08-19 11:50:08 +08:00
Captain.B a435a5194d refactor: Api Keys 前端页面修改 2020-08-19 11:46:01 +08:00
Captain.B 759fd8cadd Merge remote-tracking branch 'origin/master' into master 2020-08-19 11:00:09 +08:00
Captain.B 4b4b3d92dc refactor: 系统设置前端页面修改 2020-08-19 10:58:35 +08:00
wenyann dea1884cc2 Merge remote-tracking branch 'origin/master' 2020-08-19 10:46:08 +08:00
wenyann 88429985c6 style(LDAP): 删掉无用代码 2020-08-19 10:45:40 +08:00
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
shiziyuan9527 26895e0c57 feat: 修改密码时进行二次确认 2020-08-18 16:53:57 +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 fcb8eeedf2 feat(接口测试): 支持Beanshell脚本 2020-08-18 14:32:24 +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 5ec095673c feat(接口测试): 前后置脚本页面 2020-08-17 19:23:29 +08:00
chenjianxing c1c2bc7f76 fix: swagger body参数循环依赖问题 2020-08-17 15:24:11 +08:00
chenjianxing 263aba9b57 fix: 单接口调试 2020-08-17 13:06:41 +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
wenyann 1cff9c1d02 Merge remote-tracking branch 'origin/master' 2020-08-14 14:33:57 +08:00
wenyann 7e6530a591 style(测试跟踪): 测试报告优化 2020-08-14 14:33:02 +08:00
q4speed 2fb347bd85 Merge remote-tracking branch 'origin/master' 2020-08-14 13:35:34 +08:00
q4speed 3783d30d7e feat: 增加配额管理 2020-08-14 13:34:18 +08:00
Captain.B 26f29ade01 refactor: 高级参数设置组件 2020-08-14 13:15:02 +08:00
Captain.B 69bac33aa1 feat(接口测试): 处理变量 2020-08-14 12:19:41 +08:00
Captain.B 220c8fb099 Merge branch 'func' 2020-08-14 12:04:30 +08:00
Captain.B b63c136fb5 feat(接口测试): 处理变量 2020-08-14 12:02:20 +08:00
wenyann ccf7c0e52f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 19:09:14 +08:00
wenyann bf71b37cf4 style: 测试报告优化 2020-08-13 19:09:02 +08:00
shiziyuan9527 e8842accc2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 17:15:40 +08:00
shiziyuan9527 f42a920fcf feat: 集成TAPD平台 2020-08-13 17:15:19 +08:00
Captain.B 01e22c9f1a feat(接口测试): 处理变量 2020-08-13 15:26:11 +08:00
Captain.B 9bad4b4a83 Merge branch 'master' into func 2020-08-13 14:12:16 +08:00
Captain.B 6461c1a6a6 feat(接口测试): 定义新的组件 2020-08-13 13:34:43 +08:00
Captain.B ad4709e502 feat: mock 数据 2020-08-13 11:11:14 +08:00
wenyann c3280f955d fix: 时间样式调整 2020-08-13 10:18:49 +08:00
Captain.B a1fa5de266 feat: mock 数据 2020-08-13 09:52:51 +08:00
wenyann 9e22233616 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 09:52:01 +08:00
wenyann 7530fff681 fix(接口测试): 报告页面时间显示调整,响应不刷新,页面全部展开 2020-08-13 09:51:03 +08:00
shiziyuan9527 47fad33be1 feat: 服务集成 2020-08-12 17:37:14 +08:00
wenyann b0e0aa1327 fix(接口测试): 报告 2020-08-12 16:48:54 +08:00
Captain.B 23f04146b3 Merge branch 'master' into func 2020-08-12 13:32:04 +08:00
Captain.B 6847ff0530 fix: 非 GET 请求中支持 url 参数 2020-08-12 13:14:38 +08:00
Captain.B 42a3f7261b Revert "refactor: 请求参数修改"
This reverts commit 468eea3b
2020-08-12 12:56:52 +08:00
Captain.B 0263662f97 refactor: 请求参数修改 2020-08-12 12:55:41 +08:00
Captain.B be57bf66a5 Merge branch 'master' into func 2020-08-12 12:40:17 +08:00
Captain.B e512957cd6 refactor: 请求参数修改 2020-08-12 12:14:53 +08:00
wenyann 9dca87376e Merge remote-tracking branch 'origin/master' 2020-08-12 10:58:49 +08:00
wenyann 0222b053b0 fix(测试计划): 时间修改 2020-08-12 10:58:10 +08:00
shiziyuan9527 b13fb0f001 feat: 服务集成 2020-08-11 17:17:25 +08:00
wenyann 59c9cdfef2 fix(接口测试): 场景重复 2020-08-11 15:57:50 +08:00
wenyann a8671ca4f3 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/api/report/components/ScenarioResults.vue
	frontend/src/business/components/common/head/ShowAll.vue
2020-08-11 14:52:02 +08:00
wenyann 66b6c179e8 feat(接口测试):增加接口测试一键运行功能 2020-08-11 14:40:18 +08:00
Captain.B 468eea3b50 refactor: 请求参数修改 2020-08-11 14:28:20 +08:00
chenjianxing 9692b8d2a5 fix(测试跟踪): fix 提缺陷生成D实际结果不正确 2020-08-11 11:22:28 +08:00
chenjianxing b37d6a15f2 fix: 选择raw类型body后,切换成kv请求头错误 2020-08-11 11:15:16 +08:00
chenjianxing f316d99141 Merge branch 'master' of https://github.com/metersphere/server 2020-08-11 10:36:45 +08:00
chenjianxing e187d91c76 feat(接口测试): dubbo 单接口调试 2020-08-11 10:36:18 +08:00
Captain.B 2f1b8e9d1a feat: 请求body支持变量 2020-08-11 10:22:19 +08:00
Captain.B 8b2041bbd9 feat: 请求Headers支持变量 2020-08-11 10:05:09 +08:00
chenjianxing 22950f0893 Merge branch 'master' of https://github.com/metersphere/server 2020-08-10 21:59:26 +08:00
chenjianxing 4e0b340c20 feat(接口测试): 单接口调试 2020-08-10 21:59:11 +08:00
Captain.B 92667da369 refactor(性能测试): 修改测试报告展示压力配置的逻辑 2020-08-10 18:31:53 +08:00
Captain.B 88a9807dfb feat: 显示性能测试的压力配置 2020-08-10 18:17:31 +08:00
Captain.B ece541e80e Merge remote-tracking branch 'origin/master' 2020-08-10 18:07:55 +08:00
Captain.B dfd66d3793 feat: 显示性能测试的压力配置 2020-08-10 18:07:17 +08:00
shiziyuan9527 57ec7ba0c9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-10 17:58:21 +08:00
shiziyuan9527 6e0f0bdd1a refactor: i18n 2020-08-10 17:58:05 +08:00
q4speed 27b5d37033 Merge remote-tracking branch 'origin/master' 2020-08-10 17:04:56 +08:00
q4speed c8e6b5106f refactor: 优化代码 2020-08-10 17:04:34 +08:00
shiziyuan9527 1007479e20 feat(系统设置): 组织菜单下增加服务集成子菜单 2020-08-10 16:18:17 +08:00
Captain.B 585c85e86b Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-08-10 14:59:54 +08:00
Captain.B da226cf76e feat: 显示Jmeter的内置函数提示 2020-08-10 14:59:20 +08:00
shiziyuan9527 2646dc94b4 feat(测试跟踪): 测试计划下用例按照ID字段排序 2020-08-10 14:17:16 +08:00
chenjianxing 94079cd283 refactor: 去掉post请求末尾?号 2020-08-07 19:44:14 +08:00
chenjianxing 95341e5663 fix: body格式化 2020-08-07 19:39:54 +08:00
chenjianxing 1582a46534 refactor: 执行结果不填时,测试用例可通过 2020-08-07 19:22:17 +08:00
chenjianxing 6d6506a3cb fix: 资源池校验 2020-08-07 19:14:33 +08:00
chenjianxing 2e130d3eb5 fix: 步骤描述显示问题 2020-08-07 19:06:09 +08:00
Captain.B 18eb1827ef feat: 高级参数设置前端实现 2020-08-07 17:46:53 +08:00
Captain.B 9d6c1ea86d feat: 高级参数设置前端实现 2020-08-07 17:43:19 +08:00
Captain.B fa13003865 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-08-07 17:37:45 +08:00
Captain.B 5bc5eeb4db feat: 高级参数设置预览 2020-08-07 17:37:29 +08:00
chenjianxing 683fed8ec9 feat: 接口调试部分代码 2020-08-07 17:16:24 +08:00
Captain.B fdda9b00b0 feat: 使用java运行js脚本,添加相关js 2020-08-07 16:26:54 +08:00
chenjianxing 9b294a00f8 Merge branch 'v1.1' of https://github.com/metersphere/server 2020-08-07 11:36:01 +08:00
chenjianxing df2f972c9a Merge branch 'master' of https://github.com/metersphere/server 2020-08-07 11:26:10 +08:00
chenjianxing 76ae0969c4 feat: 场景内cookie共享 2020-08-07 11:25:56 +08:00
Captain.B 2013aafb86 Merge branch 'func' 2020-08-07 10:36:28 +08:00
Captain.B 00ef9b7db9 feat: 高级参数设置 2020-08-07 10:34:05 +08:00
chenjianxing a9d6c98c09 Merge branch 'master' of https://github.com/metersphere/server 2020-08-07 10:03:33 +08:00
chenjianxing 18c7a30a03 refactor: 首页只显示运行中的定时任务 2020-08-07 10:03:22 +08:00
shiziyuan9527 1f64dd0c86 feat(测试跟踪): 测试计划批量操作 2020-08-06 18:31:23 +08:00
q4speed 5edda89021 fix(接口测试): 修复保存后控制台报错的bug 2020-08-06 17:16:19 +08:00
shiziyuan9527 4a20e5ccad refactor: 优化变量命名 2020-08-06 15:22:23 +08:00
shiziyuan9527 3db24258f4 refactor: 浏览器回退问题 2020-08-06 14:41:20 +08:00
shiziyuan9527 9ebc2163ba fix: 修复点击显示全部时菜单没激活的问题 2020-08-06 14:19:42 +08:00
chenjianxing b82b5d34e0 Merge branch 'master' of https://github.com/metersphere/server 2020-08-05 20:07:20 +08:00
chenjianxing b04904d105 Merge branch 'v1.1' 2020-08-05 20:07:04 +08:00
shiziyuan9527 2d14ace67e feat(测试跟踪): 测试用例批量移动 2020-08-05 18:57:36 +08:00
chenjianxing ec3276edff fix: 测试用例接口测试执行 2020-08-05 18:53:08 +08:00
wenyann a3dc5ce547 fix(测试计划): 修复测试方式为自动时通过按钮禁止 2020-08-05 18:26:31 +08:00
wenyann de6a585d17 Merge remote-tracking branch 'origin/master' 2020-08-05 18:23:24 +08:00
wenyann dd049e7893 fix(测试计划): 修复测试方式为自动时通过按钮禁止 2020-08-05 18:22:56 +08:00
chenjianxing 61496ce11a fix: 侧边栏折叠样式 2020-08-05 18:13:14 +08:00
chenjianxing 0d3f93a71c fix: 保存接口测试跳转 2020-08-05 17:23:03 +08:00
chenjianxing f10c233858 refactor: 保存接口测试不跳转到列表页面 2020-08-05 17:22:01 +08:00
chenjianxing 1803f9cf67 fix: 浏览器回退关闭对话框 2020-08-05 17:00:23 +08:00
chenjianxing f10fef30bf Merge branch 'master' of https://github.com/metersphere/server 2020-08-05 13:10:40 +08:00
chenjianxing ff7d0e0343 fix: 解决冲突 2020-08-05 13:10:24 +08:00
shiziyuan9527 9b5523d336 feat(测试跟踪): 测试用例批量删除 2020-08-05 11:17:17 +08:00
chenjianxing e1089b1eb1 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-08-05 10:14:11 +08:00
chenjianxing 7de5205b99 fix: 模块树拖拽 2020-08-05 10:13:56 +08:00
wenyann c8b59784fa fix(系统设置): 修复用户邮箱格式支持带符号 2020-08-05 10:11:26 +08:00
shiziyuan9527 fdc9b1c2fe feat(测试跟踪): 测试用例批量编辑 2020-08-04 19:01:36 +08:00
chenjianxing bca1ef13cb fix: 点击定时任务启动报错 2020-08-04 18:01:41 +08:00
chenjianxing f274cd3b32 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-08-04 17:54:53 +08:00
chenjianxing 9d293f653e fix: 环境设置beaseUrl 2020-08-04 17:54:36 +08:00
chenjianxing ff76a7e69d refactor: 环境域名可以设置为DbeaseUrl 2020-08-04 17:46:44 +08:00