fit2-zhao
|
20f89c0017
|
Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
# frontend/src/business/components/api/test/ApiTestConfig.vue
|
2020-09-07 13:44:40 +08:00 |
|
fit2-zhao
|
a92db96844
|
fix(接口测试): 加强host列表校验
|
2020-09-07 13:42:21 +08:00 |
q4speed
|
7f296f453c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
# frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
|
2020-09-07 13:29:37 +08:00 |
|
q4speed
|
d6459dfa73
|
feat(接口测试): 增加场景拼接
|
2020-09-07 13:20:27 +08:00 |
|
fit2-zhao
|
92c5215349
|
fix(接口测试): 加强host列表校验
|
2020-09-07 11:41:57 +08:00 |
|
fit2-zhao
|
ce579fe143
|
fix(接口调试): 修复调试未勾选参数加入执行缺陷
|
2020-09-07 10:23:25 +08:00 |
|
fit2-zhao
|
ea832f6f0e
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-04 19:36:11 +08:00 |
|
fit2-zhao
|
59aeb11fa1
|
feat(接口测试): 环境配置增加hosts
|
2020-09-04 19:35:50 +08:00 |
Captain.B
|
d00f170581
|
refactor: 修改session默认的timeout时间为12小时
|
2020-09-04 14:29:55 +08:00 |
|
fit2-zhao
|
a8684f4c7b
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-03 16:17:41 +08:00 |
|
fit2-zhao
|
60961c0a27
|
style(接口测试): 规范化提交内容
|
2020-09-03 16:17:15 +08:00 |
BugKing
|
d727bbd54a
|
docs: 更新 readme
|
2020-09-03 15:35:57 +08:00 |
|
fit2-zhao
|
82cf5b25c4
|
Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
# frontend/src/business/components/api/test/components/ApiVariable.vue
|
2020-09-03 15:11:05 +08:00 |
|
fit2-zhao
|
ed4b773bd8
|
feat(接口调试): 参数增加启用/禁用勾选项
|
2020-09-03 14:59:12 +08:00 |
|
Captain.B
|
70c7145a86
|
Merge remote-tracking branch 'origin/master' into master
|
2020-09-03 14:48:57 +08:00 |
|
Captain.B
|
433aa6bf19
|
refactor: 修改定时任务的配置类
|
2020-09-03 14:47:12 +08:00 |
chenjianxing
|
765d0941c3
|
Merge branch 'v1.2'
|
2020-09-03 13:31:01 +08:00 |
|
chenjianxing
|
306773ddcd
|
fix(接口测试): 兼容旧版本beanshell
|
2020-09-03 13:28:58 +08:00 |
wenyann
|
788f60b7b8
|
fix: 任务通知设置
|
2020-09-03 11:32:48 +08:00 |
|
wenyann
|
3e14fd3d6b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# frontend/src/business/components/common/components/MsScheduleEdit.vue
|
2020-09-03 10:36:44 +08:00 |
|
wenyann
|
6785e58d10
|
feat: 任务通知
|
2020-09-03 10:34:13 +08:00 |
|
Captain.B
|
ec931d038c
|
refactor: 修改 Header 上注册事件的方式
|
2020-09-03 10:02:51 +08:00 |
|
chenjianxing
|
5b750fe55f
|
refact: 解决冲突
|
2020-09-02 19:33:38 +08:00 |
|
chenjianxing
|
86098dee8a
|
refactor: merge v1.2
|
2020-09-02 19:32:31 +08:00 |
|
chenjianxing
|
9f9210bb87
|
fix(接口测试): 修复环境删除时，测试保存无反应
|
2020-09-02 19:18:37 +08:00 |
|
chenjianxing
|
dc6e777bb6
|
Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2
|
2020-09-02 18:19:41 +08:00 |
|
chenjianxing
|
7a0535b6b3
|
fix(接口测试): dubbo 禁用保存不生效
|
2020-09-02 18:19:15 +08:00 |
|
Captain.B
|
32d8054304
|
Merge branch 'v1.2' into master
|
2020-09-02 17:06:56 +08:00 |
|
Captain.B
|
e9c79676c1
|
chore: 去掉不用的文件
|
2020-09-02 17:03:08 +08:00 |
|
wenyann
|
0c36bde3ac
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-02 16:34:28 +08:00 |
shiziyuan9527
|
46d97af29f
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-09-02 16:33:44 +08:00 |
|
shiziyuan9527
|
fdfcf4392b
|
feat: 测试计划和项目的关联表
|
2020-09-02 16:33:19 +08:00 |
|
wenyann
|
af53cf7c47
|
Merge branch 'master' of https://github.com/metersphere/metersphere
Conflicts:
frontend/src/business/components/common/components/MsScheduleEdit.vue
|
2020-09-02 16:24:27 +08:00 |
|
chenjianxing
|
20572b52e3
|
fix: ignore .jython_cache
|
2020-09-02 16:22:11 +08:00 |
|
wenyann
|
5b3552b510
|
fix: 任务通知设置
|
2020-09-02 16:21:53 +08:00 |
|
wenyann
|
2dbe00bf23
|
fix: 任务通知设置
|
2020-09-02 16:21:40 +08:00 |
|
chenjianxing
|
d4b9261b85
|
fix: 删除误提交文件
|
2020-09-02 16:10:10 +08:00 |
|
chenjianxing
|
d0e8cf0a49
|
Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2
|
2020-09-02 15:29:17 +08:00 |
|
chenjianxing
|
7d6cf859df
|
feat(接口测试): 支持python脚本
|
2020-09-02 15:29:01 +08:00 |
|
Captain.B
|
738311dc86
|
Merge branch 'v1.2' into master
|
2020-09-02 10:51:09 +08:00 |
|
Captain.B
|
1ae6ab2b88
|
refactor(接口测试): 修改高级参数设置按钮样式
|
2020-09-02 10:42:52 +08:00 |
|
BugKing
|
81492562ad
|
docs: 更新 readme
|
2020-09-02 10:05:46 +08:00 |
|
Captain.B
|
da8c52e6e3
|
refactor: 合并代码修改部分页面显示
|
2020-09-01 18:02:47 +08:00 |
|
Captain.B
|
5aa7019bb0
|
Merge branch 'v1.2' into master
# Conflicts:
# frontend/src/business/components/common/components/MsScheduleEdit.vue
|
2020-09-01 17:54:53 +08:00 |
|
BugKing
|
f1a6096792
|
docs: readme 增加企业版使用链接
|
2020-09-01 17:19:49 +08:00 |
|
shiziyuan9527
|
1a9fcf0d7b
|
feat: 性能测试报告批量删除
|
2020-09-01 16:22:58 +08:00 |
|
Captain.B
|
3707c02df9
|
fix(性能测试): 修复性能测试不能复制的问题
Closes 298
|
2020-09-01 10:35:50 +08:00 |
|
Captain.B
|
4c18b8d29a
|
feat(性能测试): 支持上传多个csv
|
2020-09-01 10:21:24 +08:00 |
|
Captain.B
|
7d156c4399
|
Merge branch 'v1.2' of github.com:fit2cloudrd/metersphere-server into v1.2
|
2020-09-01 10:08:31 +08:00 |
|
chenjianxing
|
4fa973eff1
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-31 23:37:04 +08:00 |